From patchwork Thu Jun 30 06:42:33 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: 36541 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp106788pzh; Wed, 29 Jun 2022 23:43:38 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sPNp2MoGZVvEhaD+mH6f9sGKceV/tEYU9nmUflXQ2qULqYa8DhoR4wa2WC/oaCRUh0oB9v X-Received: by 2002:a05:6402:350f:b0:437:6618:174a with SMTP id b15-20020a056402350f00b004376618174amr9441450edd.329.1656571417775; Wed, 29 Jun 2022 23:43:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656571417; cv=none; d=google.com; s=arc-20160816; b=IIq4BTomj1yCVDxbkPuPBlQ4DQfGTe8k6sOZxLgws/zlGt5rNjSQyNi1Os+8E3DWbX F+wMWvU3A1VZUqLaDNTxZyDwQUE6WIw+hKOPuuqZi/i22e735qCOYH9KjCzJgjhF3VVo gX5BvNZcmTXoTEGV9u2Rwcp0lxHKSrCUxMFE7nzLRcDfCtocE8iYUILyQ7EAOStIEbNw UQo8ZO5gehVHVDXGp+MfFOVjUa5B5z9MMj389sDQH1wLf8HwIq/G5pzuyntdOPDC3sVm 4TlFRFxhU7kCmSrN03CxzeS110TEvzIGvR4NnL96fM6iEhvufYhWtgyeIxjuGUpws2i3 N50Q== 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=X3eiVwGs2i93c09w8Iq07AtRCf7v/VN+IG5i5l3TsG8=; b=HflTUxo1p4I8GfMc3SciDLN//HzelTfTZ8wjAACoWs4GEJy2B6tE0BoaEoPJk5Fq+G Z+WIpLgwfePMZfTT30xFzySTVjdCmx9ZFNAwH7CkWFfsGKyn9lNq9JzdS1dTq/PNJ9si nKlu+hk+SUURXdkjqhcmamxhv2E+Yrus8Iuys8fxC654icLmDHTgfs3wEEq5Sv5hqrEA BWWsHZb3kUBX8V+LwBog6jWoMSiQyTT0UDLk2r8txZEgCv6m/2NTw2pJVfxWgI5XcHk9 CK8BEIvFmr/maVolWyxgDcCB2Bi6yu3n6i/0btkpFUbSXsvM+asLaawyGSVwHkjUMfwt S13A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=dZ+Rv6xf; 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 u8-20020a056402110800b0043567906342si4879160edv.163.2022.06.29.23.43.16; Wed, 29 Jun 2022 23:43:37 -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=dZ+Rv6xf; 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 CD66668B7B1; Thu, 30 Jun 2022 09:42:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com [209.85.208.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E9C9868B62B for ; Thu, 30 Jun 2022 09:42:47 +0300 (EEST) Received: by mail-lj1-f177.google.com with SMTP id s14so21832463ljs.3 for ; Wed, 29 Jun 2022 23:42:47 -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=OngO5/uBbhLHxLDq6UGxStV74u8p7YnNIpsh635xlqM=; b=dZ+Rv6xftpmERXyw6YWliN6NgZXkB61+zvhWO65sBLBh7iLHrXtLlOaBeM4tbrrmEh +S2+vz2IxXvGqP1pQ5Da5hj4ogHTC50Sc43oN8R4l1XwkhPK3url0L1RqJm1S5n3j/1B YygX0Qx9hHKWKPuIIfNthiDaVqV3w6EWnefXnVS7o7M2OgCfuPSWDZsY1ebHqAHkVhV+ Erf5FphaYSpYDMEEpFcbVK9GcXomrMRL8JMPFdkt4xlz9MwZbW/fRSdVXQlCzeLEh3WG 8YbHTkIZUX/eY1JodqX5ed6ePg8RdQI8DrEMU9BTGrUjY0kERNReXs/7fmL3VKxnQu0o YY5Q== 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=OngO5/uBbhLHxLDq6UGxStV74u8p7YnNIpsh635xlqM=; b=kq6BfZ2zbxH278xogXUOyBnXdjbSTNC6ftPt1mSKjTv7KKI/5isXgKzJkDCblSuA/M zXwBvygMIc31RWg+mcr8QO5RpgSKCiejLiHTnf2mfFbnJtvGNxksD+y9PHjeVXE59XuC rh1ru6pUMjrSPny9TXL+1BMBBbGQiZniciMxKvbsmPWSZcW6poZMJoNRxV82PmiHjy1Q l0OHU6imkNgoHtqzksyXEfifqbWUnbfq4+rBxtDHIPCvsDLUFCoE7prERzdksXoJRg22 0b6RDtfbAZXHHriwtKG4HswHZ5JufpwDlB6G67wPnrTqcSYIDo0qorG+dld/STCQ0H7O kN0g== X-Gm-Message-State: AJIora9nRPmQY90kL4WPshGekDHxAdLDQ7ih+Wy5L+m5gsrPUQqRX1FK boyhA0NBJI9mwJYRypoHFmTkX3IqqAI= X-Received: by 2002:a05:651c:244:b0:253:ecad:a4ee with SMTP id x4-20020a05651c024400b00253ecada4eemr3946016ljn.21.1656571367244; Wed, 29 Jun 2022 23:42:47 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id c17-20020a056512075100b00479112bb555sm2948091lfs.60.2022.06.29.23.42.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jun 2022 23:42:46 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Jun 2022 09:42:33 +0300 Message-Id: <20220630064238.45315-3-jeebjp@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220630064238.45315-1-jeebjp@gmail.com> References: <20220630064238.45315-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 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: cM80WbvHrtVv 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 0de9b2abcb..fea512e8ef 100755 --- a/configure +++ b/configure @@ -3444,7 +3444,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 106b5a6807..b799491fd4 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) { @@ -6093,7 +6091,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) @@ -6101,7 +6098,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;