From patchwork Thu Jun 23 07:24:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 36385 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp3301343pzb; Thu, 23 Jun 2022 00:24:48 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sWRgGQwF0pN02trzgMkPamySEVKXXNIhIL+jGRj6jd3EGc/6Qn5EFmLixFRpDzcBQmchtP X-Received: by 2002:a17:907:6d12:b0:711:d524:8c88 with SMTP id sa18-20020a1709076d1200b00711d5248c88mr6808343ejc.615.1655969088577; Thu, 23 Jun 2022 00:24:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655969088; cv=none; d=google.com; s=arc-20160816; b=L8T6io25KpMN8c+DvBxDkmQgJyr+jLVNHgWuf+d4pJILCmM4F3K/x/R3E5EznfTtsj Z7Svuyiwvgb3Za7DxQKQf/IbEteCpGJClXsC7uxrEuloRuDvRpNXmtqRyta5zKFaTXb4 Jsq+imxFgeD8BEFcLpb57HActasiMX/SksESSuHQXg/ezJ/Z3+TEcCrdzBkMuOezbDOV yfoLD/KM+AEx9Zk5Iml7J+xmHmDlcJoKH/26oLd9615+t+kv3S+r1+op8gh61QO1nW6O cBKovmsht2FT+aaUn4bDY84ClO28Fl54v3012USBMKufdqgCr32jw3p5QK0cZ1xBOuqV Keqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=brqXmh3PxWPpQDHDW37ANRhOOen6T7psiBj90fekReg=; b=Wm5x457Rg7evJ7wr2vDI49gGqlTlOuCZNu1OIyZiTWN5jjTmP+sjpHdf69TJCXXqG5 my5ch4YKm/cen3rFjElJ8LUYTseTY3Xtx+ozuBPUoHRStUjzG1o7jt/hTBf2PbJobQjs 2DqAjiopQEo6eqpbKWYiBncy+H5vWGqTcUxot+7I/Cbxc676Wya8cYPiIoR5NqWk5bwx i+kuUrWQwatqKqE4wnfxk9mWIlpx2ABdSZi9Tc5QJP0Te5meZk6pdZZTLF98ZHRGO0bS oKCOM6E47Uzy0TU1QdiVKrM6e+ef9SsCqFvM2iTlSdsR4mt5hGHrognkUaGUcyW2E4um ebKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=nkK7hemx; 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 t1-20020a170906948100b00711fc1fb3cfsi4688831ejx.399.2022.06.23.00.24.47; Thu, 23 Jun 2022 00:24:48 -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=20210112 header.b=nkK7hemx; 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 13AA468B6E2; Thu, 23 Jun 2022 10:24:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E761268B574 for ; Thu, 23 Jun 2022 10:24:16 +0300 (EEST) Received: by mail-lf1-f52.google.com with SMTP id z13so1328004lfj.13 for ; Thu, 23 Jun 2022 00:24:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=24Z98jCqKP0NDF+w9tyNgk4Ztj0bmh5PPazvRcQmDCQ=; b=nkK7hemxvk13qqmiYsZ0pPxmsWUOyzoGXtdnQy4/KdcDEWp415hp2ZV+hbfE3sVMo+ I16aJGtOSnzyon/rngxM258OXN/YwbF+trF9iRUg6qdUYq5yiebWBGWNxBFiuH8FZItL NubaUPu5EEUE7x4duu4+1VlXiGSEX5CYNlhrER57+y7PRhinHSfm+zfGWRS8AC/B16g5 jhWLZDY4ArioKEhEekYY06SV3Y3Fw/E6e28pAtkbMdJ+3szQ75HPAO515dC3PSLE3ij2 IX9gw7UnyUIoNSbrxLnXVGusdPbQ0WgAPviDswO41HmJn1DzDEJr7GRITxiM8+nuYGZ8 fL7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=24Z98jCqKP0NDF+w9tyNgk4Ztj0bmh5PPazvRcQmDCQ=; b=bnGOx2kuG1fxh3VpnTrcfnawNArEkxiPgyR0BAki8oCrJ+4Qf6l0ai1rixs1xAmLj6 mcErMOj+dzuvJ0egXzv15ynyk1h4Hqt9hOGcLhq27WCIOEuInXw2eH2a8pjStsPnJyHr 4g2atMGCATBpjgwpkBPUcLTsRqntly9co5C6dcMVZO3nNjSdt+G4uriuJdud4FQtJov4 02O5DtC/6t0XtkpUEpBDn3CDfDS7TQIpWAFj3SvYmYr+iHa0KGkjNLYB+RinVa1uQLrh NZ2vPXnD8zrljp93u3bNAYHBGxV3nmNPd2IEgrb/Wl5v492GN8AOtGmUk7e1bnNs8tzI oChg== X-Gm-Message-State: AJIora9DzHj5eKJ+3CCr/mQ83X8rDIROa/ba0gXOFoy8h7obiqa20Kyl mq72UN2gx8mN52CLnhjYCV9g1DHHhEk= X-Received: by 2002:a05:6512:33c9:b0:47f:3f2f:5c28 with SMTP id d9-20020a05651233c900b0047f3f2f5c28mr4494931lfg.675.1655969056336; Thu, 23 Jun 2022 00:24:16 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id a15-20020a056512200f00b0047f8ec3ca4esm732843lfb.87.2022.06.23.00.24.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jun 2022 00:24:15 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Jun 2022 10:24:03 +0300 Message-Id: <20220623072408.38977-3-jeebjp@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220623072408.38977-1-jeebjp@gmail.com> References: <20220623072408.38977-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 2/7] {configure, avformat/movenc}: enable AC-3 parser for movenc 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gvor3Qod/10P From: Jan Ekström This simplifies the code to no longer have #ifs in a manner which does not require handling avpriv_ac3_parse_header returning ENOSYS. As an existing example, the MPEG-TS muxer already requires the AC-3 parser, and in order to fix existing issues with the current AC-3 movenc code, switching to use the AC-3 parser is required, so this is an enabling change for that. Signed-off-by: Jan Ekström --- configure | 2 +- libavformat/movenc.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/configure b/configure index 3a97610209..5d991ae530 100755 --- a/configure +++ b/configure @@ -3441,7 +3441,7 @@ mlp_demuxer_select="mlp_parser" mmf_muxer_select="riffenc" mov_demuxer_select="iso_media riffdec" mov_demuxer_suggest="zlib" -mov_muxer_select="iso_media riffenc rtpenc_chain vp9_superframe_bsf aac_adtstoasc_bsf" +mov_muxer_select="iso_media riffenc rtpenc_chain vp9_superframe_bsf aac_adtstoasc_bsf ac3_parser" mp3_demuxer_select="mpegaudio_parser" mp3_muxer_select="mpegaudioheader" mp4_muxer_select="mov_muxer" diff --git a/libavformat/movenc.c b/libavformat/movenc.c index b7b2f46a17..87cd066c95 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -408,7 +408,6 @@ struct eac3_info { } substream[1]; /* TODO: support 8 independent substreams */ }; -#if CONFIG_AC3_PARSER static int handle_eac3(MOVMuxContext *mov, AVPacket *pkt, MOVTrack *track) { AC3HeaderInfo *hdr = NULL; @@ -549,7 +548,6 @@ end: return ret; } -#endif static int mov_write_eac3_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *track) { @@ -6046,7 +6044,6 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) } } -#if CONFIG_AC3_PARSER } else if (par->codec_id == AV_CODEC_ID_EAC3) { size = handle_eac3(mov, pkt, trk); if (size < 0) @@ -6054,7 +6051,6 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) else if (!size) goto end; avio_write(pb, pkt->data, size); -#endif } else if (par->codec_id == AV_CODEC_ID_EIA_608) { size = 8;