From: Matthieu Bouron <[email protected]>
Signed-off-by: Luca Barbato <[email protected]>
---
libavformat/mxf.c | 33 +++++++++++++++++++++++++++++++++
libavformat/mxf.h | 7 +++++++
2 files changed, 40 insertions(+)
diff --git a/libavformat/mxf.c b/libavformat/mxf.c
index 040d8a2..e51106f 100644
--- a/libavformat/mxf.c
+++ b/libavformat/mxf.c
@@ -104,3 +104,36 @@ int ff_mxf_decode_pixel_layout(const char
pixel_layout[16], enum AVPixelFormat *
return -1;
}
+
+static const MXFSamplesPerFrame mxf_spf[] = {
+ { { 1001, 24000 }, { 2002, 0, 0, 0, 0, 0 } }, // FILM 23.976
+ { { 1, 24}, { 2000, 0, 0, 0, 0, 0 } }, // FILM 24
+ { { 1001, 30000 }, { 1602, 1601, 1602, 1601, 1602, 0 } }, // NTSC 29.97
+ { { 1001, 60000 }, { 801, 801, 801, 801, 800, 0 } }, // NTSC 59.94
+ { { 1, 25 }, { 1920, 0, 0, 0, 0, 0 } }, // PAL 25
+ { { 1, 50 }, { 960, 0, 0, 0, 0, 0 } }, // PAL 50
+};
+
+const MXFSamplesPerFrame *ff_mxf_get_samples_per_frame(AVFormatContext *s,
+ AVRational time_base)
+{
+ int i;
+ for (i = 0; i < FF_ARRAY_ELEMS(mxf_spf); i++) {
+ if (!av_cmp_q(mxf_spf[i].time_base, time_base))
+ return &mxf_spf[i];
+ }
+
+ /* Find closest container time base for approximative codec time base like
+ * 1/29.97, 1/30, ... */
+ for (i = 0; i < FF_ARRAY_ELEMS(mxf_spf); i++) {
+ if (fabs(av_q2d(mxf_spf[i].time_base) - av_q2d(time_base)) < 0.0001) {
+ av_log(s, AV_LOG_WARNING,
+ "%d/%d input time base matched %d/%d container time base\n",
+ time_base.num, time_base.den,
+ mxf_spf[i].time_base.num,
+ mxf_spf[i].time_base.den);
+ return &mxf_spf[i];
+ }
+ }
+ return NULL;
+}
diff --git a/libavformat/mxf.h b/libavformat/mxf.h
index 773f30f..265b0cf 100644
--- 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,11 +67,17 @@ 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 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])
--
1.8.5.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
