From patchwork Wed Mar 28 19:00:14 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: 8212 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp811648jad; Wed, 28 Mar 2018 12:01:03 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+4QzL3kPFJzZJj//Y89dpTndrUKAkG2pMihXog1EcZJp2ZF+XRFO5zYMt9regVLzbh/tA5 X-Received: by 10.223.219.144 with SMTP id u16mr3948344wri.13.1522263663745; Wed, 28 Mar 2018 12:01:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522263663; cv=none; d=google.com; s=arc-20160816; b=kLRM09Jvg+Oi4isSZc12fZH5LEk1Dx/41jE4BHzOefv1HhVJ2/WyfPwsXKuhSREoPO trXKR6VsyMbeuVdHHGR5dleeE/J3ekT9RVvinUlM7nytOXsxPrOFGlb/cHh0caGbcVaL v52qTS5bUz2EvhS2rNmExSLTRUHcoIlvBQYVIVdNzHJ/4WsIGClYfoKgLQJKMZdB90Ti P/f0FWdHuLJhYfjYhkHIdlKbbsiqHIfTEIwujy2ftr9JzizLLInYFt3ilQ+wcCvzn8Jm 4Lb+9SR4GRfI8JISq9c4tByjB75hIsE8KCC246JJ0YgXEqy/XGAea2wdcO6X0XjAQn9X BRZQ== 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=WWU85d3P+v1nSWwUTe+glk2LJaqC2CXReUhAcizkg1M=; b=Jk89rkbqiScLUasIz0vLBVJeFWl9JH4xsIj81t2EMjhMC/w3YwgDQFgy5uRv8A3qf7 j18pyAr/2/rkY+FB8Dog3D2m1OEgpFrgKWygfOC5IRVB2I+a7n2VKjym8UyIUY4iXtxn YML4HE0Jrzc926cBvh3mvvtNA0n6i0boApqhwcKbKFAyy0nwCR+TgaNv2VVFeKFcp8Y9 cB6y0+jfJj27PPd9X4JSS2EK4CY5x2gzwHjbIcXEpV4Mq+qfV3hB3wQheD8DBinklduy VbeQWIP5+aRhUY5ZkihDjkfj0Yg3U1k5YNgpmqaUAc6+ZauxSHS7yedJch1BxZjD54wD 2yYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ijO9yX3A; 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 3si3329691wrf.189.2018.03.28.12.01.03; Wed, 28 Mar 2018 12:01:03 -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=ijO9yX3A; 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 D81D3689AA5; Wed, 28 Mar 2018 22:00:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 53D96680371 for ; Wed, 28 Mar 2018 22:00:37 +0300 (EEST) Received: by mail-wm0-f68.google.com with SMTP id x4so7198334wmh.5 for ; Wed, 28 Mar 2018 12:00:55 -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=FC71ojIlHyQxYee+ftuAkXskq+CRygGXVV9/jhbZI0Q=; b=ijO9yX3AW3M//3aPOt1uocYurF5wBPz//yqjxgNRbapbyXBc5nwY8LpezFiDQCL0mg u8EySSr9fW28WupowsGTHJWlvBJeUpOrxKdd/9W9P5BFyNSyvq8SMOovmCbILRyelkUa x3Qv7i1r1QOkXXfdi5PaH6jOgSwtFrZue9zEM4fQfwkRiP0CtXkLWmOVe7OC32OXupv9 3yNjOKqpJLQvcd/uqBwpc6aw7ykAJFCSpycGK479G7bbRcw49upcgTLKULR1mdBd4KaF T7FiBaZjBEO/aWW0OHvSlAseDUPKqThDBi8gpO06bVDPrh2H1P1e4Z9MaxJvwgE6hMqY yYKw== 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=FC71ojIlHyQxYee+ftuAkXskq+CRygGXVV9/jhbZI0Q=; b=t+2Y6XobK7c1KwtfraJS/W+opKPZE5UwD13ErWAQzOWNphTgT2J10oj9uDaNOqT2g5 bSTmTAub0CqmAPMqQ4MivBEtTpLxAIo3YObR0vHE/aqAMK3cWwkisMy/lNmzbntTzNX9 w/47+NPUt4mXahQ5Dx8ehqNlZP6vOmtFFYl4SiMZ1XpYJ8OCQ6F7VA+lTo5wurLkgc9j LzDIYqNi1cXXqvQ0J9B+CYpmo/9LrmlnKKOL4ml0ut5+BskC6ZqYCwSNBu4cfA3ssmcP OhbNThx3QEgSqb/Tj+6o3ndVezfnwulz/JX/8BklXrOp6zmlJ4jGmF9gh6VjaTxtiBW5 i0Hw== X-Gm-Message-State: AElRT7H0jMPA1nszuENui9hxLJOIyjZJsFL/V928eX+m970in+GJdTwg EaJfbnCPPSQAi0rCRUil0sTRXQ== X-Received: by 10.28.160.5 with SMTP id j5mr2515551wme.7.1522263654738; Wed, 28 Mar 2018 12:00:54 -0700 (PDT) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id f22sm161123wmi.39.2018.03.28.12.00.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Mar 2018 12:00:54 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Mar 2018 21:00:14 +0200 Message-Id: <20180328190014.27062-1-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180327152034.3264-2-onemda@gmail.com> References: <20180327152034.3264-2-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 | 80 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 86 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..85feb2583b --- /dev/null +++ b/libavcodec/eac3_core_bsf.c @@ -0,0 +1,80 @@ +/* + * 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_internal.h" + +static int eac3_core_filter(AVBSFContext *ctx, AVPacket *pkt) +{ + AC3HeaderInfo hdr; + GetBitContext gbc; + int ret; + + ret = ff_bsf_get_packet_ref(ctx, pkt); + if (ret < 0) + return ret; + ret = init_get_bits8(&gbc, pkt->data, pkt->size); + if (ret < 0) + return ret; + + ret = ff_ac3_parse_header(&gbc, &hdr); + if (ret < 0) + return AVERROR_INVALIDDATA; + + if (hdr.frame_type == EAC3_FRAME_TYPE_INDEPENDENT || + hdr.frame_type == EAC3_FRAME_TYPE_AC3_CONVERT) { + pkt->size = hdr.frame_size; + } else if (hdr.frame_type == EAC3_FRAME_TYPE_DEPENDENT && pkt->size > hdr.frame_size) { + AC3HeaderInfo hdr2; + + ret = init_get_bits8(&gbc, pkt->data + hdr.frame_size, pkt->size - hdr.frame_size); + if (ret < 0) + return ret; + + ret = ff_ac3_parse_header(&gbc, &hdr2); + if (ret < 0) + return AVERROR_INVALIDDATA; + + if (hdr2.frame_type == EAC3_FRAME_TYPE_INDEPENDENT || + hdr2.frame_type == EAC3_FRAME_TYPE_AC3_CONVERT) { + pkt->size -= hdr.frame_size; + pkt->data += hdr.frame_size; + } else { + pkt->size = 0; + } + } else { + pkt->size = 0; + } + + 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, +};