From ad17b9d2d47af5dfb7c380db9c5fc6d719dcf883 Mon Sep 17 00:00:00 2001 From: Neil Birkbeck Date: Mon, 22 Feb 2016 14:53:06 -0800 Subject: libavcodec:add packet level support for mastering metadata Some containers, like webm/mkv, will contain this mastering metadata. This is analogous to the way 3D fpa data is handled (in frame and packet side data). Signed-off-by: Neil Birkbeck Signed-off-by: Michael Niedermayer --- libavcodec/avpacket.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) (limited to 'libavcodec/avpacket.c') diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 9538bf39f3..97f079f901 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -335,23 +335,24 @@ uint8_t *av_packet_get_side_data(AVPacket *pkt, enum AVPacketSideDataType type, const char *av_packet_side_data_name(enum AVPacketSideDataType type) { switch(type) { - case AV_PKT_DATA_PALETTE: return "Palette"; - case AV_PKT_DATA_NEW_EXTRADATA: return "New Extradata"; - case AV_PKT_DATA_PARAM_CHANGE: return "Param Change"; - case AV_PKT_DATA_H263_MB_INFO: return "H263 MB Info"; - case AV_PKT_DATA_REPLAYGAIN: return "Replay Gain"; - case AV_PKT_DATA_DISPLAYMATRIX: return "Display Matrix"; - case AV_PKT_DATA_STEREO3D: return "Stereo 3D"; - case AV_PKT_DATA_AUDIO_SERVICE_TYPE: return "Audio Service Type"; - case AV_PKT_DATA_SKIP_SAMPLES: return "Skip Samples"; - case AV_PKT_DATA_JP_DUALMONO: return "JP Dual Mono"; - case AV_PKT_DATA_STRINGS_METADATA: return "Strings Metadata"; - case AV_PKT_DATA_SUBTITLE_POSITION: return "Subtitle Position"; - case AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL: return "Matroska BlockAdditional"; - case AV_PKT_DATA_WEBVTT_IDENTIFIER: return "WebVTT ID"; - case AV_PKT_DATA_WEBVTT_SETTINGS: return "WebVTT Settings"; - case AV_PKT_DATA_METADATA_UPDATE: return "Metadata Update"; - case AV_PKT_DATA_MPEGTS_STREAM_ID: return "MPEGTS Stream ID"; + case AV_PKT_DATA_PALETTE: return "Palette"; + case AV_PKT_DATA_NEW_EXTRADATA: return "New Extradata"; + case AV_PKT_DATA_PARAM_CHANGE: return "Param Change"; + case AV_PKT_DATA_H263_MB_INFO: return "H263 MB Info"; + case AV_PKT_DATA_REPLAYGAIN: return "Replay Gain"; + case AV_PKT_DATA_DISPLAYMATRIX: return "Display Matrix"; + case AV_PKT_DATA_STEREO3D: return "Stereo 3D"; + case AV_PKT_DATA_AUDIO_SERVICE_TYPE: return "Audio Service Type"; + case AV_PKT_DATA_SKIP_SAMPLES: return "Skip Samples"; + case AV_PKT_DATA_JP_DUALMONO: return "JP Dual Mono"; + case AV_PKT_DATA_STRINGS_METADATA: return "Strings Metadata"; + case AV_PKT_DATA_SUBTITLE_POSITION: return "Subtitle Position"; + case AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL: return "Matroska BlockAdditional"; + case AV_PKT_DATA_WEBVTT_IDENTIFIER: return "WebVTT ID"; + case AV_PKT_DATA_WEBVTT_SETTINGS: return "WebVTT Settings"; + case AV_PKT_DATA_METADATA_UPDATE: return "Metadata Update"; + case AV_PKT_DATA_MPEGTS_STREAM_ID: return "MPEGTS Stream ID"; + case AV_PKT_DATA_MASTERING_DISPLAY_METADATA: return "Mastering display metadata"; } return NULL; } -- cgit v1.2.3