Mercurial > mplayer.hg

changeset 16438:871e94131840

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author reimar
date Fri, 09 Sep 2005 20:05:42 +0000
parents 9dda08ef3e7c
children abac160060a8
files libmpdemux/demux_audio.c
diffstat 1 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_audio.c	Fri Sep 09 17:08:26 2005 +0000
+++ b/libmpdemux/demux_audio.c	Fri Sep 09 20:05:42 2005 +0000
@@ -404,7 +404,7 @@
   priv = demux->priv;
   s = demux->stream;
 
-  if(s->eof || (demux->movi_end && stream_tell(s) >= demux->movi_end) )
+  if(s->eof)
     return 0;
 
   switch(priv->frmt) {
@@ -412,15 +412,18 @@
     while(1) {
       uint8_t hdr[4];
       stream_read(s,hdr,4);
-      if (s->eof || (demux->movi_end && stream_tell(s) >= demux->movi_end))
+      if (s->eof)
         return 0;
       l = mp_decode_mp3_header(hdr);
       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);
       } else {
 	dp = new_demux_packet(l);
 	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;
 	break;
       }