From patchwork Tue Mar 27 15:20:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 8195 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp4895658jad; Tue, 27 Mar 2018 08:21:33 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+Xl4RmCt5rFkZLUiEqDJRr5My/AZcJzbnh+MM6fGP/sbz5n1Mi06e/tGC4cu8uN1s/7Eic X-Received: by 10.223.164.28 with SMTP id d28mr7818955wra.113.1522164093826; Tue, 27 Mar 2018 08:21:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522164093; cv=none; d=google.com; s=arc-20160816; b=0rm4x52J0VDzuIMGcaAyFVHxEDIEnL+BOlYLMxNnI6Vu4uMyE0VNzoukY61acDV6Hu d7tlPx4kUOTV3FW6l+SVkIAcZEdLDSJlw9JNcH1qHzhHESFzLYVbr0JgPoZUfn6bkMSY dKQcLiWuOTdQeH/L30ksEFEQ828qLxPLlbVxy7bxUIdjOZYF02WpdDcBfHhAPscx8BH1 MxDGR8d71z2pNyRCH5BFNoHtPM54Sao9mt+ms5RgtlIMH0uz9YYYPyxAxDPJ98PgNqbm itR23mx3X2NWHBNZKD3MrJJTmk8nbaJ8HoatwBNzVegVPTDxZxO2D/OuqnFvexhFbfpg rRUQ== 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=JdG1q59TcY0yyHOfaKu1+m1NQ/KNKNGN6e9GRPdddEQ=; b=GEye5310oynuBiRCpeeuqmMbeASkd2P6JsDTpPYMqB1k1TXAOtinX8YfRTEkvgrOMe qFGqlx/OdRfX7++7zAELJS6rrRSYiSn+Eyber/GcppK7bSRU/31fTZU99X01lazoqnlN L5AszCAwgg0UI5M3qD3aAwNEUsrRNDwraqVIt3lBREJDmyJXsyHtWcFpPAYMqXw0DZXG TR8iAoFKb3T01W+CfCVMbiICBr+LDyyeGdz8H5LivKxYv8Tg3OL3aDkawjrw5aRDRwGo Qhye84vn5R0/dyEYmsN1hnh5nmEQvgYB4MVNnokP7CLz45DeOocQr8yunAtLRqJHx0VZ luTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ReRDhbN+; 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 k25si1182630wrk.519.2018.03.27.08.21.33; Tue, 27 Mar 2018 08:21:33 -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=@gmail.com header.s=20161025 header.b=ReRDhbN+; 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 613F1689BF3; Tue, 27 Mar 2018 18:21:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3ABF0689BF3 for ; Tue, 27 Mar 2018 18:21:01 +0300 (EEST) Received: by mail-wr0-f193.google.com with SMTP id l49so13670882wrl.4 for ; Tue, 27 Mar 2018 08:21:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=T8VF1LTGg4hI3zjOI4WW0If3NqUO+/XIc8Odg3pj5Os=; b=ReRDhbN+Wp2/rve850reoEgPH9dfI3axXUg0cYKU1gEFZ2V9mun8U0PjrJaQ58JWQ9 ih//JBmOGR+wZoNo8Im3UEBVyM2ss3MEeC0PkOy3MV7hWa+pjZsw79RckrhVWW1oQD+7 WzvOioqeg3hIxe6oQJiwBUUdsYU7aQK/aqkC3Kh9KKmmHpAv2jqZMXoIA+npE2RcHyhC swExxrt7BdQ0lEc1Se7R//a9Mk4g69YCHIbUFE4Ew9LV/38oQ09hqV1gqC8iZmO76+qE o01L0t0VmpiYak54FDB81smRUwhPCB2JdYdAkGJ7g4dxAV7KuE37hg/EkZZtpoiN76WR vXXg== 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=T8VF1LTGg4hI3zjOI4WW0If3NqUO+/XIc8Odg3pj5Os=; b=TbxcvJtnqT73FFJadTIh2Rex6qE4iLpu9f2zuTDBJFksDV08RdtABurEwFZIXGW8OH affCsrbCoCRCqa7KgapJx61gdPp5WKZLZhEXGFH3pZtMIG4+/dje/lRAjmm5y2mzNKUr M9J6BaERMLwcwTcaa4W1nh+J5kjFLQ7q2CgW9XWBFgQ9Xr7VyMzJGf579Xi1jcmx+7w4 gNNbB8+QJLMBdzQITaqwHBYQ08I6LA1LIKMRWpT6yU7HDcYf94r/ejL5q+CIHB74hnXU 7GsE5lQAq5XSvhgRN/qFuh7bHEwHR2e5oakZxT0JLxgrFsfTEjPJuoJyvU71d/GWW93S n4gA== X-Gm-Message-State: AElRT7HoW4HzcyqhqCjbQ8+Zrc1peS53sNEvGHvyIzHdRC+6gfVGN+Dq zIV67eRbr774462G3cSp1s7ypA== X-Received: by 10.223.185.73 with SMTP id b9mr34879371wrg.229.1522164078318; Tue, 27 Mar 2018 08:21:18 -0700 (PDT) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id d18sm1312267wre.5.2018.03.27.08.21.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Mar 2018 08:21:17 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Tue, 27 Mar 2018 17:20:34 +0200 Message-Id: <20180327152034.3264-2-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180327152034.3264-1-onemda@gmail.com> References: <20180327152034.3264-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avcodec: add eac3_core bitstream filter 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" Signed-off-by: Paul B Mahol --- doc/bitstream_filters.texi | 4 ++++ libavcodec/Makefile | 1 + libavcodec/bitstream_filters.c | 1 + libavcodec/eac3_core_bsf.c | 52 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 58 insertions(+) create mode 100644 libavcodec/eac3_core_bsf.c diff --git a/doc/bitstream_filters.texi b/doc/bitstream_filters.texi index 982e3edac8..7322af6550 100644 --- a/doc/bitstream_filters.texi +++ b/doc/bitstream_filters.texi @@ -75,6 +75,10 @@ the header stored in extradata to the key packets: ffmpeg -i INPUT -map 0 -flags:v +global_header -c:v libx264 -bsf:v dump_extra out.ts @end example +@section eac3_core + +Extract the core from a E-AC-3 stream, dropping extra channels. + @section extract_extradata Extract the in-band extradata. diff --git a/libavcodec/Makefile b/libavcodec/Makefile index aaef6c3ab8..8220ad855d 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1041,6 +1041,7 @@ OBJS-$(CONFIG_AAC_ADTSTOASC_BSF) += aac_adtstoasc_bsf.o mpeg4audio.o OBJS-$(CONFIG_CHOMP_BSF) += chomp_bsf.o OBJS-$(CONFIG_DUMP_EXTRADATA_BSF) += dump_extradata_bsf.o OBJS-$(CONFIG_DCA_CORE_BSF) += dca_core_bsf.o +OBJS-$(CONFIG_EAC3_CORE_BSF) += eac3_core_bsf.o OBJS-$(CONFIG_EXTRACT_EXTRADATA_BSF) += extract_extradata_bsf.o \ h2645_parse.o OBJS-$(CONFIG_FILTER_UNITS_BSF) += filter_units_bsf.o diff --git a/libavcodec/bitstream_filters.c b/libavcodec/bitstream_filters.c index 12211225bb..18b698a85f 100644 --- a/libavcodec/bitstream_filters.c +++ b/libavcodec/bitstream_filters.c @@ -28,6 +28,7 @@ extern const AVBitStreamFilter ff_aac_adtstoasc_bsf; extern const AVBitStreamFilter ff_chomp_bsf; extern const AVBitStreamFilter ff_dump_extradata_bsf; extern const AVBitStreamFilter ff_dca_core_bsf; +extern const AVBitStreamFilter ff_eac3_core_bsf; extern const AVBitStreamFilter ff_extract_extradata_bsf; extern const AVBitStreamFilter ff_filter_units_bsf; extern const AVBitStreamFilter ff_h264_metadata_bsf; diff --git a/libavcodec/eac3_core_bsf.c b/libavcodec/eac3_core_bsf.c new file mode 100644 index 0000000000..e722339f8f --- /dev/null +++ b/libavcodec/eac3_core_bsf.c @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2018 Paul B Mahol + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "avcodec.h" +#include "bsf.h" +#include "get_bits.h" +#include "libavutil/mem.h" +#include "ac3_parser.h" + +static int eac3_core_filter(AVBSFContext *ctx, AVPacket *pkt) +{ + uint16_t frame_size; + uint8_t bitstream_id; + int ret; + + ret = ff_bsf_get_packet_ref(ctx, pkt); + if (ret < 0) + return ret; + + ret = av_ac3_parse_header(pkt->data, pkt->size, &bitstream_id, &frame_size); + if (ret < 0) + return ret; + pkt->size = frame_size; + return 0; +} + +static const enum AVCodecID codec_ids[] = { + AV_CODEC_ID_EAC3, AV_CODEC_ID_NONE, +}; + +const AVBitStreamFilter ff_eac3_core_bsf = { + .name = "eac3_core", + .filter = eac3_core_filter, + .codec_ids = codec_ids, +};