As found in HEVC.
Signed-off-by: James Almer <[email protected]>
---
doc/APIchanges | 5 +++++
libavutil/frame.h | 6 ++++++
libavutil/mastering_display_metadata.c | 23 ++++++++++++++++++++
libavutil/mastering_display_metadata.h | 39 ++++++++++++++++++++++++++++++++++
libavutil/version.h | 2 +-
5 files changed, 74 insertions(+), 1 deletion(-)
diff --git a/doc/APIchanges b/doc/APIchanges
index e8bb5a4012..4c35f727e6 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -13,6 +13,11 @@ libavutil: 2017-03-23
API changes, most recent first:
+2016-04-xx - xxxxxxx - lavu 56.2.0 - mastering_display_metadata.h
+ Add AV_FRAME_DATA_CONTENT_LIGHT_LEVEL value,
av_content_light_metadata_alloc()
+ and av_content_light_metadata_create_side_data() API, and
AVContentLightMetadata
+ type to export content light level video properties.
+
2017-04-xx - xxxxxxx - lavc 58.1.1 - avcodec.h
Add AV_PKT_DATA_MASTERING_DISPLAY_METADATA.
diff --git a/libavutil/frame.h b/libavutil/frame.h
index 881d8f0051..a6b50feb49 100644
--- a/libavutil/frame.h
+++ b/libavutil/frame.h
@@ -105,6 +105,12 @@ enum AVFrameSideDataType {
* mastering display color volume.
*/
AV_FRAME_DATA_MASTERING_DISPLAY_METADATA,
+
+ /**
+ * Content light level (based on CTA-861.3). This payload contains data in
+ * the form of the AVContentLightMetadata struct.
+ */
+ AV_FRAME_DATA_CONTENT_LIGHT_LEVEL,
};
enum AVActiveFormatDescription {
diff --git a/libavutil/mastering_display_metadata.c
b/libavutil/mastering_display_metadata.c
index e1683e55c7..6069347617 100644
--- a/libavutil/mastering_display_metadata.c
+++ b/libavutil/mastering_display_metadata.c
@@ -41,3 +41,26 @@ AVMasteringDisplayMetadata
*av_mastering_display_metadata_create_side_data(AVFra
return (AVMasteringDisplayMetadata *)side_data->data;
}
+
+AVContentLightMetadata *av_content_light_metadata_alloc(size_t *size)
+{
+ AVContentLightMetadata *metadata =
av_mallocz(sizeof(AVContentLightMetadata));
+
+ if (size)
+ *size = sizeof(*metadata);
+
+ return metadata;
+}
+
+AVContentLightMetadata *av_content_light_metadata_create_side_data(AVFrame
*frame)
+{
+ AVFrameSideData *side_data = av_frame_new_side_data(frame,
+
AV_FRAME_DATA_CONTENT_LIGHT_LEVEL,
+
sizeof(AVContentLightMetadata));
+ if (!side_data)
+ return NULL;
+
+ memset(side_data->data, 0, sizeof(AVContentLightMetadata));
+
+ return (AVContentLightMetadata *)side_data->data;
+}
diff --git a/libavutil/mastering_display_metadata.h
b/libavutil/mastering_display_metadata.h
index 936533fec4..847b0b62c6 100644
--- a/libavutil/mastering_display_metadata.h
+++ b/libavutil/mastering_display_metadata.h
@@ -86,4 +86,43 @@ AVMasteringDisplayMetadata
*av_mastering_display_metadata_alloc(void);
*/
AVMasteringDisplayMetadata
*av_mastering_display_metadata_create_side_data(AVFrame *frame);
+/**
+ * Content light level needed by to transmit HDR over HDMI (CTA-861.3).
+ *
+ * To be used as payload of a AVFrameSideData or AVPacketSideData with the
+ * appropriate type.
+ *
+ * @note The struct should be allocated with av_content_light_metadata_alloc()
+ * and its size is not a part of the public ABI.
+ */
+typedef struct AVContentLightMetadata {
+ /**
+ * Max content light level (cd/m^2).
+ */
+ unsigned MaxCLL;
+
+ /**
+ * Max average light level per frame (cd/m^2).
+ */
+ unsigned MaxFALL;
+} AVContentLightMetadata;
+
+/**
+ * Allocate an AVContentLightMetadata structure and set its fields to
+ * default values. The resulting struct can be freed using av_freep().
+ *
+ * @return An AVContentLightMetadata filled with default values or NULL
+ * on failure.
+ */
+AVContentLightMetadata *av_content_light_metadata_alloc(size_t *size);
+
+/**
+ * Allocate a complete AVContentLightMetadata and add it to the frame.
+ *
+ * @param frame The frame which side data is added to.
+ *
+ * @return The AVContentLightMetadata structure to be filled by caller.
+ */
+AVContentLightMetadata *av_content_light_metadata_create_side_data(AVFrame
*frame);
+
#endif /* AVUTIL_MASTERING_DISPLAY_METADATA_H */
diff --git a/libavutil/version.h b/libavutil/version.h
index fd72ff431d..2c85120b64 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -54,7 +54,7 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 56
-#define LIBAVUTIL_VERSION_MINOR 1
+#define LIBAVUTIL_VERSION_MINOR 2
#define LIBAVUTIL_VERSION_MICRO 0
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
--
2.11.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
