dump: split audio and video probing on multiple lines

[ffmpeg] / libavformat / mxf.h

diff --git a/libavformat/mxf.h b/libavformat/mxf.h
index 773f30f3a2c47617c1a7190f7308500c4c552365..24432071eeea706e72d1b1c057e069fad5738781 100644 (file)
--- a/libavformat/mxf.h
+++ b/libavformat/mxf.h
@@ -21,6 +21,7 @@
 #ifndef AVFORMAT_MXF_H
 #define AVFORMAT_MXF_H
 
+#include "avformat.h"
 #include "libavcodec/avcodec.h"
 #include <stdint.h>
 
@@ -66,13 +67,56 @@ typedef struct MXFCodecUL {
     int id;
 } MXFCodecUL;
 
+typedef struct MXFSamplesPerFrame {
+    struct AVRational time_base;
+    int samples_per_frame[6];
+} MXFSamplesPerFrame;
+
 extern const MXFCodecUL ff_mxf_data_definition_uls[];
 extern const MXFCodecUL ff_mxf_codec_uls[];
 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 PRIxUID                             \
+    "%02x.%02x.%02x.%02x."                  \
+    "%02x.%02x.%02x.%02x."                  \
+    "%02x.%02x.%02x.%02x."                  \
+    "%02x.%02x.%02x.%02x"
+
+#define UID_ARG(x) \
+    (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]      \
 
-#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 */