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/mxf.h | |
| 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/mxf.h')
| -rw-r--r-- | libavformat/mxf.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libavformat/mxf.h b/libavformat/mxf.h index 5219abc767..b1b1fedac7 100644 --- a/libavformat/mxf.h +++ b/libavformat/mxf.h @@ -83,9 +83,13 @@ typedef struct MXFLocalTagPair { UID uid; } MXFLocalTagPair; -extern const uint8_t ff_mxf_mastering_display_prefix[13]; extern const uint8_t ff_mxf_random_index_pack_key[16]; -extern const MXFLocalTagPair ff_mxf_mastering_display_local_tags[4]; + +#define FF_MXF_MasteringDisplay_PREFIX 0x06,0x0e,0x2b,0x34,0x01,0x01,0x01,0x0e,0x04,0x20,0x04,0x01,0x01 +#define FF_MXF_MasteringDisplayPrimaries { FF_MXF_MasteringDisplay_PREFIX,0x01,0x00,0x00 } +#define FF_MXF_MasteringDisplayWhitePointChromaticity { FF_MXF_MasteringDisplay_PREFIX,0x02,0x00,0x00 } +#define FF_MXF_MasteringDisplayMaximumLuminance { FF_MXF_MasteringDisplay_PREFIX,0x03,0x00,0x00 } +#define FF_MXF_MasteringDisplayMinimumLuminance { FF_MXF_MasteringDisplay_PREFIX,0x04,0x00,0x00 } #define FF_MXF_MASTERING_CHROMA_DEN 50000 #define FF_MXF_MASTERING_LUMA_DEN 10000 |