[vlc-commits] demux: mp4: improve eof error

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Sep 24 23:39:04 2014 +0200| [7adcdae856352a02fec6cfcf92d62973f4500d0d] | committer: Francois Cartegnie

demux: mp4: improve eof error

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7adcdae856352a02fec6cfcf92d62973f4500d0d
---

 modules/demux/mp4/mp4.c |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index fa0819f..8a7637f 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -1009,18 +1009,21 @@ static int Demux( demux_t *p_demux )
         {
             if( stream_Seek( p_demux->s, i_candidate_pos ) )
             {
-                msg_Warn( p_demux, "track[0x%x] will be disabled (eof?)",
-                          tk->i_track_ID );
+                msg_Warn( p_demux, "track[0x%x] will be disabled (eof?)"
+                          ": Failed to seek to %"PRIu64,
+                          tk->i_track_ID, i_candidate_pos );
                 MP4_TrackUnselect( p_demux, tk );
                 goto end;
             }
+            i_current_pos = i_candidate_pos;
         }
 
         /* now read pes */
         if( !(p_block = MP4_Block_Read( p_demux, tk, i_samplessize )) )
         {
-            msg_Warn( p_demux, "track[0x%x] will be disabled (eof?)",
-                      tk->i_track_ID );
+            msg_Warn( p_demux, "track[0x%x] will be disabled (eof?)"
+                      ": Failed to read %d bytes sample at %"PRIu64,
+                      tk->i_track_ID, i_samplessize, i_current_pos );
             MP4_TrackUnselect( p_demux, tk );
             goto end;
         }