videoutils: add HDR metadata fields to GstVideoCodecState

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1175>
This commit is contained in:
Jakub Adam 2021-05-25 21:15:53 +02:00 committed by Nicolas Dufresne
parent a14f4f48c4
commit b3c7b9be49
2 changed files with 27 additions and 1 deletions

View file

@ -171,6 +171,10 @@ _gst_video_codec_state_free (GstVideoCodecState * state)
gst_caps_unref (state->allocation_caps); gst_caps_unref (state->allocation_caps);
if (state->codec_data) if (state->codec_data)
gst_buffer_unref (state->codec_data); gst_buffer_unref (state->codec_data);
if (state->mastering_display_info)
g_slice_free (GstVideoMasteringDisplayInfo, state->mastering_display_info);
if (state->content_light_level)
g_slice_free (GstVideoContentLightLevel, state->content_light_level);
g_slice_free (GstVideoCodecState, state); g_slice_free (GstVideoCodecState, state);
} }

View file

@ -28,6 +28,7 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/video/video-prelude.h> #include <gst/video/video-prelude.h>
#include <gst/video/video-hdr.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GST_TYPE_VIDEO_CODEC_STATE \ #define GST_TYPE_VIDEO_CODEC_STATE \
@ -47,6 +48,10 @@ typedef struct _GstVideoCodecFrame GstVideoCodecFrame;
* 'codec_data' field of a stream, or NULL. * 'codec_data' field of a stream, or NULL.
* @allocation_caps: The #GstCaps for allocation query and pool * @allocation_caps: The #GstCaps for allocation query and pool
* negotiation. Since: 1.10 * negotiation. Since: 1.10
* @mastering_display_info: Mastering display color volume information
* (HDR metadata) for the stream. Since: 1.20
* @content_light_level: Content light level information for the stream.
* Since: 1.20
* *
* Structure representing the state of an incoming or outgoing video * Structure representing the state of an incoming or outgoing video
* stream for encoders and decoders. * stream for encoders and decoders.
@ -58,6 +63,20 @@ typedef struct _GstVideoCodecFrame GstVideoCodecFrame;
* gst_video_decoder_set_output_state() or * gst_video_decoder_set_output_state() or
* gst_video_encoder_set_output_state() methods. * gst_video_encoder_set_output_state() methods.
*/ */
/**
* GstVideoCodecState.mastering_display_info:
*
* Mastering display color volume information (HDR metadata) for the stream.
*
* Since: 1.20
*/
/**
* GstVideoCodecState.content_light_level:
*
* Content light level information for the stream.
*
* Since: 1.20
*/
struct _GstVideoCodecState struct _GstVideoCodecState
{ {
/*< private >*/ /*< private >*/
@ -72,8 +91,11 @@ struct _GstVideoCodecState
GstCaps *allocation_caps; GstCaps *allocation_caps;
GstVideoMasteringDisplayInfo *mastering_display_info;
GstVideoContentLightLevel *content_light_level;
/*< private >*/ /*< private >*/
gpointer padding[GST_PADDING_LARGE - 1]; gpointer padding[GST_PADDING_LARGE - 3];
}; };
/** /**