[FFmpeg-devel,v2] avcodec/cbs_h265: add support for Alpha Channel Info SEI messages

Submitted by James Almer on July 9, 2019, 9:27 p.m.

Details

Message ID 20190709212707.1016-1-jamrial@gmail.com
State Accepted
Commit e460dcc832e911982e5cf143ce7ff52c95547ab0
Headers show

Commit Message

James Almer July 9, 2019, 9:27 p.m.
As defined in sections F.14.2.8 and F.14.3.8

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavcodec/cbs_h2645.c                |  1 +
 libavcodec/cbs_h265.h                 | 12 +++++++++++
 libavcodec/cbs_h265_syntax_template.c | 29 +++++++++++++++++++++++++++
 libavcodec/hevc_sei.h                 |  1 +
 4 files changed, 43 insertions(+)

Comments

Mark Thompson July 20, 2019, 1:54 p.m.
On 09/07/2019 22:27, James Almer wrote:
> As defined in sections F.14.2.8 and F.14.3.8
> 
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
>  libavcodec/cbs_h2645.c                |  1 +
>  libavcodec/cbs_h265.h                 | 12 +++++++++++
>  libavcodec/cbs_h265_syntax_template.c | 29 +++++++++++++++++++++++++++
>  libavcodec/hevc_sei.h                 |  1 +
>  4 files changed, 43 insertions(+)

LGTM.

Thanks,

- Mark
James Almer July 20, 2019, 2:35 p.m.
On 7/20/2019 10:54 AM, Mark Thompson wrote:
> On 09/07/2019 22:27, James Almer wrote:
>> As defined in sections F.14.2.8 and F.14.3.8
>>
>> Signed-off-by: James Almer <jamrial@gmail.com>
>> ---
>>  libavcodec/cbs_h2645.c                |  1 +
>>  libavcodec/cbs_h265.h                 | 12 +++++++++++
>>  libavcodec/cbs_h265_syntax_template.c | 29 +++++++++++++++++++++++++++
>>  libavcodec/hevc_sei.h                 |  1 +
>>  4 files changed, 43 insertions(+)
> 
> LGTM.
> 
> Thanks,
> 
> - Mark

Applied.

Patch hide | download patch | download mbox

diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c
index da4927ca8e..5bd03805be 100644
--- a/libavcodec/cbs_h2645.c
+++ b/libavcodec/cbs_h2645.c
@@ -529,6 +529,7 @@  static void cbs_h265_free_sei_payload(H265RawSEIPayload *payload)
     case HEVC_SEI_TYPE_MASTERING_DISPLAY_INFO:
     case HEVC_SEI_TYPE_CONTENT_LIGHT_LEVEL_INFO:
     case HEVC_SEI_TYPE_ALTERNATIVE_TRANSFER_CHARACTERISTICS:
+    case HEVC_SEI_TYPE_ALPHA_CHANNEL_INFO:
         break;
     case HEVC_SEI_TYPE_USER_DATA_REGISTERED_ITU_T_T35:
         av_buffer_unref(&payload->payload.user_data_registered.data_ref);
diff --git a/libavcodec/cbs_h265.h b/libavcodec/cbs_h265.h
index c9bc90187b..ad746bf35f 100644
--- a/libavcodec/cbs_h265.h
+++ b/libavcodec/cbs_h265.h
@@ -679,6 +679,17 @@  typedef struct H265RawSEIAlternativeTransferCharacteristics {
     uint8_t preferred_transfer_characteristics;
 } H265RawSEIAlternativeTransferCharacteristics;
 
+typedef struct H265RawSEIAlphaChannelInfo {
+    uint8_t  alpha_channel_cancel_flag;
+    uint8_t  alpha_channel_use_idc;
+    uint8_t  alpha_channel_bit_depth_minus8;
+    uint16_t alpha_transparent_value;
+    uint16_t alpha_opaque_value;
+    uint8_t  alpha_channel_incr_flag;
+    uint8_t  alpha_channel_clip_flag;
+    uint8_t  alpha_channel_clip_type_flag;
+} H265RawSEIAlphaChannelInfo;
+
 typedef struct H265RawSEIPayload {
     uint32_t payload_type;
     uint32_t payload_size;
@@ -697,6 +708,7 @@  typedef struct H265RawSEIPayload {
         H265RawSEIContentLightLevelInfo content_light_level;
         H265RawSEIAlternativeTransferCharacteristics
             alternative_transfer_characteristics;
+        H265RawSEIAlphaChannelInfo alpha_channel_info;
         struct {
             uint8_t *data;
             size_t data_length;
diff --git a/libavcodec/cbs_h265_syntax_template.c b/libavcodec/cbs_h265_syntax_template.c
index f279d283d9..54570929ec 100644
--- a/libavcodec/cbs_h265_syntax_template.c
+++ b/libavcodec/cbs_h265_syntax_template.c
@@ -2028,6 +2028,34 @@  static int FUNC(sei_alternative_transfer_characteristics)(CodedBitstreamContext
     return 0;
 }
 
+static int FUNC(sei_alpha_channel_info)(CodedBitstreamContext *ctx,
+                                        RWContext *rw,
+                                        H265RawSEIAlphaChannelInfo *current)
+{
+    int err, length;
+
+    HEADER("Alpha Channel Information");
+
+    flag(alpha_channel_cancel_flag);
+    if (!current->alpha_channel_cancel_flag) {
+        ub(3, alpha_channel_use_idc);
+        ub(3, alpha_channel_bit_depth_minus8);
+        length = current->alpha_channel_bit_depth_minus8 + 9;
+        ub(length, alpha_transparent_value);
+        ub(length, alpha_opaque_value);
+        flag(alpha_channel_incr_flag);
+        flag(alpha_channel_clip_flag);
+        if (current->alpha_channel_clip_flag)
+            flag(alpha_channel_clip_type_flag);
+    } else {
+       infer(alpha_channel_use_idc,   2);
+       infer(alpha_channel_incr_flag, 0);
+       infer(alpha_channel_clip_flag, 0);
+    }
+
+    return 0;
+}
+
 static int FUNC(sei_payload)(CodedBitstreamContext *ctx, RWContext *rw,
                              H265RawSEIPayload *current, int prefix)
 {
@@ -2080,6 +2108,7 @@  static int FUNC(sei_payload)(CodedBitstreamContext *ctx, RWContext *rw,
         SEI_TYPE_N(CONTENT_LIGHT_LEVEL_INFO, 1, 0, content_light_level);
         SEI_TYPE_N(ALTERNATIVE_TRANSFER_CHARACTERISTICS,
                                              1, 0, alternative_transfer_characteristics);
+        SEI_TYPE_N(ALPHA_CHANNEL_INFO,       1, 0, alpha_channel_info);
 
 #undef SEI_TYPE
     default:
diff --git a/libavcodec/hevc_sei.h b/libavcodec/hevc_sei.h
index 2fec00ace0..f6516ae982 100644
--- a/libavcodec/hevc_sei.h
+++ b/libavcodec/hevc_sei.h
@@ -56,6 +56,7 @@  typedef enum {
     HEVC_SEI_TYPE_MASTERING_DISPLAY_INFO               = 137,
     HEVC_SEI_TYPE_CONTENT_LIGHT_LEVEL_INFO             = 144,
     HEVC_SEI_TYPE_ALTERNATIVE_TRANSFER_CHARACTERISTICS = 147,
+    HEVC_SEI_TYPE_ALPHA_CHANNEL_INFO                   = 165,
 } HEVC_SEI_Type;
 
 typedef struct HEVCSEIPictureHash {