RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

cache: call stream read with at least sector size space 

Ensure we always pass a buffer of at least sector size to the read
function. This is never an issue with streams that have actual
sectors, as the reads will always return a multiple of sector size and
the cache is always used in blocks of sector size. However the rtp
protocol misuses this so it can just assume it always has a
sufficiently large buffer available and thus fails without this extra
hack.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33120 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2011-03-26 20:04:47 +00:00 committed by Uoti Urpala
parent 211e93aeec
commit a37b71dc32
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
stream/cache2.c
View File

@ -167,6 +167,7 @@ static int cache_fill(cache_vars_t *s)
int back,back2,newb,space,len,pos; int back,back2,newb,space,len,pos;
off_t read=s->read_filepos; off_t read=s->read_filepos;
int read_chunk; int read_chunk;
int wraparound_copy = 0;
if(read<s->min_filepos || read>s->max_filepos){ if(read<s->min_filepos || read>s->max_filepos){
// seek... // seek...
@ -208,8 +209,16 @@ static int cache_fill(cache_vars_t *s)
// printf("### read=0x%X back=%d newb=%d space=%d pos=%d\n",read,back,newb,space,pos); // printf("### read=0x%X back=%d newb=%d space=%d pos=%d\n",read,back,newb,space,pos);
// reduce space if needed: // try to avoid wrap-around. If not possible due to sector size
if(space>s->buffer_size-pos) space=s->buffer_size-pos; // do an extra copy.
if(space>s->buffer_size-pos) {
if (s->buffer_size-pos >= s->sector_size) {
space=s->buffer_size-pos;
} else {
space = s->sector_size;
wraparound_copy = 1;
}
}
// limit one-time block size // limit one-time block size
read_chunk = s->stream->read_chunk; read_chunk = s->stream->read_chunk;
@ -224,6 +233,13 @@ static int cache_fill(cache_vars_t *s)
s->min_filepos=read-back; // avoid seeking-back to temp area... s->min_filepos=read-back; // avoid seeking-back to temp area...
#endif #endif
if (wraparound_copy) {
int to_copy;
len = stream_read_internal(s->stream, s->stream->buffer, space);
to_copy = FFMIN(len, s->buffer_size-pos);
memcpy(s->buffer + pos, s->stream->buffer, to_copy);
memcpy(s->buffer, s->stream->buffer + to_copy, len - to_copy);
} else
len = stream_read_internal(s->stream, &s->buffer[pos], space); len = stream_read_internal(s->stream, &s->buffer[pos], space);
s->eof= !len; s->eof= !len;