From patchwork Tue Jun 21 06:46:30 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: 36366 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp2050767pzb; Mon, 20 Jun 2022 23:47:16 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tJrvjsTr/3aW606yA0k679hMkO/IAfuU7vWVVIDHQIjmSwVZJDmlE6f/R2Nqx3aJxzDj4V X-Received: by 2002:a05:6402:524f:b0:435:8f6a:59d1 with SMTP id t15-20020a056402524f00b004358f6a59d1mr5843264edd.65.1655794035950; Mon, 20 Jun 2022 23:47:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655794035; cv=none; d=google.com; s=arc-20160816; b=CuhHxt9ackhoSzW8QdD5B3C3rU4C6dwCUkyBD4OTCCdS4htKBYcKKg3jwaG1iquLWK 2wL6LFhLbfMkimIJoYvD5ooZnpdhHU9kJZgUzGZ3Cc+iIjoi/NSSrQy480WbeBHN7Iv+ XW3kNazdMhgHIz8lD/itJ99hH++H5wTDT96gZ53ueXzXolbTxYVCUYmerzj7GXO6r2LG Z5TEzI64rVCfyQZlE1jZ+ua/7/71WVnyr2aF4SbkQkZrBvQ0G7J/avmQ1Z7/qpJSTmTt czN8c55BsVklIRqnuR7Ny0iditTOhooxQGO2XaBVE8MM43ldrD4jAczAvWHNMI9UXn5g NJvA== 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=RRmBFcmLPSctgdASgEa0Gme3T24dKOpRJIsZS3Arc3w=; b=UIfPFj6pRP/h1UWznpAGeDghWq2f5w7LMdHYuNM7uK9fKYLamBqwr/O6fhCj6HimBP x1V4s350xg88mIa2G7dR1r+uY5Xbo66lip5/NEQaAIQEax75PPVNoCqRgm1CxMc9HCZF qzMeGt1EHIKLUmaUA3AStOLRYbSzqLHqmZqzDV9dwd0L2tvduz5Ihm7BurYZ+fZstLjx 87A85Tj5L4IiVftDvYK++wSQ31eIePrUo6CSUzyRV1aRLlXzGcDDIWnebBk9vySONGui Gt0MisKjE0QJkdbhpVVz0pUpOwi/ryRU3LIaVZorM/6eLe36KLXe7peI0BKfU15p8Wsg v+PA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=T0+m6F0a; 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 z22-20020a05640235d600b004358594050esi5794652edc.320.2022.06.20.23.47.15; Mon, 20 Jun 2022 23:47:15 -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=T0+m6F0a; 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 6C2CB68B66E; Tue, 21 Jun 2022 09:46:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0506268B63D for ; Tue, 21 Jun 2022 09:46:43 +0300 (EEST) Received: by mail-lf1-f53.google.com with SMTP id j21so7628504lfe.1 for ; Mon, 20 Jun 2022 23:46:42 -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=zE5LBsSM1qj47CoIDmnWH7XbnYLhfFLX+tnv1tNmJuQ=; b=T0+m6F0a9Wh7TqFxsTGmy1iMKiMI2ZtG+G0E51t5WJ8sTTOOucP1Rkm33g/TqHR4iU +q6K7iv5+Ds5IpaP8q6lwEv+YsDlxiqvLLfz6Jz1bt51nke01ro1Czp3xK4InY0+CaFV M37iTIoa9Hg9I3HYPawGhBJ7E/Lqa8oTehznb0R+gn4KVEQbh2ivZ9M6iSyqK17gcVme D9zgbWfNl0Hhu6WiPMToMWytiriDH0nJLXxmdiskCjwu8N/BEVsJedAyNOz62b/my5lJ uc4qsEfYKDI+lz0XWKBo6kPzy6srDitkP+HdNGxSDdgmam7GiPofIydsf/iuF3XuntcO Ldiw== 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=zE5LBsSM1qj47CoIDmnWH7XbnYLhfFLX+tnv1tNmJuQ=; b=RgY9EKVnvMJ42XMdu4aWrBH9S+QLp5rdNz6Mc8Tadbj1GfsB/l1kA9FBDm4hEgSHNB g48DRpg2dGOcQfbCzrHCKj7NLPjxn7vEPlXVRZx+5g/0/63fIJ6Fq+fW1mSmPpOVm2xv 801mKW5uYDbFB1quGm7E/tndBJVII4+RwHfHYSziBO+KZ3Q1BWFU3lfQsY7APdgZN92g GX2Fdj9qfQg9UmpjZrVr+yeslFls4SLot2z7CB1+s3hjXD8J7GLAHIfvbRXg4w6o7jgl WYb9jWciWGMPa7CyR1eunM3MnaLJDMAWx8q0j7zBTpMXyPbel8fogl3/FaUdZQ10BcIc ts/Q== X-Gm-Message-State: AJIora8PJc/JkPE8/rLTq71CckrP7VrnELMT8SsXc79Zf5Qu2bmH4UTW qkuzonO8eC2Xbn0tEZurHCStPA1oyhY= X-Received: by 2002:a05:6512:c21:b0:47f:6392:dcf5 with SMTP id z33-20020a0565120c2100b0047f6392dcf5mr8587781lfu.117.1655794002347; Mon, 20 Jun 2022 23:46:42 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id u18-20020a199212000000b0047255d211c7sm2046767lfd.246.2022.06.20.23.46.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jun 2022 23:46:41 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Jun 2022 09:46:30 +0300 Message-Id: <20220621064634.16797-3-jeebjp@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220621064634.16797-1-jeebjp@gmail.com> References: <20220621064634.16797-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 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: xxwDFQ4b7PcK 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 7ffbb85e21..0c5a1ae8c0 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;