Re: [FFmpeg-devel] [PATCH] avcodec/vaapi_encode_h26x: passthrough A53 CC data as H264/HEVC SEI

["Xiang, Haihao" <haihao.xiang-at-intel.com@ffmpeg.org>]

On Ma, 2023-01-02 at 19:32 +0000, Aman Karmani wrote:
> From: Aman Karmani <aman@tmm1.net>
> 
> Signed-off-by: Aman Karmani <aman@tmm1.net>
> ---
>     avcodec/vaapi_encode_h26x: passthrough A53 CC data as H264/HEVC SEI
> 
> Published-As: 
> https://github.com/ffstaging/FFmpeg/releases/tag/pr-ffstaging-46%2Ftmm1%2Fvaapi-a53cc-v1
> Fetch-It-Via: git fetch https://github.com/ffstaging/FFmpeg pr-ffstaging-
> 46/tmm1/vaapi-a53cc-v1
> Pull-Request: https://github.com/ffstaging/FFmpeg/pull/46
> 
>  libavcodec/vaapi_encode_h264.c | 27 ++++++++++++++++++++++++++-
>  libavcodec/vaapi_encode_h265.c | 27 ++++++++++++++++++++++++++-
>  2 files changed, 52 insertions(+), 2 deletions(-)
> 
> diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c
> index b1b503b2a6..d22b38ab38 100644
> --- a/libavcodec/vaapi_encode_h264.c
> +++ b/libavcodec/vaapi_encode_h264.c
> @@ -26,6 +26,7 @@
>  #include "libavutil/internal.h"
>  #include "libavutil/opt.h"
>  
> +#include "atsc_a53.h"
>  #include "avcodec.h"
>  #include "cbs.h"
>  #include "cbs_h264.h"
> @@ -40,6 +41,7 @@ enum {
>      SEI_TIMING         = 0x01,
>      SEI_IDENTIFIER     = 0x02,
>      SEI_RECOVERY_POINT = 0x04,
> +    SEI_A53_CC         = 0x08,
>  };
>  
>  // Random (version 4) ISO 11578 UUID.
> @@ -98,6 +100,8 @@ typedef struct VAAPIEncodeH264Context {
>      H264RawSEIRecoveryPoint        sei_recovery_point;
>      SEIRawUserDataUnregistered     sei_identifier;
>      char                          *sei_identifier_string;
> +    SEIRawUserDataRegistered       sei_a53cc;
> +    void                          *sei_a53cc_data;
>  
>      int aud_needed;
>      int sei_needed;
> @@ -248,6 +252,13 @@ static int
> vaapi_encode_h264_write_extra_header(AVCodecContext *avctx,
>              if (err < 0)
>                  goto fail;
>          }
> +        if (priv->sei_needed & SEI_A53_CC) {
> +            err = ff_cbs_sei_add_message(priv->cbc, au, 1,
> +                                         SEI_TYPE_USER_DATA_REGISTERED_ITU_T_
> T35,
> +                                         &priv->sei_a53cc, NULL);
> +            if (err < 0)
> +                goto fail;
> +        }
>  
>          priv->sei_needed = 0;
>  
> @@ -607,7 +618,8 @@ static int
> vaapi_encode_h264_init_picture_params(AVCodecContext *avctx,
>      VAAPIEncodePicture              *prev = pic->prev;
>      VAAPIEncodeH264Picture         *hprev = prev ? prev->priv_data : NULL;
>      VAEncPictureParameterBufferH264 *vpic = pic->codec_picture_params;
> -    int i;
> +    int i, err;
> +    size_t sei_a53cc_len;
>  
>      if (pic->type == PICTURE_TYPE_IDR) {
>          av_assert0(pic->display_order == pic->encode_order);
> @@ -681,6 +693,18 @@ static int
> vaapi_encode_h264_init_picture_params(AVCodecContext *avctx,
>          priv->sei_needed |= SEI_RECOVERY_POINT;
>      }
>  
> +    av_freep(&priv->sei_a53cc_data);
> +    err = ff_alloc_a53_sei(pic->input_image, 0, &priv->sei_a53cc_data,
> &sei_a53cc_len);
> +    if (err < 0)
> +        return err;
> +    if (priv->sei_a53cc_data != NULL) {
> +        priv->sei_a53cc.itu_t_t35_country_code = 181;
> +        priv->sei_a53cc.data = (uint8_t *)priv->sei_a53cc_data + 1;
> +        priv->sei_a53cc.data_length = sei_a53cc_len - 1;
> +
> +        priv->sei_needed |= SEI_A53_CC;
> +    }
> +
>      vpic->CurrPic = (VAPictureH264) {
>          .picture_id          = pic->recon_surface,
>          .frame_idx           = hpic->frame_num,
> @@ -1226,6 +1250,7 @@ static av_cold int
> vaapi_encode_h264_close(AVCodecContext *avctx)
>      ff_cbs_fragment_free(&priv->current_access_unit);
>      ff_cbs_close(&priv->cbc);
>      av_freep(&priv->sei_identifier_string);
> +    av_freep(&priv->sei_a53cc_data);
>  
>      return ff_vaapi_encode_close(avctx);
>  }
> diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c
> index 94b56c6578..3611bd6147 100644
> --- a/libavcodec/vaapi_encode_h265.c
> +++ b/libavcodec/vaapi_encode_h265.c
> @@ -27,6 +27,7 @@
>  #include "libavutil/opt.h"
>  #include "libavutil/mastering_display_metadata.h"
>  
> +#include "atsc_a53.h"
>  #include "avcodec.h"
>  #include "cbs.h"
>  #include "cbs_h265.h"
> @@ -40,6 +41,7 @@
>  enum {
>      SEI_MASTERING_DISPLAY       = 0x08,
>      SEI_CONTENT_LIGHT_LEVEL     = 0x10,
> +    SEI_A53_CC                  = 0x20,
>  };
>  
>  typedef struct VAAPIEncodeH265Picture {
> @@ -84,6 +86,8 @@ typedef struct VAAPIEncodeH265Context {
>  
>      SEIRawMasteringDisplayColourVolume sei_mastering_display;
>      SEIRawContentLightLevelInfo        sei_content_light_level;
> +    SEIRawUserDataRegistered           sei_a53cc;
> +    void                              *sei_a53cc_data;
>  
>      CodedBitstreamContext *cbc;
>      CodedBitstreamFragment current_access_unit;
> @@ -226,6 +230,13 @@ static int
> vaapi_encode_h265_write_extra_header(AVCodecContext *avctx,
>              if (err < 0)
>                  goto fail;
>          }
> +        if (priv->sei_needed & SEI_A53_CC) {
> +            err = ff_cbs_sei_add_message(priv->cbc, au, 1,
> +                                         SEI_TYPE_USER_DATA_REGISTERED_ITU_T_
> T35,
> +                                         &priv->sei_a53cc, NULL);
> +            if (err < 0)
> +                goto fail;
> +        }
>  
>          priv->sei_needed = 0;
>  
> @@ -759,7 +770,8 @@ static int
> vaapi_encode_h265_init_picture_params(AVCodecContext *avctx,
>      VAAPIEncodePicture              *prev = pic->prev;
>      VAAPIEncodeH265Picture         *hprev = prev ? prev->priv_data : NULL;
>      VAEncPictureParameterBufferHEVC *vpic = pic->codec_picture_params;
> -    int i;
> +    int i, err;
> +    size_t sei_a53cc_len;
>  
>      if (pic->type == PICTURE_TYPE_IDR) {
>          av_assert0(pic->display_order == pic->encode_order);
> @@ -888,6 +900,18 @@ static int
> vaapi_encode_h265_init_picture_params(AVCodecContext *avctx,
>          }
>      }
>  
> +    av_freep(&priv->sei_a53cc_data);
> +    err = ff_alloc_a53_sei(pic->input_image, 0, &priv->sei_a53cc_data,
> &sei_a53cc_len);
> +    if (err < 0)
> +        return err;
> +    if (priv->sei_a53cc_data != NULL) {
> +        priv->sei_a53cc.itu_t_t35_country_code = 181;
> +        priv->sei_a53cc.data = (uint8_t *)priv->sei_a53cc_data + 1;
> +        priv->sei_a53cc.data_length = sei_a53cc_len - 1;
> +
> +        priv->sei_needed |= SEI_A53_CC;
> +    }
> +
>      vpic->decoded_curr_pic = (VAPictureHEVC) {
>          .picture_id    = pic->recon_surface,
>          .pic_order_cnt = hpic->pic_order_cnt,
> @@ -1355,6 +1379,7 @@ static av_cold int
> vaapi_encode_h265_close(AVCodecContext *avctx)
>  
>      ff_cbs_fragment_free(&priv->current_access_unit);
>      ff_cbs_close(&priv->cbc);
> +    av_freep(&priv->sei_a53cc_data);
>  
>      return ff_vaapi_encode_close(avctx);
>  }

May we use sei option to control whether a53 CC data is inserted into the coded
stream ? The default value of sei can be changed to SEI_IDENTIFIER | SEI_TIMING
| SEI_RECOVERY_POINT | SEI_A53_CC for h264 and SEI_MASTERING_DISPLAY |
SEI_CONTENT_LIGHT_LEVEL | SEI_A53_CC for h265. 

Thanks
Haihao



> 
> base-commit: 3bcec58535d395945a390bdc7af4048a7abc60eb
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".