ffmpeg | branch: master | Marton Balint <c...@passwd.hu> | Fri Feb 28 01:21:04 2020 +0100| [f69154b2c40c911797f7c5ad3188996d2be5cdb4] | committer: Marton Balint
avformat/mxfenc: move content package rates and timebase combinations to a separate struct Signed-off-by: Marton Balint <c...@passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f69154b2c40c911797f7c5ad3188996d2be5cdb4 --- libavformat/mxf.c | 32 ++++++++++++++++---------------- libavformat/mxf.h | 5 +++++ 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/libavformat/mxf.c b/libavformat/mxf.c index 10ccd770e3..80626e2a16 100644 --- a/libavformat/mxf.c +++ b/libavformat/mxf.c @@ -131,25 +131,25 @@ int ff_mxf_decode_pixel_layout(const char pixel_layout[16], enum AVPixelFormat * return -1; } -static const AVRational mxf_time_base[] = { - { 1001, 24000 }, - { 1, 24}, - { 1001, 30000 }, - { 1001, 60000 }, - { 1, 25 }, - { 1, 50 }, - { 1, 60 }, - { 0, 0} -}; - -static const int mxf_content_package_rates[] = { - 3, 2, 7, 13, 4, 10, 12, +/** + * See SMPTE 326M-2000 Section 7.2 Content package rate + * MXFContentPackageRate->rate is bits b5..b0. + */ +static const MXFContentPackageRate mxf_content_package_rates[] = { + { 2, { 1, 24 } }, + { 3, { 1001, 24000 } }, + { 4, { 1, 25 } }, + { 7, { 1001, 30000 } }, + { 10, { 1, 50 } }, + { 12, { 1, 60 } }, + { 13, { 1001, 60000 } }, + {0} }; int ff_mxf_get_content_package_rate(AVRational time_base) { - for (int i = 0; mxf_time_base[i].num; i++) - if (!av_cmp_q(time_base, mxf_time_base[i])) - return mxf_content_package_rates[i]; + for (int i = 0; mxf_content_package_rates[i].rate; i++) + if (!av_cmp_q(time_base, mxf_content_package_rates[i].tb)) + return mxf_content_package_rates[i].rate; return 0; } diff --git a/libavformat/mxf.h b/libavformat/mxf.h index 2669269830..f2fff2781e 100644 --- a/libavformat/mxf.h +++ b/libavformat/mxf.h @@ -59,6 +59,11 @@ enum MXFFrameLayout { SegmentedFrame, }; +typedef struct MXFContentPackageRate { + int rate; + AVRational tb; +} MXFContentPackageRate; + typedef struct KLVPacket { UID key; int64_t offset; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
