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 <neil.birkb...@gmail.com>
---
libavcodec/avcodec.h | 7 +++++++
libavcodec/avpacket.c | 33 +++++++++++++++++----------------
libavcodec/utils.c | 9 +++++----
libavcodec/version.h | 2 +-
4 files changed, 30 insertions(+), 21 deletions(-)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index d849765..313f660 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1403,6 +1403,13 @@ enum AVPacketSideDataType {
* side data includes updated metadata which appeared in the stream.
*/
AV_PKT_DATA_METADATA_UPDATE,
+
+ /**
+ * Mastering display metadata (based on SMPTE-2086:2014). This metadata
+ * should be associated with a video stream and containts data in the form
+ * of the AVMasteringDisplayMetadata struct.
+ */
+ AV_PKT_DATA_MASTERING_DISPLAY_METADATA
};
#define AV_PKT_DATA_QUALITY_FACTOR AV_PKT_DATA_QUALITY_STATS //DEPRECATED
diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c
index 4901d36..a2e077a 100644
--- a/libavcodec/avpacket.c
+++ b/libavcodec/avpacket.c
@@ -335,22 +335,23 @@ 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_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_MASTERING_DISPLAY_METADATA: return "Mastering display
metadata";
}
return NULL;
}
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index f532824..c538ecb 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -754,10 +754,11 @@ int ff_init_buffer_info(AVCodecContext *avctx, AVFrame
*frame)
enum AVPacketSideDataType packet;
enum AVFrameSideDataType frame;
} sd[] = {
- { AV_PKT_DATA_REPLAYGAIN , AV_FRAME_DATA_REPLAYGAIN },
- { AV_PKT_DATA_DISPLAYMATRIX, AV_FRAME_DATA_DISPLAYMATRIX },
- { AV_PKT_DATA_STEREO3D, AV_FRAME_DATA_STEREO3D },
- { AV_PKT_DATA_AUDIO_SERVICE_TYPE, AV_FRAME_DATA_AUDIO_SERVICE_TYPE },
+ { AV_PKT_DATA_REPLAYGAIN , AV_FRAME_DATA_REPLAYGAIN },
+ { AV_PKT_DATA_DISPLAYMATRIX, AV_FRAME_DATA_DISPLAYMATRIX
},
+ { AV_PKT_DATA_STEREO3D, AV_FRAME_DATA_STEREO3D },
+ { AV_PKT_DATA_AUDIO_SERVICE_TYPE,
AV_FRAME_DATA_AUDIO_SERVICE_TYPE },
+ { AV_PKT_DATA_MASTERING_DISPLAY_METADATA,
AV_FRAME_DATA_MASTERING_DISPLAY_METADATA },
};
if (pkt) {
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 99ba2e7..3580cf2 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -30,7 +30,7 @@
#define LIBAVCODEC_VERSION_MAJOR 57
#define LIBAVCODEC_VERSION_MINOR 24
-#define LIBAVCODEC_VERSION_MICRO 105
+#define LIBAVCODEC_VERSION_MICRO 106
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
--
2.7.0.rc3.207.g0ac5344
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
