RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-28 02:02:46 +00:00
Code Issues Projects Releases Wiki Activity

avformat/cache: keep cache_pos updated

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-12-26 01:22:52 +01:00
parent 954fc854f2
commit ce3551896a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/cache.c
View File

@ -110,6 +110,7 @@ static int add_entry(URLContext *h, const unsigned char *buf, int size)
av_log(h, AV_LOG_ERROR, "seek in cache failed\n");
goto fail;
}
c->cache_pos = pos;
ret = write(c->fd, buf, size);
if (ret < 0) {
@ -121,6 +122,7 @@ static int add_entry(URLContext *h, const unsigned char *buf, int size)
entry->logical_pos = c->logical_pos;
entry->physical_pos = pos;
entry->size = ret;
c->cache_pos = entry->physical_pos + entry->size;
entry_ret = av_tree_insert(&c->root, entry, cmp, &node);
if (entry_ret && entry_ret != entry) {
@ -128,7 +130,6 @@ static int add_entry(URLContext *h, const unsigned char *buf, int size)
av_log(h, AV_LOG_ERROR, "av_tree_insert failed\n");
goto fail;
}
c->cache_pos = entry->physical_pos + entry->size;
return 0;
fail:
@ -157,10 +158,13 @@ static int cache_read(URLContext *h, unsigned char *buf, int size)
int64_t physical_target = entry->physical_pos + in_block_pos;
//FIXME avoid seek if unneeded
r = lseek(c->fd, physical_target, SEEK_SET);
if (r >= 0)
if (r >= 0) {
c->cache_pos = r;
r = read(c->fd, buf, FFMIN(size, entry->size - in_block_pos));
}
if (r > 0) {
c->cache_pos += r;
c->logical_pos += r;
c->cache_hit ++;
return r;