From patchwork Fri Jun 17 13:04:39 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: 36301 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp120498pzb; Fri, 17 Jun 2022 06:05:34 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vNAPqbNyNzWYfYSE5a8+Kc4jVK9ZYXWbYko4IBkwZqbuGDWZHwtQrqjVHF6+QvPm/VZXYp X-Received: by 2002:a05:6402:4252:b0:42e:13d4:4f4c with SMTP id g18-20020a056402425200b0042e13d44f4cmr12176084edb.92.1655471134470; Fri, 17 Jun 2022 06:05:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655471134; cv=none; d=google.com; s=arc-20160816; b=yId7jNAWCsWT+0drNzjpyaV6Ciz2eUZG6Eo2L0O+7jfWZsLS47zSDpxwqiMAh52osC z4cCufc3eDPmsDkh5WkSC6CLikr9H2sMRDAOpkrjmNCmrT8iQ8upf3U+1oBymgxzXZ5k jclYrI3nO10Pudz0D1TgKmZ5mb6Yy9EgHS5LxwxTnTCtu75NvA66PSnr0mD1s0C/sTai gE//3C02oQaChyE4VWI6atxesp1qtAAd3TfcOEe+xbO0n2BhkcDxiCJrnoFPNdVFYDFb YvjWU7r+MwYhQeNT4YfxRvKbyd9lTeu9Ltys/sc/7Ne8x72OXNK9PniOBkucq/YgEeyg Zbaw== 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=l0DuSAuUhcUAG+NZtBJn9+5CpEBTvIEShe+2wVPRVBs=; b=OqeAXFaDQ1o+X6BsoCwGFOi6PvLYqiuKAWA4pdsX35H/fdv/ugN5QGLP6vPXJqBSlh jOewrbUmSh3Jb2hI69WKV1Q9GzShoKm8EHxuW4vS9O8yxO/PINDJOF6Qb+3Cb01BUl89 ILgUrpQEzrW4BZjhnRX2Ogmae203uq3qYlvUesLM4e/MbWwBTjfTIJdk0N1KFJ9/O5mh /ycjgh5Ghyg4fHx+x6Fq8F/chBqNG/9fSvLZ0WMzIjmxWNDYW38z2WEtH9ChURW4p/XS 3Ah2BtBQ1iqxz3pRxIaIBFnLSCpob2es+sjCcHnxfZP/eOSW2CpPL7bxzoL3MLF1b6q5 AfkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=nmKYdnx9; 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 ft19-20020a170907801300b0071200c8fa60si3821981ejc.596.2022.06.17.06.05.33; Fri, 17 Jun 2022 06:05:34 -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=nmKYdnx9; 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 65DAC68B8D0; Fri, 17 Jun 2022 16:05:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8220A68B634 for ; Fri, 17 Jun 2022 16:04:52 +0300 (EEST) Received: by mail-lf1-f45.google.com with SMTP id i29so6867952lfp.3 for ; Fri, 17 Jun 2022 06:04:52 -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=TFckWsadjNHI0hBs1TBsqWj1MQ2VHp3ByykFHEfEjMs=; b=nmKYdnx92IPO8dnG8lJ2x+icOH2C8onouvfXmDj1kNds49O9dEBuvj8xqKUm1Q0znN tTrx+6OPjucLQC1oZLyHE4VL/8A6uP1yLz5nAqcJuEFQHRAZtvZTy5f3xQHY+rtZyrFA 78G5PGMSWmX6GMDq7hrLnDU5rPkLnkYzcdyDgxCJTE7PeqduB+UL5dM73aFs4v8sfSwQ FS0odnKhaqaBa7XmMsrD42BZzcrfngKv8ZL71UlnxU1sfVR257pw3qmb6bfNGEbMsrB7 FOoZXULoGcOwyiBOaGk/u1FtpIhDnDWXnJxsb++MpycNqMQLbaE9VOGjLPmWli6PASiI buIQ== 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=TFckWsadjNHI0hBs1TBsqWj1MQ2VHp3ByykFHEfEjMs=; b=zv81iiPVpdHIau9kZTV0PnqMskyy8ZrwNBbn3ZGv/N4AWiVkmzwDKegozZiZ7bJfcI z+RRhzIohI9xe2K9LoGvWa46hG1Va0CD9A14Ms+p82kqDU/J8SeCdGZIyKeQ2GahuW3e jm36uhvQtVKESNH5Nrcrt+W+dEUqE72hYxLPE7gmGlAAcyRibYgHIyNTHLyPhTD8Q63e aEoqsP80jaQfe9qcMjixCkj3eYgOINZxrBb5LAd1lYpJSI8uDoDwUutolcUnwClHIZpO jWx/1ADIUjV+EBvm0e500vtME5tmp8H9uancTzzTRxnqDKFiPd0puZzKJR4aKM61YXDk 67iw== X-Gm-Message-State: AJIora+6nLFtHu57/hK5xpvErzXwKbMf/hpx4Xwi+xfAMzxM7nfjZxJ0 WZjfqTMRikkQLPs6c1eP8Hf4Fv0PaYg= X-Received: by 2002:ac2:4d82:0:b0:47d:b3c8:9e80 with SMTP id g2-20020ac24d82000000b0047db3c89e80mr5473560lfe.623.1655471091843; Fri, 17 Jun 2022 06:04:51 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id k20-20020a192d14000000b00477a287438csm638487lfj.2.2022.06.17.06.04.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jun 2022 06:04:51 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Jun 2022 16:04:39 +0300 Message-Id: <20220617130443.188377-3-jeebjp@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220617130443.188377-1-jeebjp@gmail.com> References: <20220617130443.188377-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/6] {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: qwxVK2cvYVe3 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 3dca1c4bd3..c535c4d4f1 100755 --- a/configure +++ b/configure @@ -3440,7 +3440,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;