From patchwork Sun Mar 25 17:41:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 8163 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp2707269jad; Sun, 25 Mar 2018 10:42:07 -0700 (PDT) X-Google-Smtp-Source: AG47ELsYBMaH6OVogM+EgGnY8MV7h0jzwOQ35xF2d3BQmrqOHV1BCMykkd2LxMEt4B4+DtUtWwjI X-Received: by 10.28.238.2 with SMTP id m2mr12368235wmh.135.1521999727724; Sun, 25 Mar 2018 10:42:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521999727; cv=none; d=google.com; s=arc-20160816; b=ReaixvNDW2YEUgxy8hKnKNR4iJd0S2LjV6550N9SzfKY4BP1V2t6qHS3kldz9qQ7Bl xzrSRMyLU1rABMXV3hUVvmfW7jVf0SJbTOxL6iFEehEDvfBJIDFDW74gsPdArifAX5jo oWfXZ9/GfeMRHnsNqFXvhRke5MtIGWFBfN0tLJsSMWKxiwh/xFodi+LLvfXYCpkIYrHO MiF19o2iMg8FSt8u9V32dYUzM9rYoSdX7vve4MeoDQ9kYmbkNhNTiaqvKvCbO+Mk15xJ Fy89sekhHsve1AvbwtuXCluivmgteMCDnyuqe73hyLgZzlbjZURnTCZLpN04q4WuwN5l jcCQ== 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:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=m8WbHxv5I1AF+E/hx+Od47/OMdq5RG6Tady5aW7GlaU=; b=cepp3YNp6MBO0AR+Sq7h0cd4yVyupHVl5w/rD9g1FKYUs98l69BnHJpv6weYZFUCri 6TRwr7OIYcPRBMjz7I36F1JmkEpY9BNP/9H9xKED7KQ6OKQnfI2SX4j0zIMeL8O1PMDj N2IGzPlZn1aHyJ6MyhwECy8e1YkAnaFz+suIUloM5ApsBMS/xOQHsxMNmLJwF7vJBwdi OJS6jc3U0l2Td5KXM+64HHteHa7ElyYUlrwHZ3exuQKyLyLJMy7PB213j6HDClvk1uOf 9sMyhKPDsaSozV9WTAejgfbPJcZbpJ2EYG/vXH/EQt+60PNFvzD2hmCj/jHPhi+nDlBH iEjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=tfa6AyiX; 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 x199si9250994wmd.31.2018.03.25.10.42.07; Sun, 25 Mar 2018 10:42:07 -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=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=tfa6AyiX; 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 2BB546802BD; Sun, 25 Mar 2018 20:41:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f48.google.com (mail-wm0-f48.google.com [74.125.82.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1635C680385 for ; Sun, 25 Mar 2018 20:41:28 +0300 (EEST) Received: by mail-wm0-f48.google.com with SMTP id l16so11471897wmh.3 for ; Sun, 25 Mar 2018 10:41:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=+f6kVtLZFMtm6WJzmN37bmo5wJLDWcqLAsJxyPKZLy8=; b=tfa6AyiXk52iE0Nan1/U5QsI22nh2UD77UjvtVBBkwM7XII+xQN1lObKv+YVKLBy8h 5Ics7bp2LBNF8c9iN9i0OQyxbR+2RxF9iH6Hx0FHm0rreqArjVI+K+aNSHnLZI8WZWLP xEM4phzw3vV9Q4Ry6QeycIScGIiEgkMfLV458lDTs92WE43iPnTljmtXo90rPYrjAgxQ /anDYdFcx0Tc1fRY6q3T3G9Fhddbj5oyUptuiIjl32heJxgEyuFNaWzE5sHmZdc8RQSz wzEdfe8454VbjOEnE5fIj3AOEp4kHU5GLAKI0saJPkK30DJZNOata0KLlKRerVdLdQe4 CUVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=+f6kVtLZFMtm6WJzmN37bmo5wJLDWcqLAsJxyPKZLy8=; b=Rxk2nB2tM3V3GhAoviuA0b/Q2+FE1rFgOFVoTVnG3nPTDqCWW7LKTB0hH3rod7Z4UF N8EUngDHvKA28OP8mBxDtvHd2wD/pK+QM3Ch/C15BOqiBUBmh3i/B4BIGNKUBiihsnPy FqdhEv325GXaSJ1Xsbpi5bvZ4XFjeo4Jjr2bKl+DoLwmUp2GVByaneBsf+y504ShWEUT AlwmgNTYVuzd0fOGEg9pThp7RlK/+ANaGiAWyrBAqNL4/oXPn4BVOStA6+ID9dc2l5CC TRYVmtk/rJ/4P4b1TtjlpOoRXpZvT7bppV2beS23OYEv3qD9LdFeS1qtn0xJV0+IVymb rQEg== X-Gm-Message-State: AElRT7HhiFSO/NeNgln9xR4ZNzIOAbKz3i9x5izuoume3txfIKuFajKt elm4+hsMT6V9NjUP8Zn/n5HV4PW5 X-Received: by 10.28.170.204 with SMTP id t195mr7224921wme.82.1521999704197; Sun, 25 Mar 2018 10:41:44 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id x78sm23123579wmd.2.2018.03.25.10.41.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Mar 2018 10:41:43 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 25 Mar 2018 18:41:36 +0100 Message-Id: <20180325174137.14749-4-sw@jkqxz.net> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180325174137.14749-1-sw@jkqxz.net> References: <20180325174137.14749-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 4/5] 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 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 | 81 ++++++++++++++++++++++++++++++++++++++++- 3 files changed, 93 insertions(+), 2 deletions(-) diff --git a/doc/bitstream_filters.texi b/doc/bitstream_filters.texi index 41424cf42f..f115f7b0c5 100644 --- a/doc/bitstream_filters.texi +++ b/doc/bitstream_filters.texi @@ -465,6 +465,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 cfde104055..e5430ab10b 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1057,7 +1057,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_REMOVE_EXTRADATA_BSF) += remove_extradata_bsf.o diff --git a/libavcodec/mpeg2_metadata_bsf.c b/libavcodec/mpeg2_metadata_bsf.c index e787cb3782..49335d7fcb 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; @@ -184,7 +194,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 +214,51 @@ 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; + 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) { + err = ff_cbs_delete_unit(ctx->cbc, frag, i); + if (err < 0) { + av_log(bsf, AV_LOG_ERROR, "Failed to delete " + "A/53 CC user data.\n"); + goto fail; + } + --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; + } + } + } + } + err = ff_cbs_write_packet(ctx->cbc, out, frag); if (err < 0) { av_log(bsf, AV_LOG_ERROR, "Failed to write packet.\n"); @@ -212,9 +269,21 @@ static int mpeg2_metadata_filter(AVBSFContext *bsf, AVPacket *out) if (err < 0) 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); if (err < 0) av_packet_unref(out); @@ -289,6 +358,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 } };