mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 12:02:23 +02:00
Code

cache: no short reads in read_buffer

Browse Source 
Until now, cache_read() (which calls read_buffer()) could return short
reads. This was a simplification allowed by the stream interface. But
for cache resizing, it will be more practical to make read_buffer() do
a full read.
This commit is contained in:
wm4 2014-04-09 19:05:41 +02:00
parent e7a5124b36
commit 80392efaea
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
stream/cache.c
View File

@ -183,26 +183,31 @@ static void cache_drop_contents(struct priv *s)
static size_t read_buffer(struct priv *s, unsigned char *dst,
size_t dst_size, int64_t pos)
{
if (pos >= s->max_filepos || pos < s->min_filepos)
return 0;
int64_t newb = s->max_filepos - pos; // new bytes in the buffer
size_t read = 0;
while (read < dst_size) {
if (pos >= s->max_filepos || pos < s->min_filepos)
break;
int64_t newb = s->max_filepos - pos; // new bytes in the buffer
pos = pos - s->offset; // file pos to buffer memory pos
if (pos < 0) {
pos += s->buffer_size;
} else if (pos >= s->buffer_size) {
pos -= s->buffer_size;
int64_t bpos = pos - s->offset; // file pos to buffer memory pos
if (bpos < 0) {
bpos += s->buffer_size;
} else if (bpos >= s->buffer_size) {
bpos -= s->buffer_size;
}
if (newb > s->buffer_size - bpos)
newb = s->buffer_size - bpos; // handle wrap...
newb = MPMIN(newb, dst_size - read);
assert(newb >= 0 && read + newb <= dst_size);
assert(bpos >= 0 && bpos + newb <= s->buffer_size);
memcpy(&dst[read], &s->buffer[bpos], newb);
read += newb;
pos += newb;
}
if (newb > s->buffer_size - pos)
newb = s->buffer_size - pos; // handle wrap...
newb = MPMIN(newb, dst_size);
assert(newb >= 0 && newb <= dst_size);
assert(pos >= 0 && pos + newb <= s->buffer_size);
memcpy(&dst[0], &s->buffer[pos], newb);
return newb;
return read;
}
// Runs in the main thread