[vlc-commits] AVI: better debug

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu May 24 11:48:39 2012 +0200| [1cea6f76b42cb15f48ad5c7310f3c7af19f4596a] | committer: Jean-Baptiste Kempf

AVI: better debug

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

 modules/demux/avi/avi.c    |    4 ++--
 modules/demux/avi/libavi.c |    9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c
index 990aa3a..92cdcde 100644
--- a/modules/demux/avi/avi.c
+++ b/modules/demux/avi/avi.c
@@ -335,13 +335,13 @@ static int Open( vlc_object_t * p_this )
 
     if( !p_hdrl || !p_movi )
     {
-        msg_Err( p_demux, "avi module discarded (invalid file)" );
+        msg_Err( p_demux, "invalid file: cannot find hdrl or movi chunks" );
         goto error;
     }
 
     if( !( p_avih = AVI_ChunkFind( p_hdrl, AVIFOURCC_avih, 0 ) ) )
     {
-        msg_Err( p_demux, "cannot find avih chunk" );
+        msg_Err( p_demux, "invalid file: cannot find avih chunk" );
         goto error;
     }
     i_track = AVI_ChunkCount( p_hdrl, AVIFOURCC_strl );
diff --git a/modules/demux/avi/libavi.c b/modules/demux/avi/libavi.c
index 297bfdf..06b26cc 100644
--- a/modules/demux/avi/libavi.c
+++ b/modules/demux/avi/libavi.c
@@ -418,7 +418,8 @@ static int AVI_ChunkRead_strf( stream_t *s, avi_chunk_t *p_chk )
 #endif
             break;
         default:
-            msg_Warn( (vlc_object_t*)s, "unknown stream type" );
+            msg_Warn( (vlc_object_t*)s, "unknown stream type: %4.4s",
+                    (char*)&p_strh->strh.i_type );
             p_chk->strf.common.i_cat = UNKNOWN_ES;
             break;
     }
@@ -817,7 +818,8 @@ int  _AVI_ChunkRead( stream_t *s, avi_chunk_t *p_chk, avi_chunk_t *p_father )
         p_chk->common.i_chunk_fourcc = AVIFOURCC_indx;
         return AVI_ChunkRead_indx( s, p_chk );
     }
-    msg_Warn( (vlc_object_t*)s, "unknown chunk (not loaded)" );
+    msg_Warn( (vlc_object_t*)s, "unknown chunk: %4.4s (not loaded)",
+            (char*)&p_chk->common.i_chunk_fourcc );
     return AVI_NextChunk( s, p_chk );
 }
 
@@ -853,7 +855,8 @@ void _AVI_ChunkFree( stream_t *s,
     }
     else
     {
-        msg_Warn( (vlc_object_t*)s, "unknown chunk (not unloaded)" );
+        msg_Warn( (vlc_object_t*)s, "unknown chunk: %4.4s (not unloaded)",
+                (char*)&p_chk->common.i_chunk_fourcc );
     }
     p_chk->common.p_first = NULL;
     p_chk->common.p_last  = NULL;