From patchwork Wed Sep 11 18:56:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 15027 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id E381B4491F1 for ; Wed, 11 Sep 2019 22:03:45 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BB18B687F4E; Wed, 11 Sep 2019 22:03:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f54.google.com (mail-ot1-f54.google.com [209.85.210.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4379F680A43 for ; Wed, 11 Sep 2019 22:03:39 +0300 (EEST) Received: by mail-ot1-f54.google.com with SMTP id y39so23638795ota.7 for ; Wed, 11 Sep 2019 12:03:39 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=OYLhPNZQ1ju13up4pMh5+awEtsVGUnuv6EQ6UyJeGrY=; b=iFtDc+lo+w5L7Zew9SwHPPYx70HZd1EDk2ToQsNUZDY24uuI+gndMLnv4f3TEYhUut 0ZiSmSZu3rz4m7qPZNxyhiXorDj4T45rTTekv+kRUSxU8yBvFLF7sjAwVd6Nt9zCsQ6y PG1qviNWh5FYqWbpPb/bN6dSy2DmVxtaOjxTQgrU3ICBXeF/Aqlwj5f6BfJGU1WNLMSk +ARh+HoF8FewJKYZYiHogFW+LpkXPFS1H1GYGOZI2db6ho8z+zG/chcuJMCgmXDJmLbt qQmTvzkmcjXVQ+ZubvoaF8q1TWIrSp8RtpEIOGPvKouOhb8/V4Ptr7yzYN/bErfK4qvS u7tw== 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 :in-reply-to:references:mime-version:content-transfer-encoding; bh=OYLhPNZQ1ju13up4pMh5+awEtsVGUnuv6EQ6UyJeGrY=; b=jzq9jj86p/Ro9LrP/K729QZyMRz8wDCWEmAVPcrQwrJXXTqLcppZWo6nbnYGZxAqd9 wfoUeblYSyOT0sp6wZkQe9MhvPU8DBoJGxoqfqBGRKX2ladDHNyvNmfJNcmFd5Azx5ah xyKLEzpGV4qnpKcZ1G5+EaAKhYWgaiE/rjevdTt5fvH/ROGTxADvX2b8KylWKQGJZcaX Uu76v5oFU2DamwlodL8yaNw/rmSlHaehRbwTAXfRlj7jQTi10Gs4hwSYlgPlvQmKxTg5 rgUHbK2h0GGWg9mSyxHinY77w0RDJ1VUwz8BpeHdVOmr2ZwKm+Hc1bTYXBeDm7LvHvgl gmhg== X-Gm-Message-State: APjAAAXKH50P7Jd7e39ofSrsj3l2P+qHpfxOgoqzjRV3kgxY4uiLtuK/ QuBGKWNZqww/IsIERWJ28LCKvp1hrMvQaQ== X-Google-Smtp-Source: APXvYqy3IOHDgrKshoFUr8hHK3JUoYtVN8Iz488i0Rql0qhESUF1F59mzkPkn3MH4cOi/iqClmsJ9w== X-Received: by 2002:a9d:51cc:: with SMTP id d12mr14843817oth.206.1568228180765; Wed, 11 Sep 2019 11:56:20 -0700 (PDT) Received: from tmm1-imac.lan (ip184-189-221-177.sb.sd.cox.net. [184.189.221.177]) by smtp.gmail.com with ESMTPSA id 34sm1487924otf.55.2019.09.11.11.56.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 11 Sep 2019 11:56:20 -0700 (PDT) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Wed, 11 Sep 2019 11:56:10 -0700 Message-Id: <20190911185610.87081-4-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190911185610.87081-1-ffmpeg@tmm1.net> References: <20190911185610.87081-1-ffmpeg@tmm1.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] mpeg2_metadata: Add support for A/53 closed captions 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, andreas.rheinhardt@gmail.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Mark Thompson Allows extraction (to side data) and removal of closed captions in user data blocks. --- doc/bitstream_filters.texi | 12 ++++++ libavcodec/Makefile | 2 +- libavcodec/mpeg2_metadata_bsf.c | 76 ++++++++++++++++++++++++++++++++- 3 files changed, 88 insertions(+), 2 deletions(-) diff --git a/doc/bitstream_filters.texi b/doc/bitstream_filters.texi index 8e957ae4a8..05f88e466d 100644 --- a/doc/bitstream_filters.texi +++ b/doc/bitstream_filters.texi @@ -548,6 +548,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 captions in user data blocks. + +@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/Makefile b/libavcodec/Makefile index b10064776c..e691181996 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1092,7 +1092,7 @@ OBJS-$(CONFIG_MPEG4_UNPACK_BFRAMES_BSF) += mpeg4_unpack_bframes_bsf.o OBJS-$(CONFIG_MOV2TEXTSUB_BSF) += movsub_bsf.o OBJS-$(CONFIG_MP3_HEADER_DECOMPRESS_BSF) += mp3_header_decompress_bsf.o \ mpegaudiodata.o -OBJS-$(CONFIG_MPEG2_METADATA_BSF) += mpeg2_metadata_bsf.o +OBJS-$(CONFIG_MPEG2_METADATA_BSF) += mpeg2_metadata_bsf.o cbs_misc.o OBJS-$(CONFIG_NOISE_BSF) += noise_bsf.o OBJS-$(CONFIG_NULL_BSF) += null_bsf.o OBJS-$(CONFIG_PRORES_METADATA_BSF) += prores_metadata_bsf.o diff --git a/libavcodec/mpeg2_metadata_bsf.c b/libavcodec/mpeg2_metadata_bsf.c index 3f371a028d..e82758d2eb 100644 --- a/libavcodec/mpeg2_metadata_bsf.c +++ b/libavcodec/mpeg2_metadata_bsf.c @@ -22,9 +22,17 @@ #include "bsf.h" #include "cbs.h" +#include "cbs_misc.h" #include "cbs_mpeg2.h" #include "mpeg12.h" +enum { + PASS, + INSERT, + REMOVE, + EXTRACT, +}; + typedef struct MPEG2MetadataContext { const AVClass *class; @@ -42,6 +50,8 @@ typedef struct MPEG2MetadataContext { int transfer_characteristics; int matrix_coefficients; + int a53_cc; + int mpeg1_warned; } MPEG2MetadataContext; @@ -173,7 +183,9 @@ static int mpeg2_metadata_filter(AVBSFContext *bsf, AVPacket *pkt) { MPEG2MetadataContext *ctx = bsf->priv_data; 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_ref(bsf, pkt); if (err < 0) @@ -191,6 +203,57 @@ static int mpeg2_metadata_filter(AVBSFContext *bsf, AVPacket *pkt) goto fail; } + if (ctx->a53_cc == REMOVE || ctx->a53_cc == EXTRACT) { + for (i = 0; i < frag->nb_units; i++) { + MPEG2RawUserData *ud; + A53UserData a53_ud; + + if (frag->units[i].type != MPEG2_START_USER_DATA) + continue; + ud = frag->units[i].content; + + err = ff_cbs_read_a53_user_data(ctx->cbc, &a53_ud, ud->user_data, + ud->user_data_length); + if (err < 0) { + // Invalid or something completely different. + continue; + } + if (a53_ud.user_identifier != A53_USER_IDENTIFIER_ATSC || + a53_ud.atsc.user_data_type_code != + A53_USER_DATA_TYPE_CODE_CC_DATA) { + // Valid but something else (e.g. AFD). + continue; + } + + if (ctx->a53_cc == REMOVE) { + ff_cbs_delete_unit(ctx->cbc, frag, i); + --i; + break; + } else if(ctx->a53_cc == EXTRACT) { + err = ff_cbs_write_a53_cc_side_data(ctx->cbc, + &a53_side_data, + &a53_side_data_size, + &a53_ud); + if (err < 0) { + av_log(bsf, AV_LOG_ERROR, "Failed to write " + "A/53 user data for packet side data.\n"); + goto fail; + } + + if (a53_side_data) { + err = av_packet_add_side_data(pkt, 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 = ff_cbs_write_packet(ctx->cbc, pkt, frag); if (err < 0) { av_log(bsf, AV_LOG_ERROR, "Failed to write packet.\n"); @@ -200,6 +263,7 @@ static int mpeg2_metadata_filter(AVBSFContext *bsf, AVPacket *pkt) err = 0; fail: ff_cbs_fragment_reset(ctx->cbc, frag); + av_freep(&a53_side_data); if (err < 0) av_packet_unref(pkt); @@ -287,6 +351,16 @@ static const AVOption mpeg2_metadata_options[] = { OFFSET(matrix_coefficients), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 255, FLAGS }, + { "a53_cc", "A/53 Closed Captions in user data", + OFFSET(a53_cc), AV_OPT_TYPE_INT, + { .i64 = PASS }, PASS, EXTRACT, FLAGS, "a53_cc" }, + { "pass", NULL, 0, AV_OPT_TYPE_CONST, + { .i64 = PASS }, .flags = FLAGS, .unit = "a53_cc" }, + { "remove", NULL, 0, AV_OPT_TYPE_CONST, + { .i64 = REMOVE }, .flags = FLAGS, .unit = "a53_cc" }, + { "extract", NULL, 0, AV_OPT_TYPE_CONST, + { .i64 = EXTRACT }, .flags = FLAGS, .unit = "a53_cc" }, + { NULL } };