Browse Source

cbs_h265: read/write content light level information SEI message

Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
tags/n4.1
Haihao Xiang Mark Thompson 7 years ago
parent
commit
2943dd35b7
3 changed files with 24 additions and 0 deletions
  1. +1
    -0
      libavcodec/cbs_h2645.c
  2. +6
    -0
      libavcodec/cbs_h265.h
  3. +17
    -0
      libavcodec/cbs_h265_syntax_template.c

+ 1
- 0
libavcodec/cbs_h2645.c View File

@@ -488,6 +488,7 @@ static void cbs_h265_free_sei_payload(H265RawSEIPayload *payload)
{
switch (payload->payload_type) {
case HEVC_SEI_TYPE_MASTERING_DISPLAY_INFO:
case HEVC_SEI_TYPE_CONTENT_LIGHT_LEVEL_INFO:
break;
default:
av_buffer_unref(&payload->payload.other.data_ref);


+ 6
- 0
libavcodec/cbs_h265.h View File

@@ -533,11 +533,17 @@ typedef struct H265RawSEIMasteringDisplayColourVolume {
uint32_t min_display_mastering_luminance;
} H265RawSEIMasteringDisplayColourVolume;

typedef struct H265RawSEIContentLightLevelInfo {
uint16_t max_content_light_level;
uint16_t max_pic_average_light_level;
} H265RawSEIContentLightLevelInfo;

typedef struct H265RawSEIPayload {
uint32_t payload_type;
uint32_t payload_size;
union {
H265RawSEIMasteringDisplayColourVolume mastering_display;
H265RawSEIContentLightLevelInfo content_light_level;
struct {
uint8_t *data;
size_t data_length;


+ 17
- 0
libavcodec/cbs_h265_syntax_template.c View File

@@ -1526,6 +1526,17 @@ static int FUNC(sei_mastering_display)(CodedBitstreamContext *ctx, RWContext *rw
return 0;
}

static int FUNC(sei_content_light_level)(CodedBitstreamContext *ctx, RWContext *rw,
H265RawSEIContentLightLevelInfo *current)
{
int err;

u(16, max_content_light_level, 0, MAX_UINT_BITS(16));
u(16, max_pic_average_light_level, 0, MAX_UINT_BITS(16));

return 0;
}

static int FUNC(sei_payload)(CodedBitstreamContext *ctx, RWContext *rw,
H265RawSEIPayload *current)
{
@@ -1545,6 +1556,12 @@ static int FUNC(sei_payload)(CodedBitstreamContext *ctx, RWContext *rw,

break;

case HEVC_SEI_TYPE_CONTENT_LIGHT_LEVEL_INFO:
CHECK(FUNC(sei_content_light_level)
(ctx, rw, &current->payload.content_light_level));

break;

default:
{
#ifdef READ


Loading…
Cancel
Save