[FFmpeg-cvslog] libx265: support ATSC A/53 captions
erankor
git at videolan.org
Thu Nov 10 17:28:52 EET 2022
ffmpeg | branch: master | erankor <eran.kornblau at kaltura.com> | Tue Nov 8 17:14:07 2022 +0200| [6043352bd902665b3d598c9be4197e41858a2357] | committer: Timo Rothenpieler
libx265: support ATSC A/53 captions
added a new option 'a53cc' (on by default, as in libx264) for rendering
AV_FRAME_DATA_A53_CC as hevc sei payloads.
the code is a blend of the libx265.c code for writing
AV_FRAME_DATA_SEI_UNREGISTERED with the libx264.c code for writing atsc
a/53 payloads.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6043352bd902665b3d598c9be4197e41858a2357
---
configure | 1 +
libavcodec/libx265.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++------
libavcodec/version.h | 2 +-
3 files changed, 58 insertions(+), 8 deletions(-)
diff --git a/configure b/configure
index a1cbb82334..e6470dc03b 100755
--- a/configure
+++ b/configure
@@ -3399,6 +3399,7 @@ libx264_encoder_select="atsc_a53"
libx264rgb_encoder_deps="libx264"
libx264rgb_encoder_select="libx264_encoder"
libx265_encoder_deps="libx265"
+libx265_encoder_select="atsc_a53"
libxavs_encoder_deps="libxavs"
libxavs2_encoder_deps="libxavs2"
libxvid_encoder_deps="libxvid"
diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c
index 4aa96e1f2d..948a5aafdf 100644
--- a/libavcodec/libx265.c
+++ b/libavcodec/libx265.c
@@ -36,6 +36,7 @@
#include "encode.h"
#include "internal.h"
#include "packet_internal.h"
+#include "atsc_a53.h"
#include "sei.h"
typedef struct libx265Context {
@@ -56,6 +57,7 @@ typedef struct libx265Context {
void *sei_data;
int sei_data_size;
int udu_sei;
+ int a53_cc;
/**
* If the encoder does not support ROI then warn the first time we
@@ -499,6 +501,16 @@ static av_cold int libx265_encode_set_roi(libx265Context *ctx, const AVFrame *fr
return 0;
}
+static void free_picture(x265_picture *pic)
+{
+ x265_sei *sei = &pic->userSEI;
+ for (int i = 0; i < sei->numPayloads; i++)
+ av_free(sei->payloads[i].payload);
+ av_freep(&pic->userData);
+ av_freep(&pic->quantOffsets);
+ sei->numPayloads = 0;
+}
+
static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
const AVFrame *pic, int *got_packet)
{
@@ -506,6 +518,7 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
x265_picture x265pic;
x265_picture x265pic_out = { 0 };
x265_nal *nal;
+ x265_sei *sei;
uint8_t *dst;
int pict_type;
int payload = 0;
@@ -515,9 +528,10 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
ctx->api->picture_init(ctx->params, &x265pic);
+ sei = &x265pic.userSEI;
+ sei->numPayloads = 0;
+
if (pic) {
- x265_sei *sei = &x265pic.userSEI;
- sei->numPayloads = 0;
for (i = 0; i < 3; i++) {
x265pic.planes[i] = pic->data[i];
x265pic.stride[i] = pic->linesize[i];
@@ -539,13 +553,42 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
if (pic->reordered_opaque) {
x265pic.userData = av_malloc(sizeof(pic->reordered_opaque));
if (!x265pic.userData) {
- av_freep(&x265pic.quantOffsets);
+ free_picture(&x265pic);
return AVERROR(ENOMEM);
}
memcpy(x265pic.userData, &pic->reordered_opaque, sizeof(pic->reordered_opaque));
}
+ if (ctx->a53_cc) {
+ void *sei_data;
+ size_t sei_size;
+
+ ret = ff_alloc_a53_sei(pic, 0, &sei_data, &sei_size);
+ if (ret < 0) {
+ av_log(ctx, AV_LOG_ERROR, "Not enough memory for closed captions, skipping\n");
+ } else if (sei_data) {
+ void *tmp;
+ x265_sei_payload *sei_payload;
+
+ tmp = av_fast_realloc(ctx->sei_data,
+ &ctx->sei_data_size,
+ (sei->numPayloads + 1) * sizeof(*sei_payload));
+ if (!tmp) {
+ av_free(sei_data);
+ free_picture(&x265pic);
+ return AVERROR(ENOMEM);
+ }
+ ctx->sei_data = tmp;
+ sei->payloads = ctx->sei_data;
+ sei_payload = &sei->payloads[sei->numPayloads];
+ sei_payload->payload = sei_data;
+ sei_payload->payloadSize = sei_size;
+ sei_payload->payloadType = SEI_TYPE_USER_DATA_REGISTERED_ITU_T_T35;
+ sei->numPayloads++;
+ }
+ }
+
if (ctx->udu_sei) {
for (i = 0; i < pic->nb_side_data; i++) {
AVFrameSideData *side_data = pic->side_data[i];
@@ -559,14 +602,17 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
&ctx->sei_data_size,
(sei->numPayloads + 1) * sizeof(*sei_payload));
if (!tmp) {
- av_freep(&x265pic.userData);
- av_freep(&x265pic.quantOffsets);
+ free_picture(&x265pic);
return AVERROR(ENOMEM);
}
ctx->sei_data = tmp;
sei->payloads = ctx->sei_data;
sei_payload = &sei->payloads[sei->numPayloads];
- sei_payload->payload = side_data->data;
+ sei_payload->payload = av_memdup(side_data->data, side_data->size);
+ if (!sei_payload->payload) {
+ free_picture(&x265pic);
+ return AVERROR(ENOMEM);
+ }
sei_payload->payloadSize = side_data->size;
/* Equal to libx265 USER_DATA_UNREGISTERED */
sei_payload->payloadType = SEI_TYPE_USER_DATA_UNREGISTERED;
@@ -578,6 +624,8 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
ret = ctx->api->encoder_encode(ctx->encoder, &nal, &nnal,
pic ? &x265pic : NULL, &x265pic_out);
+ for (i = 0; i < sei->numPayloads; i++)
+ av_free(sei->payloads[i].payload);
av_freep(&x265pic.quantOffsets);
if (ret < 0)
@@ -713,7 +761,8 @@ static const AVOption options[] = {
{ "preset", "set the x265 preset", OFFSET(preset), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE },
{ "tune", "set the x265 tune parameter", OFFSET(tune), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE },
{ "profile", "set the x265 profile", OFFSET(profile), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE },
- { "udu_sei", "Use user data unregistered SEI if available", OFFSET(udu_sei), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },
+ { "udu_sei", "Use user data unregistered SEI if available", OFFSET(udu_sei), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },
+ { "a53cc", "Use A53 Closed Captions (if available)", OFFSET(a53_cc), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, VE },
{ "x265-params", "set the x265 configuration using a :-separated list of key=value parameters", OFFSET(x265_opts), AV_OPT_TYPE_DICT, { 0 }, 0, 0, VE },
{ NULL }
};
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 86ac0f3871..c3f344e46a 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -30,7 +30,7 @@
#include "version_major.h"
#define LIBAVCODEC_VERSION_MINOR 52
-#define LIBAVCODEC_VERSION_MICRO 100
+#define LIBAVCODEC_VERSION_MICRO 101
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
More information about the ffmpeg-cvslog
mailing list