diff options
author | DeHackEd <git@dehacked.net> | 2015-09-29 13:19:34 -0400 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-10-03 23:39:01 +0200 |
commit | e06114fed3afa69187b3dfc09a7a1a25cfd558b3 (patch) | |
tree | 5a672e2348d5f72fabf79bb6893af4867c6398b7 /libavcodec | |
parent | f827a170052e16445366cd34ca0cb6c12fd000a6 (diff) | |
download | ffmpeg-e06114fed3afa69187b3dfc09a7a1a25cfd558b3.tar.gz |
libx264: copy A53 closed captions from source
Assumes 'GA94' format (ATSC standard)
Signed-off-by: DHE <git@dehacked.net>
Tested-by: Anshul <anshul.ffmpeg@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/libx264.c | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 7f019cf64d..75b5a5feba 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -25,6 +25,7 @@ #include "libavutil/mem.h" #include "libavutil/pixdesc.h" #include "libavutil/stereo3d.h" +#include "libavutil/intreadwrite.h" #include "avcodec.h" #include "internal.h" @@ -83,6 +84,7 @@ typedef struct X264Context { int avcintra_class; int motion_est; int forced_idr; + int a53_cc; char *x264_params; } X264Context; @@ -256,6 +258,7 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame, int nnal, i, ret; x264_picture_t pic_out = {0}; int pict_type; + AVFrameSideData *side_data; x264_picture_init( &x4->pic ); x4->pic.img.i_csp = x4->params.i_csp; @@ -287,7 +290,48 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame, break; } reconfig_encoder(ctx, frame); + + if (x4->a53_cc) { + side_data = av_frame_get_side_data(frame, AV_FRAME_DATA_A53_CC); + if (side_data) { + x4->pic.extra_sei.payloads = av_mallocz(sizeof(x4->pic.extra_sei.payloads[0])); + if (x4->pic.extra_sei.payloads == NULL) { + av_log(ctx, AV_LOG_ERROR, "Not enough memory for closed captions, skipping\n"); + goto skip_a53cc; + } + x4->pic.extra_sei.sei_free = av_free; + + x4->pic.extra_sei.payloads[0].payload_size = side_data->size + 11; + x4->pic.extra_sei.payloads[0].payload = av_mallocz(x4->pic.extra_sei.payloads[0].payload_size); + if (x4->pic.extra_sei.payloads[0].payload == NULL) { + av_log(ctx, AV_LOG_ERROR, "Not enough memory for closed captions, skipping\n"); + av_freep(&x4->pic.extra_sei.payloads); + goto skip_a53cc; + } + x4->pic.extra_sei.num_payloads = 1; + x4->pic.extra_sei.payloads[0].payload_type = 4; + memcpy(x4->pic.extra_sei.payloads[0].payload + 10, side_data->data, side_data->size); + x4->pic.extra_sei.payloads[0].payload[0] = 181; + x4->pic.extra_sei.payloads[0].payload[1] = 0; + x4->pic.extra_sei.payloads[0].payload[2] = 49; + + /** + * 'GA94' is standard in North America for ATSC, but hard coding + * this style may not be the right thing to do -- other formats + * do exist. This information is not available in the side_data + * so we are going with this right now. + */ + AV_WL32(x4->pic.extra_sei.payloads[0].payload + 3, + MKTAG('G', 'A', '9', '4')); + x4->pic.extra_sei.payloads[0].payload[7] = 3; + x4->pic.extra_sei.payloads[0].payload[8] = + ((side_data->size/3) & 0x1f) | 0x40; + x4->pic.extra_sei.payloads[0].payload[9] = 0; + x4->pic.extra_sei.payloads[0].payload[side_data->size+10] = 255; + } + } } +skip_a53cc: do { if (x264_encoder_encode(x4->enc, &nal, &nnal, frame? &x4->pic: NULL, &pic_out) < 0) return AVERROR_EXTERNAL; @@ -830,6 +874,7 @@ static const AVOption options[] = { {"level", "Specify level (as defined by Annex A)", OFFSET(level), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, VE}, {"passlogfile", "Filename for 2 pass stats", OFFSET(stats), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, VE}, {"wpredp", "Weighted prediction for P-frames", OFFSET(wpredp), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, VE}, + {"a53cc", "Use A53 Closed Captions (if available)", OFFSET(a53_cc), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, VE}, {"x264opts", "x264 options", OFFSET(x264opts), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, VE}, { "crf", "Select the quality for constant quality mode", OFFSET(crf), AV_OPT_TYPE_FLOAT, {.dbl = -1 }, -1, FLT_MAX, VE }, { "crf_max", "In CRF mode, prevents VBV from lowering quality beyond this point.",OFFSET(crf_max), AV_OPT_TYPE_FLOAT, {.dbl = -1 }, -1, FLT_MAX, VE }, |