From patchwork Sat Feb 4 00:41:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 40241 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1617107pzk; Fri, 3 Feb 2023 16:42:39 -0800 (PST) X-Google-Smtp-Source: AK7set/JhBqjfnrxTltTJLSLpCdNWzA2zr9PSzBA86DkWF6X/nqikfhfMOEu6V1KYgXI+BkZ+PFi X-Received: by 2002:a17:906:7141:b0:877:7157:9358 with SMTP id z1-20020a170906714100b0087771579358mr3860304ejj.10.1675471359374; Fri, 03 Feb 2023 16:42:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675471359; cv=none; d=google.com; s=arc-20160816; b=w71wXiBLNQZ2yGaD/uEBL/DNQEuSV0g8tnW1YKEhvqOL6QI1W4Yet2t8EN+wr8Byfj SsiGw9hQZjSi2CqXmFLy/QqHlD4yUQaRkWjtmUV953R6r3lVWAVPOj06eNg9AVuNI3Rx EVcivbqAO25+fhK1Mcd7FtsOoDjjAzgVGc1dDkNU2kcjHh6PYHZ2s+dTHooSf9fzkkcn XDJZ09zmcEtq+4VJyZ+4rKmbZNM774MvWAxa2rrl1ovLBbsGdbetuwU5V6cHVoFD97V2 tGwHuC5UOL1Dh8ohpFmJAG89M8OvurKxBtdBZ0/oj3lAgXBUTx4Lbz6P2aVVZ1OBrL4d LvzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:mime-version:fcc:date:references :in-reply-to:message-id:from:dkim-signature:delivered-to; bh=PY6MA6QCX+m/KhUPTwYcCfhTcsSNS/33hSxlItDBTL4=; b=v5RoJf+J0Kw8Zv52q1jMJX5G/K2ToBV35y5t8OKtI6Ndp++9djDQOlAopwvc5Cff3a k8v+sWidgWrndh6VTAukKJkvzyJ7t7CVUIL5HUmU/mFDjjQ4cewHPjGiK0nlSZTGpYNs vd2nIJQtyWw3rbF0wwf15AIT2u0Vg6nbrCqwiWedEBSuQY41OpeLAOUA/MxIzASE7xjo oeUHi2U8OPgtL7fM2WXkF+6v+ATHe5EMKQo0oHPCIVQeTNn5TEV0u6JYhfc405ODx1lH 7UOY0iuCpW6AAYFr53A+2t1eWN217KGpVGnwrh+ZqtqHkAlcKrYcxHQ54k4g0oB9N/m5 y6Cw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=O73g61Iq; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 30-20020a170906209e00b0087a56fcad93si4911430ejq.262.2023.02.03.16.42.38; Fri, 03 Feb 2023 16:42:39 -0800 (PST) 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=@gmail.com header.s=20210112 header.b=O73g61Iq; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1ABD268BEB6; Sat, 4 Feb 2023 02:42:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B6E3168BE80 for ; Sat, 4 Feb 2023 02:42:00 +0200 (EET) Received: by mail-pl1-f182.google.com with SMTP id n13so6927650plf.11 for ; Fri, 03 Feb 2023 16:42:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:from:to:cc:subject:date :message-id:reply-to; bh=0C/IOruxjajzb2eOlVuufvt3+1AGg1WTFQdZpHki1FI=; b=O73g61Iqqdzyazpph7HF40T0UmhB0EZPojzNCXUSB7g1WshqT1lF8ues+jwlwj6FNb Wy/gVw9czl5/55BWnND8dQ5tGVneeuTLOUgAcxFplGXokctGVDHKBtcbpf3uNaNRBfCd 59azczrkFcBsszSKNhAZ3vzcHcKTjuAUALfOFo6NlQpkecTq+rEPWAfzOSjewAkxFkWu K+5Qyyfiy6TEVNLCmCq3hM9CvsWhqEVYyVxDbaIQ6lLSaDEAIXncJ3IzZfMLieEOYCMV 2vBApqx9e/ywmlGcC5Hzz7LYqdIP17yMg/CnlSTW7SWfItuMW+KmfO7nWgBhanLftlCq DBnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=0C/IOruxjajzb2eOlVuufvt3+1AGg1WTFQdZpHki1FI=; b=UKu9fn4v1kGfg/v/S0FV+9nbelkdUhOyPNz4RPt5gins3ukE81u48DHBbqybNYH0aT TOy6MiebnwpIoJuwDtjPz1MMaE2tTCQxrfAZkiWVexYo0HhhK12a8hL2yIUM2q2zOAxM 7P0o2FNsTIybUeYPD3h9zGK6JQ+32FyXE+wYzJRmgTr1R/BzFtfLINjH8JUebRAABjui RFXgBieeiEZxFAmahmnrRVss/umEo3CH/09XiQM5+DIimqKa4fZ9iO6cvu6YPfnQefyb 6K4K3e4jcK6w7LCSoNF8Ujy5XWoXrGabbXnJRZt2Fc/hS0CYtCykMVYAdT0mjs2OFVet 7L2Q== X-Gm-Message-State: AO0yUKWBwASzrzTBoNecVxTvWen4PCLmfLocLSUOI3lx7s4r/kgFd315 Sbl0DlY6q8osEsTumyg+AM411ldwWZM= X-Received: by 2002:a05:6a21:100d:b0:b9:4afb:1472 with SMTP id nk13-20020a056a21100d00b000b94afb1472mr10841402pzb.13.1675471319048; Fri, 03 Feb 2023 16:41:59 -0800 (PST) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id p18-20020a170902b09200b0019101215f63sm1328246plr.93.2023.02.03.16.41.58 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Feb 2023 16:41:58 -0800 (PST) From: Aman Karmani X-Google-Original-From: Aman Karmani Message-Id: In-Reply-To: References: Date: Sat, 04 Feb 2023 00:41:53 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 3/5] avcodec/mpeg2_metadata_bsf: add support for a/53 closed captions X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Aman Karmani Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: NviC3yPQCWBO From: Aman Karmani Signed-off-by: Aman Karmani --- doc/bitstream_filters.texi | 11 +++++ libavcodec/Makefile | 2 +- libavcodec/mpeg2_metadata_bsf.c | 80 +++++++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+), 1 deletion(-) diff --git a/doc/bitstream_filters.texi b/doc/bitstream_filters.texi index c63c20370f..c036d37403 100644 --- a/doc/bitstream_filters.texi +++ b/doc/bitstream_filters.texi @@ -537,6 +537,17 @@ Decompress non-standard compressed MP3 audio headers. Modify metadata embedded in an MPEG-2 stream. @table @option +@item a53_cc +Insert or remove user data containing A/53 closed captions. + +@table @samp +@item pass +@item insert +@item remove +@end table + +Default is pass. + @item display_aspect_ratio Set the display aspect ratio in the stream. diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 1fb963f820..2a36a31ff2 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1227,7 +1227,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 \ mpegaudiotabs.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_OPUS_METADATA_BSF) += opus_metadata_bsf.o diff --git a/libavcodec/mpeg2_metadata_bsf.c b/libavcodec/mpeg2_metadata_bsf.c index 1aa6e02791..888bace6b2 100644 --- a/libavcodec/mpeg2_metadata_bsf.c +++ b/libavcodec/mpeg2_metadata_bsf.c @@ -23,6 +23,7 @@ #include "bsf_internal.h" #include "cbs.h" #include "cbs_bsf.h" +#include "cbs_misc.h" #include "cbs_mpeg2.h" #include "mpeg12.h" @@ -39,10 +40,79 @@ typedef struct MPEG2MetadataContext { int colour_primaries; int transfer_characteristics; int matrix_coefficients; + int a53_cc; int mpeg1_warned; } MPEG2MetadataContext; +static int mpeg2_metadata_handle_a53_cc(AVBSFContext *bsf, + AVPacket *pkt, + CodedBitstreamFragment *frag) +{ + MPEG2MetadataContext *ctx = bsf->priv_data; + int err, i; + uint8_t *a53_side_data = NULL; + size_t a53_side_data_size = 0; + + if (ctx->a53_cc == BSF_ELEMENT_REMOVE || ctx->a53_cc == BSF_ELEMENT_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->common.output, &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 == BSF_ELEMENT_REMOVE) { + ff_cbs_delete_unit(frag, i); + --i; + break; + } else if(ctx->a53_cc == BSF_ELEMENT_EXTRACT) { + err = ff_cbs_write_a53_cc_side_data(ctx->common.output, + &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 = 0; + +fail: + av_freep(&a53_side_data); + + return err; +} + static int mpeg2_metadata_update_fragment(AVBSFContext *bsf, AVPacket *pkt, @@ -54,6 +124,13 @@ static int mpeg2_metadata_update_fragment(AVBSFContext *bsf, MPEG2RawSequenceDisplayExtension *sde = NULL; int i, se_pos; + if (pkt && ctx->a53_cc != BSF_ELEMENT_PASS) { + int err; + err = mpeg2_metadata_handle_a53_cc(bsf, pkt, frag); + if (err < 0) + return err; + } + for (i = 0; i < frag->nb_units; i++) { if (frag->units[i].type == MPEG2_START_SEQUENCE_HEADER) { sh = frag->units[i].content; @@ -218,6 +295,9 @@ static const AVOption mpeg2_metadata_options[] = { OFFSET(matrix_coefficients), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 255, FLAGS }, + BSF_ELEMENT_OPTIONS_PIRE("a53_cc", + "A/53 Closed Captions in user data", + a53_cc, FLAGS), { NULL } };