[FFmpeg-cvslog] mxf: Verbose debug logging

Luca Barbato git at videolan.org
Wed Mar 19 21:04:36 CET 2014


ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Thu Mar 13 13:38:06 2014 +0100| [6920fb2b33f84b114ea4561ae1c623f4a26562e5] | committer: Luca Barbato

mxf: Verbose debug logging

Print the UL in code format and in the short format used by the
specification.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6920fb2b33f84b114ea4561ae1c623f4a26562e5
---

 libavformat/mxf.h |   29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/libavformat/mxf.h b/libavformat/mxf.h
index 265b0cf..a2d919a 100644
--- a/libavformat/mxf.h
+++ b/libavformat/mxf.h
@@ -79,7 +79,32 @@ extern const MXFCodecUL ff_mxf_pixel_format_uls[];
 int ff_mxf_decode_pixel_layout(const char pixel_layout[16], enum AVPixelFormat *pix_fmt);
 const MXFSamplesPerFrame *ff_mxf_get_samples_per_frame(AVFormatContext *s, AVRational time_base);
 
-#define PRINT_KEY(pc, s, x) av_dlog(pc, "%s %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\n", s, \
-                             (x)[0], (x)[1], (x)[2], (x)[3], (x)[4], (x)[5], (x)[6], (x)[7], (x)[8], (x)[9], (x)[10], (x)[11], (x)[12], (x)[13], (x)[14], (x)[15])
+#ifdef DEBUG
+#define PRINT_KEY(pc, s, x)                         \
+    av_log(pc, AV_LOG_VERBOSE,                      \
+           "%s "                                    \
+           "0x%02x,0x%02x,0x%02x,0x%02x,"           \
+           "0x%02x,0x%02x,0x%02x,0x%02x,"           \
+           "0x%02x,0x%02x,0x%02x,0x%02x,"           \
+           "0x%02x,0x%02x,0x%02x,0x%02x ",          \
+            s,                                      \
+            (x)[0],  (x)[1],  (x)[2],  (x)[3],      \
+            (x)[4],  (x)[5],  (x)[6],  (x)[7],      \
+            (x)[8],  (x)[9],  (x)[10], (x)[11],     \
+            (x)[12], (x)[13], (x)[14], (x)[15]);    \
+    av_log(pc, AV_LOG_INFO,                         \
+           "%s "                                    \
+           "%02x.%02x.%02x.%02x."                   \
+           "%02x.%02x.%02x.%02x."                   \
+           "%02x.%02x.%02x.%02x."                   \
+           "%02x.%02x.%02x.%02x\n",                 \
+            s,                                      \
+            (x)[0],  (x)[1],  (x)[2],  (x)[3],      \
+            (x)[4],  (x)[5],  (x)[6],  (x)[7],      \
+            (x)[8],  (x)[9],  (x)[10], (x)[11],     \
+            (x)[12], (x)[13], (x)[14], (x)[15])
+#else
+#define PRINT_KEY(pc, s, x)
+#endif
 
 #endif /* AVFORMAT_MXF_H */



More information about the ffmpeg-cvslog mailing list