From patchwork Mon Mar 12 07:24:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 7947 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp1291587jad; Mon, 12 Mar 2018 00:24:18 -0700 (PDT) X-Google-Smtp-Source: AG47ELsNswgR7lbBTYrjJo3LaB4csVl0TDMAGGFoQyz7NRuArZgnapdylTcEOVM5mmfGkFfCfzen X-Received: by 10.223.225.6 with SMTP id d6mr5190539wri.128.1520839458111; Mon, 12 Mar 2018 00:24:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520839458; cv=none; d=google.com; s=arc-20160816; b=qoJM2fxM/Jq07TL1qVD49Qiqqq0KF8t6ZPuscBeAj4oXydRsWMv+gjZV2CwcZsx7a7 OWepPOFh/YM5G82RgTWRuS3q/gqJuq7j2zoLSNUbKfyQU3brZJNq/LwIgGdH6LeyXs5V mBjwMtK0GAS1z5ShaEuLhvNFxZPIzJryLHxoZN4JUmX/1lAiyaqNHVrJlpEcVO6AeIxE 3UYmN8LGR8ARVjEJvxWVdAi61VVpFbb0BETGYQpLrikm9m/3gD8fa2ltH/uqFGpKHecy C1HKEQ0VYkYlwF3P3QmQkGFZ3OPWwhClXPCmb2tHTgDz/6RlUbXkDH/V2lISgE2vHF+8 cfpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=qlXwLUVrvlU3zOjPxHEkcCUsN6iXaU6TfhHdviQNsdA=; b=Qiv6f+ftSmyBVWLvhVSQTnC0zsQKn84C10p2It/KY0g5oglKQJYpv1k1A2SKACuYkS rDxEVDRr9jDtJFIwMQRDG4PuBpXoOf5Az7wemPKQXXexcP6st4Pddg+ON8anbJq+LIG6 8jzmTcjnprigdf9F6zqRiZyTAhblCVIvhYS1zaMcFjfk/3Ma98N62OU90/YgthZ4Gmm2 OiR1Veo31P9k0m9hD3JeQfWK5QbkK/f2sKsXx2xgk/s1kAJFucorqQYp2AZQ5ki/AKSk /oI/KTZYYUoPRBwMAeDRS7mD3p/xxQDudMR2Xzs7T+9vvY3w8WZkYiMI/tMVATENlxKn 9Kag== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=GO1KW1Vy; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a35si2501734wrc.46.2018.03.12.00.24.17; Mon, 12 Mar 2018 00:24:18 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=GO1KW1Vy; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 052F268A46A; Mon, 12 Mar 2018 09:24:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl0-f48.google.com (mail-pl0-f48.google.com [209.85.160.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E976B68A1DA for ; Mon, 12 Mar 2018 09:23:58 +0200 (EET) Received: by mail-pl0-f48.google.com with SMTP id 61-v6so8861217plf.3 for ; Mon, 12 Mar 2018 00:24:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tmm1-net.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id; bh=lT/6RTZ6US/U7zp0R4s0A62ABFzWbeWgyCCcUge1RVs=; b=GO1KW1VykzNnCewYi+enjBGoxK6Eh4t+nJvnWltxx08TZSMPDgJUYocdRAY/s/P2hA jppWiBjslNdL89KLT8p977+7fx5alsr5zZXY3THMmredz0EkbpssamC7OwofqxIvxVpU Vp+Dl2RhEjxBWY+sif5hKg6ITk5w0Jn5z0zK1EJ+t5DVklfoOWgLMfTnp5vm1imafO5j C5sicQlI1Fb7aP3PjVpz7ozSKYTtSgMOI8kPWR+bmBEIj2fHqBfev6ZIk3XwBbl1KMzZ l8GA6hsBkdUBGXm1xGF2r3c9CI9ujAXrhjWA5cb1CiXfKpjRI/IDdhSS+kXjQiAV3b+O f3pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=lT/6RTZ6US/U7zp0R4s0A62ABFzWbeWgyCCcUge1RVs=; b=amgyoKqF8EhjO/uuQ2XzH9BzL0chc7mDTGgc/rwTbozXHOZ0KGiL5vaE87gZLyrnM+ bZ3fIadJNR0d0tdXpaGT3Gxk/A29NaQvdR7qG7/roCXdTc5q5rJabxdkyHJb2bsQAS3y VMT5QzdJq6FGtceZBoheeDYSiYdLHs7oF/K8jBvREoLYIIxJXKuQQdwJ/SvB6P0bz0MD TCH/n2AQHgGgLAvprrc4PqA+QoPFqnCqUZTdpqBi+LAuQ4xkj3gdqO/placxkePmuySU nR8OgUEInTZfmM/Fc2EUkNgfqZBUGy0frcb47VpdhbN/yUJh4PJ8zNeDn4x4Z0rG6Pn3 63rg== X-Gm-Message-State: AElRT7Hu573u+/OZHelycXaP4C91mW+u1Ur8tOYwUMJ6CyAjgYkCZCT7 AHGgNrUyg5+mp5+WSM8h5CpYsuej X-Received: by 2002:a17:902:6184:: with SMTP id u4-v6mr2230441plj.390.1520839446962; Mon, 12 Mar 2018 00:24:06 -0700 (PDT) Received: from localhost.localdomain (c-69-181-54-242.hsd1.ca.comcast.net. [69.181.54.242]) by smtp.gmail.com with ESMTPSA id b68sm14727320pfg.59.2018.03.12.00.24.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Mar 2018 00:24:06 -0700 (PDT) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Mar 2018 00:24:00 -0700 Message-Id: <20180312072400.26632-1-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.14.2 Subject: [FFmpeg-devel] [PATCH] mpeg2_metadata: Add support for A/53 caption extraction and removal X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: sw@jkqxz.net, Aman Gupta MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Aman Gupta --- doc/bitstream_filters.texi | 12 +++++++ libavcodec/mpeg2_metadata_bsf.c | 79 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 90 insertions(+), 1 deletion(-) diff --git a/doc/bitstream_filters.texi b/doc/bitstream_filters.texi index b7ea549322..c0b48e62dc 100644 --- a/doc/bitstream_filters.texi +++ b/doc/bitstream_filters.texi @@ -362,6 +362,18 @@ table 6-6). Set the colour description in the stream (see H.262 section 6.3.6 and tables 6-7, 6-8 and 6-9). +@item a53_cc +Modify A/53 closed caption data in user data messages. + +@table @samp +@item remove +Remove all closed caption data from the stream. + +@item extract +Extract closed captions from the stream so that they are available as +as packet side data. +@end table + @end table @section mpeg4_unpack_bframes diff --git a/libavcodec/mpeg2_metadata_bsf.c b/libavcodec/mpeg2_metadata_bsf.c index 3bb6c1d549..0728ca4e09 100644 --- a/libavcodec/mpeg2_metadata_bsf.c +++ b/libavcodec/mpeg2_metadata_bsf.c @@ -25,6 +25,12 @@ #include "cbs_mpeg2.h" #include "mpeg12.h" +enum { + PASS, + REMOVE, + EXTRACT, +}; + typedef struct MPEG2MetadataContext { const AVClass *class; @@ -43,6 +49,7 @@ typedef struct MPEG2MetadataContext { int matrix_coefficients; int mpeg1_warned; + int a53_cc; } MPEG2MetadataContext; @@ -184,7 +191,9 @@ static int mpeg2_metadata_filter(AVBSFContext *bsf, AVPacket *out) MPEG2MetadataContext *ctx = bsf->priv_data; AVPacket *in = NULL; CodedBitstreamFragment *frag = &ctx->fragment; - int err; + int err, i; + uint8_t *a53_side_data = NULL; + size_t a53_side_data_size = 0; err = ff_bsf_get_packet(bsf, &in); if (err < 0) @@ -202,6 +211,55 @@ static int mpeg2_metadata_filter(AVBSFContext *bsf, AVPacket *out) goto fail; } + if (ctx->a53_cc == REMOVE || ctx->a53_cc == EXTRACT) { + for (i = 0; i < frag->nb_units; i++) { + MPEG2RawUserData *ud = NULL; + uint32_t tag; + uint8_t type_code, count; + + if (frag->units[i].type != MPEG2_START_USER_DATA) + continue; + ud = frag->units[i].content; + if (ud->user_data_length < 6) + continue; + tag = AV_RB32(ud->user_data); + type_code = ud->user_data[4]; + if (tag != MKBETAG('G', 'A', '9', '4') || type_code != 3) + continue; + + if (ctx->a53_cc == REMOVE) { + err = ff_cbs_delete_unit(ctx->cbc, frag, i); + if (err < 0) { + av_log(bsf, AV_LOG_ERROR, "Failed to delete " + "A53 CC USER_DATA message.\n"); + goto fail; + } + av_log(bsf, AV_LOG_WARNING, "A53 CC remove!.\n"); + + --i; + break; + } + + // Extract. + count = ud->user_data[5] & 0x1f; + if (3 * count + 8 > ud->user_data_length) { + av_log(bsf, AV_LOG_ERROR, "Invalid A/53 closed caption " + "data: count %d overflows length %zu.\n", + count, ud->user_data_length); + continue; + } + av_log(bsf, AV_LOG_WARNING, "A53 CC extract: %zu bytes.\n", ud->user_data_length); + + err = av_reallocp(&a53_side_data, + a53_side_data_size + 3 * count); + if (err) + goto fail; + memcpy(a53_side_data + a53_side_data_size, + ud->user_data + 9, 3 * count); + a53_side_data_size += 3 * count; + } + } + err = ff_cbs_write_packet(ctx->cbc, out, frag); if (err < 0) { av_log(bsf, AV_LOG_ERROR, "Failed to write packet.\n"); @@ -214,9 +272,21 @@ static int mpeg2_metadata_filter(AVBSFContext *bsf, AVPacket *out) goto fail; } + if (a53_side_data) { + err = av_packet_add_side_data(out, AV_PKT_DATA_A53_CC, + a53_side_data, a53_side_data_size); + if (err) { + av_log(bsf, AV_LOG_ERROR, "Failed to attach extracted A/53 " + "side data to packet.\n"); + goto fail; + } + a53_side_data = NULL; + } + err = 0; fail: ff_cbs_fragment_uninit(ctx->cbc, frag); + av_freep(&a53_side_data); av_packet_free(&in); @@ -288,6 +358,13 @@ static const AVOption mpeg2_metadata_options[] = { OFFSET(matrix_coefficients), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 255 }, + { "a53_cc", "A/53 Closed Captions in SEI NAL units", + OFFSET(a53_cc), AV_OPT_TYPE_INT, + { .i64 = PASS }, PASS, EXTRACT, 0, "a53_cc" }, + { "pass", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = PASS }, .unit = "a53_cc" }, + { "remove", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = REMOVE }, .unit = "a53_cc" }, + { "extract", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = EXTRACT }, .unit = "a53_cc" }, + { NULL } };