diff options
| author | Tomas Härdin <tjoppen@acc.umu.se> | 2021-01-27 14:08:55 +0100 |
|---|---|---|
| committer | Tomas Härdin <tjoppen@acc.umu.se> | 2021-02-01 23:52:55 +0100 |
| commit | ff0618b5c4573765045bab58e4eecf4b1fe4d07e (patch) | |
| tree | b21d3167e2b1156b30adc7b08e4274dc6bb9c2c4 /libavformat/mxfdec.c | |
| parent | 5441699f8392bc3442f32137d8128d98a3b7b812 (diff) | |
avformat/mxf: Establish register of local tags
Tags can be marked "not used" upfront, saving some space in the primer.
av_asserts0() is used to enforce that only tags that are in the primer can actually be written.
Sharing of MasteringDisplay ULs is now done via macros.
Diffstat (limited to 'libavformat/mxfdec.c')
| -rw-r--r-- | libavformat/mxfdec.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index afff20402d..93fa7a97c0 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -336,6 +336,14 @@ static const uint8_t mxf_indirect_value_utf16be[] = { 0x42,0x01,0x10,0x static const uint8_t mxf_apple_coll_max_cll[] = { 0x06,0x0e,0x2b,0x34,0x01,0x01,0x01,0x0e,0x0e,0x20,0x04,0x01,0x05,0x03,0x01,0x01 }; static const uint8_t mxf_apple_coll_max_fall[] = { 0x06,0x0e,0x2b,0x34,0x01,0x01,0x01,0x0e,0x0e,0x20,0x04,0x01,0x05,0x03,0x01,0x02 }; +static uint8_t mxf_mastering_display_prefix[13] = { FF_MXF_MasteringDisplay_PREFIX }; +static uint8_t mxf_mastering_display_uls[4][16] = { + FF_MXF_MasteringDisplayPrimaries, + FF_MXF_MasteringDisplayWhitePointChromaticity, + FF_MXF_MasteringDisplayMaximumLuminance, + FF_MXF_MasteringDisplayMinimumLuminance, +}; + #define IS_KLV_KEY(x, y) (!memcmp(x, y, sizeof(y))) static void mxf_free_metadataset(MXFMetadataSet **ctx, int freectx) @@ -1280,13 +1288,13 @@ static int mxf_read_generic_descriptor(void *arg, AVIOContext *pb, int tag, int rsiz == FF_PROFILE_JPEG2000_DCINEMA_4K) descriptor->pix_fmt = AV_PIX_FMT_XYZ12; } - if (IS_KLV_KEY(uid, ff_mxf_mastering_display_prefix)) { + if (IS_KLV_KEY(uid, mxf_mastering_display_prefix)) { if (!descriptor->mastering) { descriptor->mastering = av_mastering_display_metadata_alloc(); if (!descriptor->mastering) return AVERROR(ENOMEM); } - if (IS_KLV_KEY(uid, ff_mxf_mastering_display_local_tags[0].uid)) { + if (IS_KLV_KEY(uid, mxf_mastering_display_uls[0])) { for (int i = 0; i < 3; i++) { /* Order: large x, large y, other (i.e. RGB) */ descriptor->mastering->display_primaries[i][0] = av_make_q(avio_rb16(pb), FF_MXF_MASTERING_CHROMA_DEN); @@ -1296,20 +1304,20 @@ static int mxf_read_generic_descriptor(void *arg, AVIOContext *pb, int tag, int if (descriptor->mastering->white_point[0].den != 0) descriptor->mastering->has_primaries = 1; } - if (IS_KLV_KEY(uid, ff_mxf_mastering_display_local_tags[1].uid)) { + if (IS_KLV_KEY(uid, mxf_mastering_display_uls[1])) { descriptor->mastering->white_point[0] = av_make_q(avio_rb16(pb), FF_MXF_MASTERING_CHROMA_DEN); descriptor->mastering->white_point[1] = av_make_q(avio_rb16(pb), FF_MXF_MASTERING_CHROMA_DEN); /* Check we have seen mxf_mastering_display_primaries */ if (descriptor->mastering->display_primaries[0][0].den != 0) descriptor->mastering->has_primaries = 1; } - if (IS_KLV_KEY(uid, ff_mxf_mastering_display_local_tags[2].uid)) { + if (IS_KLV_KEY(uid, mxf_mastering_display_uls[2])) { descriptor->mastering->max_luminance = av_make_q(avio_rb32(pb), FF_MXF_MASTERING_LUMA_DEN); /* Check we have seen mxf_mastering_display_minimum_luminance */ if (descriptor->mastering->min_luminance.den != 0) descriptor->mastering->has_luminance = 1; } - if (IS_KLV_KEY(uid, ff_mxf_mastering_display_local_tags[3].uid)) { + if (IS_KLV_KEY(uid, mxf_mastering_display_uls[3])) { descriptor->mastering->min_luminance = av_make_q(avio_rb32(pb), FF_MXF_MASTERING_LUMA_DEN); /* Check we have seen mxf_mastering_display_maximum_luminance */ if (descriptor->mastering->max_luminance.den != 0) |