RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-31 11:42:14 +00:00
Code Issues Releases Wiki Activity

cache_file: fix operation if stream size is unknown

Browse Source 
Happens when playing from a pipe.

Note that seeking forward doesn't work. It would be possible to create a
workaround for that by reading and skipping data until the target
position is reached (and writing the skipped data into the cache file),
but I'm not sure about that.

Fixes #928.

CC: @mpv-player/stable
This commit is contained in:
wm4 2014-07-12 19:16:53 +02:00
parent 1e8b98af73
commit 64e3b07a9d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
stream/cache_file.c
View File

@ -68,7 +68,7 @@ static int fill_buffer(stream_t *s, char *buffer, int max_len)
if (s->pos >= p->size - BLOCK_SIZE) { if (s->pos >= p->size - BLOCK_SIZE) {
int64_t new_size = -1; int64_t new_size = -1;
stream_control(s, STREAM_CTRL_GET_SIZE, &new_size); stream_control(s, STREAM_CTRL_GET_SIZE, &new_size);
if (new_size != p->size) if (p->size >= 0 && new_size != p->size)
set_bit(p, BLOCK_ALIGN(p->size), 0); set_bit(p, BLOCK_ALIGN(p->size), 0);
p->size = MPMIN(p->max_size, new_size); p->size = MPMIN(p->max_size, new_size);
} }
@ -96,7 +96,8 @@ static int fill_buffer(stream_t *s, char *buffer, int max_len)
// align/limit to blocks // align/limit to blocks
max_len = MPMIN(max_len, BLOCK_SIZE - (s->pos % BLOCK_SIZE)); max_len = MPMIN(max_len, BLOCK_SIZE - (s->pos % BLOCK_SIZE));
// Limit to max. known file size // Limit to max. known file size
max_len = MPMIN(max_len, p->size - s->pos); if (p->size >= 0)
max_len = MPMIN(max_len, p->size - s->pos);
return fread(buffer, 1, max_len, p->cache_file); return fread(buffer, 1, max_len, p->cache_file);
} }