[FFmpeg-devel] [PATCH 2/2] [avformat/mxf] Add support for ST 2084 / ST 2067-21 mastering metadata.

[Carl Eugen Hoyos]

Hi!

2016-09-24 7:19 GMT+02:00 Steven Robertson <steven at strobe.cc>:
> -static const uint8_t mxf_crypto_source_container_ul[]      = { 0x06,0x0e,0x2b,0x34,0x01,0x01,0x01,0x09,0x06,0x01,0x01,0x02,0x02,0x00,0x00,0x00 };
> -static const uint8_t mxf_encrypted_triplet_key[]           = { 0x06,0x0e,0x2b,0x34,0x02,0x04,0x01,0x07,0x0d,0x01,0x03,0x01,0x02,0x7e,0x01,0x00 };
> -static const uint8_t mxf_encrypted_essence_container[]     = { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x07,0x0d,0x01,0x03,0x01,0x02,0x0b,0x01,0x00 };
> -static const uint8_t mxf_random_index_pack_key[]           = { 0x06,0x0e,0x2b,0x34,0x02,0x05,0x01,0x01,0x0d,0x01,0x02,0x01,0x01,0x11,0x01,0x00 };
> -static const uint8_t mxf_sony_mpeg4_extradata[]            = { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0e,0x06,0x06,0x02,0x02,0x01,0x00,0x00 };
> -static const uint8_t mxf_avid_project_name[]               = { 0xa5,0xfb,0x7b,0x25,0xf6,0x15,0x94,0xb9,0x62,0xfc,0x37,0x17,0x49,0x2d,0x42,0xbf };
> -static const uint8_t mxf_jp2k_rsiz[]                       = { 0x06,0x0e,0x2b,0x34,0x02,0x05,0x01,0x01,0x0d,0x01,0x02,0x01,0x01,0x02,0x01,0x00 };
> -static const uint8_t mxf_indirect_value_utf16le[]          = { 0x4c,0x00,0x02,0x10,0x01,0x00,0x00,0x00,0x00,0x06,0x0e,0x2b,0x34,0x01,0x04,0x01,0x01 };
> -static const uint8_t mxf_indirect_value_utf16be[]          = { 0x42,0x01,0x10,0x02,0x00,0x00,0x00,0x00,0x00,0x06,0x0e,0x2b,0x34,0x01,0x04,0x01,0x01 };
> +static const uint8_t mxf_crypto_source_container_ul[]         = { 0x06,0x0e,0x2b,0x34,0x01,0x01,0x01,0x09,0x06,0x01,0x01,0x02,0x02,0x00,0x00,0x00 };
> +static const uint8_t mxf_encrypted_triplet_key[]              = { 0x06,0x0e,0x2b,0x34,0x02,0x04,0x01,0x07,0x0d,0x01,0x03,0x01,0x02,0x7e,0x01,0x00 };
> +static const uint8_t mxf_encrypted_essence_container[]        = { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x07,0x0d,0x01,0x03,0x01,0x02,0x0b,0x01,0x00 };
> +static const uint8_t mxf_random_index_pack_key[]              = { 0x06,0x0e,0x2b,0x34,0x02,0x05,0x01,0x01,0x0d,0x01,0x02,0x01,0x01,0x11,0x01,0x00 };
> +static const uint8_t mxf_sony_mpeg4_extradata[]               = { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0e,0x06,0x06,0x02,0x02,0x01,0x00,0x00 };
> +static const uint8_t mxf_avid_project_name[]                  = { 0xa5,0xfb,0x7b,0x25,0xf6,0x15,0x94,0xb9,0x62,0xfc,0x37,0x17,0x49,0x2d,0x42,0xbf };
> +static const uint8_t mxf_jp2k_rsiz[]                          = { 0x06,0x0e,0x2b,0x34,0x02,0x05,0x01,0x01,0x0d,0x01,0x02,0x01,0x01,0x02,0x01,0x00 };
> +static const uint8_t mxf_indirect_value_utf16le[]             = { 0x4c,0x00,0x02,0x10,0x01,0x00,0x00,0x00,0x00,0x06,0x0e,0x2b,0x34,0x01,0x04,0x01,0x01 };
> +static const uint8_t mxf_indirect_value_utf16be[]             = { 0x42,0x01,0x10,0x02,0x00,0x00,0x00,0x00,0x00,0x06,0x0e,0x2b,0x34,0x01,0x04,0x01,0x01 };
> +static const uint8_t mxf_mastering_display_primaries_ul[]     = { 0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x0E,0x04,0x20,0x04,0x01,0x01,0x01,0x00,0x00 };
> +static const uint8_t mxf_mastering_display_white_point_ul[]   = { 0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x0E,0x04,0x20,0x04,0x01,0x01,0x02,0x00,0x00 };
> +static const uint8_t mxf_mastering_display_max_luminance_ul[] = { 0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x0E,0x04,0x20,0x04,0x01,0x01,0x03,0x00,0x00 };
> +static const uint8_t mxf_mastering_display_min_luminance_ul[] = { 0x06,0x0E,0x2B,0x34,0x01,0x01,0x01,0x0E,0x04,0x20,0x04,0x01,0x01,0x04,0x00,0x00 };

Please split this in a patch that adds the new keys and (an optional)
one that reindents the existing keys.

> +/*
> + * Match an uid independently of the version byte and up to len common bytes
> + * Returns: boolean
> + */
> +static int mxf_match_uid(const UID key, const UID uid, int len)

Moving this function should be an independent patch.

Thank you, Carl Eugen