From: Aman Karmani <ffmpegagent@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Cc: Aman Karmani <aman@tmm1.net>,
"Xiang, Haihao" <haihao.xiang-at-intel.com@ffmpeg.org>
Subject: [FFmpeg-devel] [PATCH v2] avcodec/vaapi_encode_h26x: passthrough A53 CC data as H264/HEVC SEI
Date: Fri, 06 Jan 2023 17:15:00 +0000
Message-ID: <pull.46.v2.ffstaging.FFmpeg.1673025300846.ffmpegagent@gmail.com> (raw)
In-Reply-To: <pull.46.ffstaging.FFmpeg.1672687960493.ffmpegagent@gmail.com>
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
v2: control via sei parameter
Published-As: https://github.com/ffstaging/FFmpeg/releases/tag/pr-ffstaging-46%2Ftmm1%2Fvaapi-a53cc-v2
Fetch-It-Via: git fetch https://github.com/ffstaging/FFmpeg pr-ffstaging-46/tmm1/vaapi-a53cc-v2
Pull-Request: https://github.com/ffstaging/FFmpeg/pull/46
Range-diff vs v1:
1: a8eb71f061 ! 1: 9a2fee07a9 avcodec/vaapi_encode_h26x: passthrough A53 CC data as H264/HEVC SEI
@@ libavcodec/vaapi_encode_h264.c: static int vaapi_encode_h264_write_extra_header(
priv->sei_needed = 0;
-@@ libavcodec/vaapi_encode_h264.c: 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);
@@ libavcodec/vaapi_encode_h264.c: 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;
++ 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;
++ priv->sei_needed |= SEI_A53_CC;
++ }
+ }
+
vpic->CurrPic = (VAPictureH264) {
@@ libavcodec/vaapi_encode_h264.c: static av_cold int vaapi_encode_h264_close(AVCod
return ff_vaapi_encode_close(avctx);
}
+@@ libavcodec/vaapi_encode_h264.c: 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 },
+@@ 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"
++ 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,
## libavcodec/vaapi_encode_h265.c ##
@@
@@ libavcodec/vaapi_encode_h265.c: static int vaapi_encode_h265_write_extra_header(
priv->sei_needed = 0;
-@@ libavcodec/vaapi_encode_h265.c: 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);
@@ libavcodec/vaapi_encode_h265.c: 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;
++ 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;
++ priv->sei_needed |= SEI_A53_CC;
++ }
+ }
+
vpic->decoded_curr_pic = (VAPictureHEVC) {
@@ libavcodec/vaapi_encode_h265.c: static av_cold int vaapi_encode_h265_close(AVCod
return ff_vaapi_encode_close(avctx);
}
+@@ libavcodec/vaapi_encode_h265.c: 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 "
+@@ libavcodec/vaapi_encode_h265.c: 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,
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..06b0004a2c 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..991d8a3aba 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
--
ffmpeg-codebot
_______________________________________________
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".
next prev parent reply other threads:[~2023-01-06 17:15 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-02 19:32 [FFmpeg-devel] [PATCH] " Aman Karmani
2023-01-05 8:46 ` Xiang, Haihao
2023-01-06 17:15 ` Aman Karmani [this message]
2023-01-06 17:41 ` [FFmpeg-devel] [PATCH v3] " Aman Karmani
2023-01-06 19:02 ` Andreas Rheinhardt
2023-01-09 18:40 ` [FFmpeg-devel] [PATCH v4] " Aman Karmani
2023-01-16 4:10 ` Xiang, Haihao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.46.v2.ffstaging.FFmpeg.1673025300846.ffmpegagent@gmail.com \
--to=ffmpegagent@gmail.com \
--cc=aman@tmm1.net \
--cc=ffmpeg-devel@ffmpeg.org \
--cc=haihao.xiang-at-intel.com@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git