On 5/7/2018 8:11 PM, Mark Thompson wrote: > --- > libavcodec/cbs_h264.h | 10 ++++++++++ > libavcodec/cbs_h2645.c | 1 + > libavcodec/cbs_h264_syntax_template.c | 23 +++++++++++++++++++++++ > libavcodec/h264_sei.h | 1 + > 4 files changed, 35 insertions(+) > > diff --git a/libavcodec/cbs_h264.h b/libavcodec/cbs_h264.h > index b9536611ef..c46dd5064c 100644 > --- a/libavcodec/cbs_h264.h > +++ b/libavcodec/cbs_h264.h > @@ -306,6 +306,15 @@ typedef struct H264RawSEIDisplayOrientation { > uint8_t display_orientation_extension_flag; > } H264RawSEIDisplayOrientation; > > +typedef struct H264RawSEIMasteringDisplayColourVolume { > + uint16_t display_primaries_x[3]; > + uint16_t display_primaries_y[3]; > + uint16_t white_point_x; > + uint16_t white_point_y; > + uint16_t max_display_mastering_luminance; > + uint16_t min_display_mastering_luminance;
These two should be uint32_t. > +} H264RawSEIMasteringDisplayColourVolume; > + > typedef struct H264RawSEIPayload { > uint32_t payload_type; > uint32_t payload_size; > @@ -318,6 +327,7 @@ typedef struct H264RawSEIPayload { > H264RawSEIUserDataUnregistered user_data_unregistered; > H264RawSEIRecoveryPoint recovery_point; > H264RawSEIDisplayOrientation display_orientation; > + H264RawSEIMasteringDisplayColourVolume > mastering_display_colour_volume; > struct { > uint8_t *data; > size_t data_length; > diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c > index b8194cb3b1..7354a949cf 100644 > --- a/libavcodec/cbs_h2645.c > +++ b/libavcodec/cbs_h2645.c > @@ -427,6 +427,7 @@ static void cbs_h264_free_sei_payload(H264RawSEIPayload > *payload) > case H264_SEI_TYPE_PAN_SCAN_RECT: > case H264_SEI_TYPE_RECOVERY_POINT: > case H264_SEI_TYPE_DISPLAY_ORIENTATION: > + case H264_SEI_TYPE_MASTERING_DISPLAY_COLOUR_VOLUME: > break; > case H264_SEI_TYPE_USER_DATA_REGISTERED: > av_buffer_unref(&payload->payload.user_data_registered.data_ref); > diff --git a/libavcodec/cbs_h264_syntax_template.c > b/libavcodec/cbs_h264_syntax_template.c > index fb1685e6e6..027b555db6 100644 > --- a/libavcodec/cbs_h264_syntax_template.c > +++ b/libavcodec/cbs_h264_syntax_template.c > @@ -740,6 +740,25 @@ static int > FUNC(sei_display_orientation)(CodedBitstreamContext *ctx, RWContext * > return 0; > } > > +static int FUNC(sei_mastering_display_colour_volume)(CodedBitstreamContext > *ctx, RWContext *rw, > + > H264RawSEIMasteringDisplayColourVolume *current) > +{ > + int err, c; > + > + for (c = 0; c < 3; c++) { > + us(16, display_primaries_x[c], 0, 50000, 1, c); > + us(16, display_primaries_y[c], 0, 50000, 1, c); > + } > + > + u(16, white_point_x, 0, 50000); > + u(16, white_point_y, 0, 50000); > + > + u(32, max_display_mastering_luminance, 1, MAX_UINT_BITS(32)); > + u(32, min_display_mastering_luminance, 0, > current->max_display_mastering_luminance - 1); > + > + return 0; > +} > + > static int FUNC(sei_payload)(CodedBitstreamContext *ctx, RWContext *rw, > H264RawSEIPayload *current) > { > @@ -787,6 +806,10 @@ static int FUNC(sei_payload)(CodedBitstreamContext *ctx, > RWContext *rw, > CHECK(FUNC(sei_display_orientation) > (ctx, rw, ¤t->payload.display_orientation)); > break; > + case H264_SEI_TYPE_MASTERING_DISPLAY_COLOUR_VOLUME: > + CHECK(FUNC(sei_mastering_display_colour_volume) > + (ctx, rw, ¤t->payload.mastering_display_colour_volume)); > + break; > default: > { > #ifdef READ > diff --git a/libavcodec/h264_sei.h b/libavcodec/h264_sei.h > index 6455f3cec5..a169a10e49 100644 > --- a/libavcodec/h264_sei.h > +++ b/libavcodec/h264_sei.h > @@ -35,6 +35,7 @@ typedef enum { > H264_SEI_TYPE_FRAME_PACKING = 45, ///< frame packing > arrangement > H264_SEI_TYPE_DISPLAY_ORIENTATION = 47, ///< display orientation > H264_SEI_TYPE_GREEN_METADATA = 56, ///< GreenMPEG information > + H264_SEI_TYPE_MASTERING_DISPLAY_COLOUR_VOLUME = 137, ///< mastering > display properties > H264_SEI_TYPE_ALTERNATIVE_TRANSFER = 147, ///< alternative transfer > } H264_SEI_Type; > > _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel