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

Ignore movi_end (except on error) to allow playing growing files. 

Also adds a check if stream_read read the requested length.
This and the movi_end check on error help not accidently playing ID3 tags.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16439 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2005-09-09 20:05:42 +00:00
parent 703189e5ea
commit 021f63cd71
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libmpdemux/demux_audio.c
View File

@ -404,7 +404,7 @@ static int demux_audio_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds) {
priv = demux->priv; priv = demux->priv;
s = demux->stream; s = demux->stream;
if(s->eof || (demux->movi_end && stream_tell(s) >= demux->movi_end) ) if(s->eof)
return 0; return 0;
switch(priv->frmt) { switch(priv->frmt) {
@ -412,15 +412,18 @@ static int demux_audio_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds) {
while(1) { while(1) {
uint8_t hdr[4]; uint8_t hdr[4];
stream_read(s,hdr,4); stream_read(s,hdr,4);
if (s->eof || (demux->movi_end && stream_tell(s) >= demux->movi_end)) if (s->eof)
return 0; return 0;
l = mp_decode_mp3_header(hdr); l = mp_decode_mp3_header(hdr);
if(l < 0) { if(l < 0) {
if (demux->movi_end && stream_tell(s) >= demux->movi_end)
return 0; // might be ID3 tag, i.e. EOF
stream_skip(s,-3); stream_skip(s,-3);
} else { } else {
dp = new_demux_packet(l); dp = new_demux_packet(l);
memcpy(dp->buffer,hdr,4); memcpy(dp->buffer,hdr,4);
stream_read(s,dp->buffer + 4,l-4); if (stream_read(s,dp->buffer + 4,l-4) != l-4)
return 0;
priv->last_pts = priv->last_pts < 0 ? 0 : priv->last_pts + sh_audio->audio.dwScale/(float)sh_audio->samplerate; priv->last_pts = priv->last_pts < 0 ? 0 : priv->last_pts + sh_audio->audio.dwScale/(float)sh_audio->samplerate;
break; break;
} }