Aman Karmani: > From: Aman Karmani <a...@tmm1.net> > > Signed-off-by: Aman Karmani <a...@tmm1.net> > --- > avcodec/vaapi_encode_h26x: passthrough A53 CC data as H264/HEVC SEI > > v3: fix build failure v2: add control via sei parameter > > Published-As: > https://github.com/ffstaging/FFmpeg/releases/tag/pr-ffstaging-46%2Ftmm1%2Fvaapi-a53cc-v3 > Fetch-It-Via: git fetch https://github.com/ffstaging/FFmpeg > pr-ffstaging-46/tmm1/vaapi-a53cc-v3 > Pull-Request: https://github.com/ffstaging/FFmpeg/pull/46 > > Range-diff vs v2: > > 1: 9a2fee07a9 ! 1: 149fa8e61c avcodec/vaapi_encode_h26x: passthrough A53 > CC data as H264/HEVC SEI > @@ libavcodec/vaapi_encode_h264.c: static const AVOption > vaapi_encode_h264_options[ > { "recovery_point", "Include recovery points where appropriate", > 0, AV_OPT_TYPE_CONST, { .i64 = SEI_RECOVERY_POINT }, > INT_MIN, INT_MAX, FLAGS, "sei" }, > -+ { "a53_cc", "Include A/53 caption data" > ++ { "a53_cc", "Include A/53 caption data", > + 0, AV_OPT_TYPE_CONST, { .i64 = SEI_A53_CC }, > + INT_MIN, INT_MAX, FLAGS, "sei" }, > > @@ libavcodec/vaapi_encode_h265.c: static const AVOption > vaapi_encode_h265_options[ > { .i64 = SEI_MASTERING_DISPLAY | SEI_CONTENT_LIGHT_LEVEL }, > INT_MIN, INT_MAX, FLAGS, "sei" }, > + { "a53_cc", > -+ "Include A/53 caption data" > ++ "Include A/53 caption data", > + 0, AV_OPT_TYPE_CONST, > + { .i64 = SEI_A53_CC }, > + INT_MIN, INT_MAX, FLAGS, "sei" }, > > > libavcodec/vaapi_encode_h264.c | 33 +++++++++++++++++++++++++++++++- > libavcodec/vaapi_encode_h265.c | 35 +++++++++++++++++++++++++++++++++- > 2 files changed, 66 insertions(+), 2 deletions(-) > > diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c > index b1b503b2a6..9f9d77a0e9 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; > > @@ -681,6 +692,22 @@ static int > vaapi_encode_h264_init_picture_params(AVCodecContext *avctx, > priv->sei_needed |= SEI_RECOVERY_POINT; > } > > + if (priv->sei & SEI_A53_CC) { > + int err; > + size_t sei_a53cc_len; > + 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 +1253,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); > } > @@ -1252,7 +1280,7 @@ static const AVOption vaapi_encode_h264_options[] = { > > { "sei", "Set SEI to include", > OFFSET(sei), AV_OPT_TYPE_FLAGS, > - { .i64 = SEI_IDENTIFIER | SEI_TIMING | SEI_RECOVERY_POINT }, > + { .i64 = SEI_IDENTIFIER | SEI_TIMING | SEI_RECOVERY_POINT | SEI_A53_CC > }, > 0, INT_MAX, FLAGS, "sei" }, > { "identifier", "Include encoder version identifier", > 0, AV_OPT_TYPE_CONST, { .i64 = SEI_IDENTIFIER }, > @@ -1263,6 +1291,9 @@ static const AVOption vaapi_encode_h264_options[] = { > { "recovery_point", "Include recovery points where appropriate", > 0, AV_OPT_TYPE_CONST, { .i64 = SEI_RECOVERY_POINT }, > INT_MIN, INT_MAX, FLAGS, "sei" }, > + { "a53_cc", "Include A/53 caption data", > + 0, AV_OPT_TYPE_CONST, { .i64 = SEI_A53_CC }, > + INT_MIN, INT_MAX, FLAGS, "sei" }, > > { "profile", "Set profile (profile_idc and constraint_set*_flag)", > OFFSET(profile), AV_OPT_TYPE_INT, > diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c > index 94b56c6578..f5b85cef6f 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; > > @@ -888,6 +899,22 @@ static int > vaapi_encode_h265_init_picture_params(AVCodecContext *avctx, > } > } > > + if (priv->sei & SEI_A53_CC) { > + int err; > + size_t sei_a53cc_len; > + 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 +1382,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); > } > @@ -1413,7 +1441,7 @@ static const AVOption vaapi_encode_h265_options[] = { > > { "sei", "Set SEI to include", > OFFSET(sei), AV_OPT_TYPE_FLAGS, > - { .i64 = SEI_MASTERING_DISPLAY | SEI_CONTENT_LIGHT_LEVEL }, > + { .i64 = SEI_MASTERING_DISPLAY | SEI_CONTENT_LIGHT_LEVEL | SEI_A53_CC > }, > 0, INT_MAX, FLAGS, "sei" }, > { "hdr", > "Include HDR metadata for mastering display colour volume " > @@ -1421,6 +1449,11 @@ static const AVOption vaapi_encode_h265_options[] = { > 0, AV_OPT_TYPE_CONST, > { .i64 = SEI_MASTERING_DISPLAY | SEI_CONTENT_LIGHT_LEVEL }, > INT_MIN, INT_MAX, FLAGS, "sei" }, > + { "a53_cc", > + "Include A/53 caption data", > + 0, AV_OPT_TYPE_CONST, > + { .i64 = SEI_A53_CC }, > + INT_MIN, INT_MAX, FLAGS, "sei" }, > > { "tiles", "Tile columns x rows", > OFFSET(common.tile_cols), AV_OPT_TYPE_IMAGE_SIZE, > > base-commit: 3bcec58535d395945a390bdc7af4048a7abc60eb
1. You are repeating yourself in this patch. 2. You forgot to add the necessary atsc_a53 configure dependencies. - Andreas _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
