From patchwork Thu Jun 30 06:42:32 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: 36539 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp106616pzh; Wed, 29 Jun 2022 23:43:08 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uClMp0a3FxKoAra3ac/EhRLJRaBRq7aD9M3TLKNLtCJBaByO3BiatjtoP4mEpfrPmW17t5 X-Received: by 2002:a17:907:2081:b0:726:b8d2:fba2 with SMTP id pv1-20020a170907208100b00726b8d2fba2mr6925272ejb.686.1656571387883; Wed, 29 Jun 2022 23:43:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656571387; cv=none; d=google.com; s=arc-20160816; b=nIbmdD7jtCBEQUX/NQ86xB0TiCG+mt3T7Av8vo7rI7UHQAWWOp6BEetlq3xQ+qMLlH xRYjirI6+7v5H1xgcWbTFc/f2rdgBudDyJqFBDtMfLNLXrb4ZthJoMHk97p+ZFn5pyKw 2aRuXRswtxlqgSPakXadyIdlbzT/Up43hBXY0azbd6tJh0Tdcj65GMNB/5U5OpznF0KP amQJxOqRnX3Q8DIYkbei8iINrrEolP2NWk+EeW2OeciCjapBJbJjyE8ok+fbL0mVya3J 0TFgf7gPiyNwU5+16BnyvW7G+e3Z7PZ5KOhKDpXSAKGjG2pN0Ikr4rzI9ZFklbRJ8IXV lHTA== 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=QOoD4b/jkBiUloSWByGSliK31zahOr7hkC7igUGzBBM=; b=Ir1kL4CQhf9cdgrvdndlvGhw9sooaQY6cWEHBajsT7czJ+nyt+nVQHn5hobdfgp7i0 kYjn0L5GPVzjpgsKN8vXmrDdCeZi9RbTqhDwGBKJK8eoJIdMBiQ/K4P3zM9iu7tQyy6q ZMHJLduUfvmpo/exHOJVnrjyX4yvO9IlL2SsZyi6mN96HjQaHsrN8HvhIheLk34OXlI2 NmL9hmkP3LrSNNCgCcVFf/wuNOceN1P390yofnibCY+EHNg1oeuWy82IVBDaK1xSsQz8 mpIQ8V7+eub9TehW91h3AuTVopPcjTGJhHKHmNsWoneeZbRryOzqBL7hPLMRC4FAI3LI /FMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="NZkvuB/T"; 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 y7-20020aa7ccc7000000b0043573246900si9994882edt.497.2022.06.29.23.43.07; Wed, 29 Jun 2022 23:43:07 -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="NZkvuB/T"; 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 DCB2068B793; Thu, 30 Jun 2022 09:42:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BAC6D68B741 for ; Thu, 30 Jun 2022 09:42:46 +0300 (EEST) Received: by mail-lf1-f48.google.com with SMTP id i18so31992554lfu.8 for ; Wed, 29 Jun 2022 23:42:46 -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=IqYfklNB6BtvdJcz5NOcaL2adzJAd/4JLQhZlt53TYo=; b=NZkvuB/TUp8kgDjbIfbSdEKfKeX01UIOvD9VcX/9t9EYyFTWySkp/vfWqUDMzth2ek Z8p72JLjDJdZWKZKlpvxwHHF+ZrqJxVhnWaKtqNSf0xsnr5MytcK9NwEnx6IAs8Z4Bp9 Nk7NLWwWEbagabg1QgfWjFP+Sl5Thc2XG36oN2eM0/9zDZyK3fmu7F3QllpVyskSrgFG QUZio1O1qjeQ0/BHYM9V/wfAcXXCRJJmABqhnbkxTGOPnhesLVBcnvkYnq73GLPN35IR mpOf6X7HUV6eh4Ihnow2WtZtGtC1+JpjSlIh8x5DjGVghrisFp7VLs0JRtdR97InAK+v x0Kg== 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=IqYfklNB6BtvdJcz5NOcaL2adzJAd/4JLQhZlt53TYo=; b=D8jMTrToDrA5ePTxVSfe8F4LtczNXdY7s55Doqk/pFm+FsWh5c3jfMeP6iZ+MT4CYB FSQJozpt4o73p7xhwmnLASd7vapm2Gi1OuJ7z2w/TIU2+VaJkvDIrMkUueBGNsLCP87z CioT9GrsN7nS6u7p91XTBiruwZJSc5NXdxPAJ0KFUvT9OEH3nbGuOAixr7vocDEWkhXo p/c3VLrfNVeFfwY6e4avJwYDcQ1Sk2rNfTMg68Qb+WpM4zdNPWaRKHv23JEaVlgZZF9B O+/+s2CV0mnZvlMSKKcTufYVqhP/pB+z+eI8qOUuNAMFR+6vHSQgguvIh8VhTtFq/jqD tMWw== X-Gm-Message-State: AJIora+p6rI/Jl+SCtde3OWMnUG+8R/Z+FY7rAxULBbRBmjC2Kk6en53 pmwhq21hLm6b2/bMzcpv/wTtaKsYmWk= X-Received: by 2002:a05:6512:3183:b0:47f:79f3:af9a with SMTP id i3-20020a056512318300b0047f79f3af9amr4342319lfe.182.1656571366065; Wed, 29 Jun 2022 23:42:46 -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.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jun 2022 23:42:45 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Jun 2022 09:42:32 +0300 Message-Id: <20220630064238.45315-2-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 1/7] avcodec/ac3_parser{, _internal}: expose AC-3 bit_rate_code 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: jxFbXdqx6vmY From: Jan Ekström Required by MP4's AC3SpecificBox and MPEG-TS AC-3 audio_descriptor, of which the former is implemented in our MP4 writer. Signed-off-by: Jan Ekström --- libavcodec/ac3_parser.c | 5 ++++- libavcodec/ac3_parser_internal.h | 1 + libavcodec/version.h | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/ac3_parser.c b/libavcodec/ac3_parser.c index 119b1598c5..4f154bb7c4 100644 --- a/libavcodec/ac3_parser.c +++ b/libavcodec/ac3_parser.c @@ -70,6 +70,7 @@ int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr) return AAC_AC3_PARSE_ERROR_BSID; hdr->num_blocks = 6; + hdr->ac3_bit_rate_code = -1; /* set default mix levels */ hdr->center_mix_level = 5; // -4.5dB @@ -89,6 +90,8 @@ int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr) if(frame_size_code > 37) return AAC_AC3_PARSE_ERROR_FRAME_SIZE; + hdr->ac3_bit_rate_code = (frame_size_code >> 1); + skip_bits(gbc, 5); // skip bsid, already got it hdr->bitstream_mode = get_bits(gbc, 3); @@ -106,7 +109,7 @@ int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr) hdr->sr_shift = FFMAX(hdr->bitstream_id, 8) - 8; hdr->sample_rate = ff_ac3_sample_rate_tab[hdr->sr_code] >> hdr->sr_shift; - hdr->bit_rate = (ff_ac3_bitrate_tab[frame_size_code>>1] * 1000) >> hdr->sr_shift; + hdr->bit_rate = (ff_ac3_bitrate_tab[hdr->ac3_bit_rate_code] * 1000) >> hdr->sr_shift; hdr->channels = ff_ac3_channels_tab[hdr->channel_mode] + hdr->lfe_on; hdr->frame_size = ff_ac3_frame_size_tab[frame_size_code][hdr->sr_code] * 2; hdr->frame_type = EAC3_FRAME_TYPE_AC3_CONVERT; //EAC3_FRAME_TYPE_INDEPENDENT; diff --git a/libavcodec/ac3_parser_internal.h b/libavcodec/ac3_parser_internal.h index dd57dc95a6..bd4e1bbffb 100644 --- a/libavcodec/ac3_parser_internal.h +++ b/libavcodec/ac3_parser_internal.h @@ -60,6 +60,7 @@ typedef struct AC3HeaderInfo { uint8_t channels; uint16_t frame_size; uint64_t channel_layout; + int8_t ac3_bit_rate_code; /** @} */ } AC3HeaderInfo; diff --git a/libavcodec/version.h b/libavcodec/version.h index 0ef6c991f3..1008fead27 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "version_major.h" -#define LIBAVCODEC_VERSION_MINOR 34 +#define LIBAVCODEC_VERSION_MINOR 35 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ 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; From patchwork Thu Jun 30 06:42:34 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: 36542 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp106805pzh; Wed, 29 Jun 2022 23:43:41 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uvq9RSzg3XCtFM1WIGxue52WZw8v7HYH8LtngcgleIayP77gmIYtYNqXv5J4pyRqyWvHO6 X-Received: by 2002:a05:6402:3587:b0:435:b9a1:d5c5 with SMTP id y7-20020a056402358700b00435b9a1d5c5mr9458124edc.219.1656571418566; Wed, 29 Jun 2022 23:43:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656571418; cv=none; d=google.com; s=arc-20160816; b=I/5ijag6vmTBVGaDTqGv54WsDtumWlJHv+V2n7vcwTmLuHS06LkGemvIL5Tb3/WCNE H3KnYxwc5TqKDV0vhFmahaH0lX4F1kYpPSr8IvGQAAftAap/odIc6z3VZboPh8zyvfm2 rRVATb+PRGRYn3iek0Q4jOEawX18tMDJHmDhF45V8TO8LrB0ZZdSbbJVjeyPgzrFmsGS 3uM9ZxB24RDiqZTdp0cFen+niT0VZ2rwAIDvcx9VObei33p9VA0BLZwh+v2ALbm1i1IO cf6bbuwPCZNwcE9U0iNfS7VsyNeQOtWxQlyjNdgIkiKhCrJuZDjU1DAjr433j/r1Y9fy NS2w== 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=TDHfriwAYmMj8fHTLk0IJVAKvt+lrgNzrpuob4nQb28=; b=T6aWESLqJAjwtJTNLoKc+iIImOny9JccWRwuLLH3ni35L/R25KQ7dmb+UPOlLbcf89 /JH8cYJQ9nzfGtA7huYt0UZKNmmOVfe+NP6fdLfrr0QyHKjdX8KMb9OD1RLhdoKCaLHY RO1ymjYKNklE9myp+FAcIgNi30QyBRHHTn3RVDVLEm6zV5oBA90tYjjzg9l9Xf05YNda j9pj7QMyIOwDe7Rd17UobE2P5RLPwqX9sPGoaM0Wc0yxz8VtmfgXzD8ypAkskOX49ZcQ iShVu0lOUz9WvgTwX0z8XOdqrIOeqGzT206PnE6xLaWmUdb9XNs8ttc17JVk6t2ZFUH+ svJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Sl8BnoFF; 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 hc39-20020a17090716a700b00711da366315si4509974ejc.717.2022.06.29.23.43.26; Wed, 29 Jun 2022 23:43:38 -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=Sl8BnoFF; 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 CBB6A68B6AC; Thu, 30 Jun 2022 09:42:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D04E568B761 for ; Thu, 30 Jun 2022 09:42:48 +0300 (EEST) Received: by mail-lf1-f43.google.com with SMTP id e12so7706019lfr.6 for ; Wed, 29 Jun 2022 23:42:48 -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=nZxnpTQNRXnqdoYbb4ISBFYrSW+RnRYA2ZRea53CT3I=; b=Sl8BnoFF2jSFPLcpT/yotE6CDqJPHDr8mZ1CcJOH0WJuLNpce8I3eieKmA9GmBgyzv +F6gti/s+uwcpANH6oAMFDGajp7hsFmPYdGx916hYmUdVGQdi6ounN6jkIBSg0NSoWEI EfsQ7jvq9716EMLWvxH5b5r3NVJAjqLl3+qt9+zcOJUFflhBu6ZlMrOL3M48vbex4rs8 9JTdoefYXTPa4qYlLPh8CP2w3XNNvIknRwyKX9uEA0JO3o7Qj4On3SqPUex5hKzQxXCv Qaq5KO68AUZDlZZtCO62AF1lqeV4GqonBLaeaYv5+lTGpA8tA3iF9Km6F5QHb9OU0sIF BnEA== 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=nZxnpTQNRXnqdoYbb4ISBFYrSW+RnRYA2ZRea53CT3I=; b=IsWE+Yi82FkrMqRhLBjSIZr1U+Jqcp8KgGxCvNRjEQDuPwbo9CA3x48qYSHJEAwLzD AVwIFNvQ32mVKWJ8aDmhyLS12ehknxw5qeSh4/JMoL50KSuIRU4B4VYIQbcQ6C1tRIGc oO4/uwdIHixgYimnlb+UstmqV2NZpyrn4RIq3tRv0w5ytMWQPsmfXuJhpwq1yEyhpUtA Ljf59swx2ctuJzU6pq+iDUr/DclXCM9DPspTI9D9tsCj0zJa7qJGF1E76q7ojrPiAH7m qnF+neAPIQZ3zONkaRORZQwhl8t9ur8KYtL+yxI6TJICMW10q16g8hvbG4pzE99Lxee5 Ot5Q== X-Gm-Message-State: AJIora/29tvSHwLqZGW9qHeFfd62zsqGIYLtJgWFT+uYGWRtX2WMJN9V 8dJDU8Y0cMCKWqceMlfH4qiKEwswnRA= X-Received: by 2002:a05:6512:31e:b0:47f:6193:2262 with SMTP id t30-20020a056512031e00b0047f61932262mr4510953lfp.502.1656571368172; Wed, 29 Jun 2022 23:42:48 -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.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jun 2022 23:42:47 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Jun 2022 09:42:34 +0300 Message-Id: <20220630064238.45315-4-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 3/7] avformat/movenc: enable handle_eac3 to handle AC-3 tracks 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: eVySw027t+18 From: Jan Ekström Add the AC-3 frame type, as well as early exit from additional packet parsing in case of AC-3, as only a single packet is required to get the required information. Additionally, expose ac3_bit_rate_code via the eac3_info struct as it is required for AC3SpecificBox. Signed-off-by: Jan Ekström --- libavformat/movenc.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index b799491fd4..8316fd9a45 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -384,6 +384,7 @@ struct eac3_info { /* Layout of the EC3SpecificBox */ /* maximum bitrate */ uint16_t data_rate; + int8_t ac3_bit_rate_code; /* number of independent substreams */ uint8_t num_ind_sub; struct { @@ -414,8 +415,12 @@ static int handle_eac3(MOVMuxContext *mov, AVPacket *pkt, MOVTrack *track) struct eac3_info *info; int num_blocks, ret; - if (!track->eac3_priv && !(track->eac3_priv = av_mallocz(sizeof(*info)))) - return AVERROR(ENOMEM); + if (!track->eac3_priv) { + if (!(track->eac3_priv = av_mallocz(sizeof(*info)))) + return AVERROR(ENOMEM); + + ((struct eac3_info *)track->eac3_priv)->ac3_bit_rate_code = -1; + } info = track->eac3_priv; if (!info->pkt && !(info->pkt = av_packet_alloc())) @@ -432,6 +437,8 @@ static int handle_eac3(MOVMuxContext *mov, AVPacket *pkt, MOVTrack *track) } info->data_rate = FFMAX(info->data_rate, hdr->bit_rate / 1000); + info->ac3_bit_rate_code = FFMAX(info->ac3_bit_rate_code, + hdr->ac3_bit_rate_code); num_blocks = hdr->num_blocks; if (!info->ec3_done) { @@ -443,7 +450,8 @@ static int handle_eac3(MOVMuxContext *mov, AVPacket *pkt, MOVTrack *track) /* this should always be the case, given that our AC-3 parser * concatenates dependent frames to their independent parent */ - if (hdr->frame_type == EAC3_FRAME_TYPE_INDEPENDENT) { + if (hdr->frame_type == EAC3_FRAME_TYPE_INDEPENDENT || + hdr->frame_type == EAC3_FRAME_TYPE_AC3_CONVERT) { /* substream ids must be incremental */ if (hdr->substreamid > info->num_ind_sub + 1) { ret = AVERROR(EINVAL); @@ -475,6 +483,14 @@ static int handle_eac3(MOVMuxContext *mov, AVPacket *pkt, MOVTrack *track) info->substream[hdr->substreamid].acmod = hdr->channel_mode; info->substream[hdr->substreamid].lfeon = hdr->lfe_on; + if (track->par->codec_id == AV_CODEC_ID_AC3) { + // with AC-3 we only require the information of a single packet, + // so we can finish as soon as the basic values of the bit stream + // have been set to the track's informational structure. + info->ec3_done = 1; + goto concatenate; + } + /* Parse dependent substream(s), if any */ if (pkt->size != hdr->frame_size) { int cumul_size = hdr->frame_size; From patchwork Thu Jun 30 06:42:35 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: 36540 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp106782pzh; Wed, 29 Jun 2022 23:43:37 -0700 (PDT) X-Google-Smtp-Source: AGRyM1s2DC0PAnd/vwMnSI4BC+QvW2+5p9c17oNtp7VH3uQRBUii+Ug8Cogv7nQ9ppXUBJveX92q X-Received: by 2002:a17:906:2a86:b0:711:d8a5:cb0c with SMTP id l6-20020a1709062a8600b00711d8a5cb0cmr7350846eje.426.1656571416758; Wed, 29 Jun 2022 23:43:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656571416; cv=none; d=google.com; s=arc-20160816; b=WlzzLxIdqIPt1EIUjG4pQZyVeAZupd2Qc4wU1KAOmF56TKpQSg4nDuEzrZzcmb8A4J hHrKVku3h+J/CvdKQA8nLlxmaEJzP7sVhbVPk5D2rBnNymtJRv+lVk3yH2GNTuxyWU/4 UAnFAuJ1pEXMSe0fbTfyRK3eLKFV92jQQdkXdO5i8mfqa7o4156bDD5cK1Bk2KZv1mcc wSFog0QXjyCPBLcEckMcyK45N5J1cSQpvR7DJi0TOIF/BLjTcozTCSen5TwBxDvB/LbO 6QTG7eYzO1ZA3G4MKv2UxkptTH8rN0Nq0aEJLJ/2Kn+ZSn8p04KzYW3T0kz1CNDlxXOy 7kXw== 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=597wdVO7X8+X/y5jDG7rRfVn1yKYIxE6N0wMcmZhu+4=; b=fMkEL6GMMOVoQyrOw2kfaU9QsgCtq7xiBoF9Js955CbMs+gE+BeSUafHCpfRe5Ze5T R8pHiYPLXXO6U1Pu0IEj796BwgMR45vu+vycrz3q0J7vysD0Jd6c5SuDa2F2IsI1z6zR JUJnVSDqMAzbvpu1gMytxZ71oBHHi460ZBStCyzp0fcWOTQOYECaWSBUjqnUh/kvEhVK A90Sztop5y1K76IAxw2pl4uBV6wUwbryd5O+zw79UcC8XBGZ2KnP9pMb/pRDel+0lx80 kEzeJq/kmkCu34PrTfrPtxxZdWDw9w6j8zeGn1tlZyBvV5B5sV+MYlMVnt3EToV0E+cr YoqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=CWxuoNbM; 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 rv16-20020a17090710d000b006f3b16423ebsi1595080ejb.620.2022.06.29.23.43.36; Wed, 29 Jun 2022 23:43:36 -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=CWxuoNbM; 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 EBF1B68B7D1; Thu, 30 Jun 2022 09:42:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E532C68B797 for ; Thu, 30 Jun 2022 09:42:49 +0300 (EEST) Received: by mail-lf1-f54.google.com with SMTP id e12so7706080lfr.6 for ; Wed, 29 Jun 2022 23:42:49 -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=irXSlDAacbU0NSr4eZ5h4WhQdFvXfKqHMRqEjtsBE9I=; b=CWxuoNbMimwqlFWY4txwcQMMRi7KTz1xv3PbACuAcOGEdxZWUPKCD7apCw2uhu9nTw DD9YbOn4d3n0x78lHAmpiDF4fDmc3EhHwZQGhOvMH+2rKE36hc38jrIpzFWWOZ+gtGwd lKb3eOtRLOesDo5pM4Mo9rP68pzoW9oPgr3ikMYhpO70NofmUb3I5LVxRu00xeJB26jQ Ib54n3nZibx3t99JkYlAvn6jrh7AoncsUhc0qDqWeRG6gLcSRB4jUcFodj/YC1nUbQFf S4jlq8+0LQZb/s2QEAceR7rMWdNijr5iMIEs/oxJenCKSjZTAZCJXJfLaewYtOsZOwCS eQPA== 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=irXSlDAacbU0NSr4eZ5h4WhQdFvXfKqHMRqEjtsBE9I=; b=RSD3jGI6ZzHaL9WAMszi57Uq21ED4oQRnSrDrsiHdyJZcyJUH+nY17EEPINXQi1WJK /3YW14txsy8cx9w+sUU8tdMcChrRmgVA+1U9gV/9LSL3V/chvnmdiAZPel48IGZyuRj3 baog03aiLh1atv6tq5K9k062V//OjMQXGkjJG/l0CBdjWzx0qM1fcNEtkly69mYb+p6Y QQlKtBIW12X7H77hnyzFlDnmLqEt2HqUNxP3rU8AqWfjIL2ZgZ9inP8X/bNqMWGspor2 dVvDti6odgzQj5GJOBF5vFDJPNl4TaOx7SJZV759R0hc+0DSyxYz4OCa2VRwdAJoa4Ct rnLw== X-Gm-Message-State: AJIora8gHueb/orFmyF8C8fTIQ397GVQprgIOSKaNUH7Ik65gBOmEqit eHQ9P3J1S18XQIoub0Dd+izYwdzdWIM= X-Received: by 2002:a05:6512:31ca:b0:481:1319:a72b with SMTP id j10-20020a05651231ca00b004811319a72bmr4398066lfe.108.1656571369266; Wed, 29 Jun 2022 23:42:49 -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.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jun 2022 23:42:48 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Jun 2022 09:42:35 +0300 Message-Id: <20220630064238.45315-5-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 4/7] avformat/movenc: move eac3_info definition so that it can be used for AC-3 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: htOaXOiiORWm From: Jan Ekström Signed-off-by: Jan Ekström --- libavformat/movenc.c | 66 ++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 8316fd9a45..b9e3f1a63e 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -328,6 +328,39 @@ static int mov_write_amr_tag(AVIOContext *pb, MOVTrack *track) return 0x11; } +struct eac3_info { + AVPacket *pkt; + uint8_t ec3_done; + uint8_t num_blocks; + + /* Layout of the EC3SpecificBox */ + /* maximum bitrate */ + uint16_t data_rate; + int8_t ac3_bit_rate_code; + /* number of independent substreams */ + uint8_t num_ind_sub; + struct { + /* sample rate code (see ff_ac3_sample_rate_tab) 2 bits */ + uint8_t fscod; + /* bit stream identification 5 bits */ + uint8_t bsid; + /* one bit reserved */ + /* audio service mixing (not supported yet) 1 bit */ + /* bit stream mode 3 bits */ + uint8_t bsmod; + /* audio coding mode 3 bits */ + uint8_t acmod; + /* sub woofer on 1 bit */ + uint8_t lfeon; + /* 3 bits reserved */ + /* number of dependent substreams associated with this substream 4 bits */ + uint8_t num_dep_sub; + /* channel locations of the dependent substream(s), if any, 9 bits */ + uint16_t chan_loc; + /* if there is no dependent substream, then one bit reserved instead */ + } substream[1]; /* TODO: support 8 independent substreams */ +}; + static int mov_write_ac3_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *track) { GetBitContext gbc; @@ -376,39 +409,6 @@ static int mov_write_ac3_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *trac return 11; } -struct eac3_info { - AVPacket *pkt; - uint8_t ec3_done; - uint8_t num_blocks; - - /* Layout of the EC3SpecificBox */ - /* maximum bitrate */ - uint16_t data_rate; - int8_t ac3_bit_rate_code; - /* number of independent substreams */ - uint8_t num_ind_sub; - struct { - /* sample rate code (see ff_ac3_sample_rate_tab) 2 bits */ - uint8_t fscod; - /* bit stream identification 5 bits */ - uint8_t bsid; - /* one bit reserved */ - /* audio service mixing (not supported yet) 1 bit */ - /* bit stream mode 3 bits */ - uint8_t bsmod; - /* audio coding mode 3 bits */ - uint8_t acmod; - /* sub woofer on 1 bit */ - uint8_t lfeon; - /* 3 bits reserved */ - /* number of dependent substreams associated with this substream 4 bits */ - uint8_t num_dep_sub; - /* channel locations of the dependent substream(s), if any, 9 bits */ - uint16_t chan_loc; - /* if there is no dependent substream, then one bit reserved instead */ - } substream[1]; /* TODO: support 8 independent substreams */ -}; - static int handle_eac3(MOVMuxContext *mov, AVPacket *pkt, MOVTrack *track) { AC3HeaderInfo *hdr = NULL; From patchwork Thu Jun 30 06:42:36 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: 36543 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp106834pzh; Wed, 29 Jun 2022 23:43:46 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uujIwfZLRGu/++/4H+Tybu+czREzcEaa1JnlSbRtLKCsxSGTG83D2AsFc/yJdQ8+aBI1fv X-Received: by 2002:a05:6402:3707:b0:437:61f9:57a9 with SMTP id ek7-20020a056402370700b0043761f957a9mr9200413edb.1.1656571426113; Wed, 29 Jun 2022 23:43:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656571426; cv=none; d=google.com; s=arc-20160816; b=jewqxEW3ow4msp4/9WBzpVChvV7UaWlsP2isNyiC9KSo0vvYFUEGrGdR7xNrRCq8Ti RBSnwVcLMgldxRaxtBkJBEI464brzi8cydoEf4Qq65J3JaqhqvMb23WfxA9qFg1D3mSV piN/OGcGV1XZ2WMu/QAthuCFEBOodqcrTH8NF3hAsMtUMl5PO8TSxMMcHrYRWJp31i/6 cA9P0wC1V+q49G6fPcXrO3SVDM2TTarH+RVtMGxEJdufC0uy6uFXgO3wcsn5vqps2TAs 7CNyqMYn3BgoBxV5ryMhFUi2jn0OGb4jQ+D+WJJxgwwjEwd/l/Wx5CAASFuiUYiUwH5a cFwg== 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=Ac6mZJrtbUarMhVzUZpb2nlm4VRBfmAymIAX0nnZQdo=; b=a3LKYHK1dIcEbboeqDMAs0NSYoto/k/8FBYqZaBWI9CISYvoT/JKL7gbrzPDPuprba dNJMNM3rgVHPYqhk+DE53e251ClJ7DNYO5nOp0VOYiBOqP2IVyaeuqzKvJeU/0MC8WtF E7iOfBr0/0ReqR3lOq6PwLPFrs2LneXT/xkkBkDABV98t7EasePUiCC7ArTvV/5/2CPm jQQv7orz9QXKWr6EFJ6W4O+jfwN1xwbouKzUGOQu2BeIIhsxu6KzdrKS+B+retBwtwgN OEGUBtXiZJe9Q3OUmj86gTi6Tb+YbImL8K0obD14cAVcXy4Yh4U05rhVS63rzgNOzJ+r dgZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=gGiAZzbp; 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 z7-20020a05640235c700b0042de30cf6e5si27020443edc.365.2022.06.29.23.43.45; Wed, 29 Jun 2022 23:43:46 -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=gGiAZzbp; 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 DA73868B7D8; Thu, 30 Jun 2022 09:42:59 +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 D61F468B7B2 for ; Thu, 30 Jun 2022 09:42:50 +0300 (EEST) Received: by mail-lf1-f45.google.com with SMTP id a13so31983266lfr.10 for ; Wed, 29 Jun 2022 23:42:50 -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=3/HYICoP3BHzB8rALuALWgjoEjeOvqSPVxAIkTjb3yc=; b=gGiAZzbpwKUOuybELBIxU/Ac75SeceYg3qxIJ2ozdXdOlotVAGJfx3M4YhF+j2dDus Pm/4gSV/3lVzNJdvFJSuNTrcUKwQi2PGodj3lqAlZ4/fljMR2r6ciw9CjDBZ3sKq1f+b M/hatzg5iPfaqFQlb209nKWVxBqkJvGxWHpRpZntADXq525baIrDlAriprTd+q2d/ZUW mBm60yhwqoaQZv4Pwdb5L5R9Q1Mfk6rzhtMmFQ9ErTgTunDCiaCLd9FP4NXSU4Lhu3+Z rIbB8aEUPLT91UwDOCPuuNpFKsEDvnLmx2WhQ4jCJvPO7h9uBAxIrKpZQZwqnk/kXfpa UXTQ== 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=3/HYICoP3BHzB8rALuALWgjoEjeOvqSPVxAIkTjb3yc=; b=fWUNmf7/NJHSYBYOcaGYb9HIax1e/E1L0YNjCucHj6fP5jBqKuT/SbTOCsl30imR35 beWFp0YMI7vqxI8yCFUVUUsGYS5/+dZ2u0zQ1KM4lCNG+2XSOkCz5i9pI+yyaRo5Qg7T ZSZRdQfNL36nlfS0xFjFFppverNTQ6r2nIkXtHzXI3x4OMSL4OImJgWDsDtmNQaDPD0f OxHL7JrACOt99uRIJMBjE4heQZf9oX4wh5E96ABjo8gNao97I/w1yqCp/pRdsL256gRB FF1j4XaSLhf7s1qrdJl8JX48yBOW55L7WqGF4nXLo+8XywMrAiJ6EamDc1yUD+cO+Z1a uPnQ== X-Gm-Message-State: AJIora8lwaHPPdd3mXT8NRWSKY9u85NicYSb0wpSt++m5oEGQF56TqZk ATdKJ4icLhlMW/UfKHIc0E7eefe/zFk= X-Received: by 2002:a05:6512:118f:b0:47f:6a1a:20d4 with SMTP id g15-20020a056512118f00b0047f6a1a20d4mr4238776lfr.428.1656571370115; Wed, 29 Jun 2022 23:42:50 -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.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jun 2022 23:42:49 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Jun 2022 09:42:36 +0300 Message-Id: <20220630064238.45315-6-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 5/7] avformat/movenc: utilize existing AC-3 parsing workflow for AC-3 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: Qmpid2JSlDCd From: Jan Ekström Signed-off-by: Jan Ekström --- libavformat/movenc.c | 46 +++++++++++++++++--------------------------- 1 file changed, 18 insertions(+), 28 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index b9e3f1a63e..382c2f2e75 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -363,44 +363,34 @@ struct eac3_info { static int mov_write_ac3_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *track) { - GetBitContext gbc; + struct eac3_info *info = track->eac3_priv; PutBitContext pbc; uint8_t buf[3]; - int fscod, bsid, bsmod, acmod, lfeon, frmsizecod; - if (track->vos_len < 7) { + if (!info || !info->ec3_done) { av_log(s, AV_LOG_ERROR, "Cannot write moov atom before AC3 packets." " Set the delay_moov flag to fix this.\n"); return AVERROR(EINVAL); } + if (info->ac3_bit_rate_code < 0) { + av_log(s, AV_LOG_ERROR, + "No valid AC3 bit rate code for data rate of %d!\n", + info->data_rate); + return AVERROR(EINVAL); + } + avio_wb32(pb, 11); ffio_wfourcc(pb, "dac3"); - init_get_bits(&gbc, track->vos_data + 4, (track->vos_len - 4) * 8); - fscod = get_bits(&gbc, 2); - frmsizecod = get_bits(&gbc, 6); - bsid = get_bits(&gbc, 5); - bsmod = get_bits(&gbc, 3); - acmod = get_bits(&gbc, 3); - if (acmod == 2) { - skip_bits(&gbc, 2); // dsurmod - } else { - if ((acmod & 1) && acmod != 1) - skip_bits(&gbc, 2); // cmixlev - if (acmod & 4) - skip_bits(&gbc, 2); // surmixlev - } - lfeon = get_bits1(&gbc); - init_put_bits(&pbc, buf, sizeof(buf)); - put_bits(&pbc, 2, fscod); - put_bits(&pbc, 5, bsid); - put_bits(&pbc, 3, bsmod); - put_bits(&pbc, 3, acmod); - put_bits(&pbc, 1, lfeon); - put_bits(&pbc, 5, frmsizecod >> 1); // bit_rate_code + put_bits(&pbc, 2, info->substream[0].fscod); + put_bits(&pbc, 5, info->substream[0].bsid); + put_bits(&pbc, 3, info->substream[0].bsmod); + put_bits(&pbc, 3, info->substream[0].acmod); + put_bits(&pbc, 1, info->substream[0].lfeon); + put_bits(&pbc, 5, info->ac3_bit_rate_code); // bit_rate_code put_bits(&pbc, 5, 0); // reserved flush_put_bits(&pbc); @@ -6029,8 +6019,7 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) if ((par->codec_id == AV_CODEC_ID_DNXHD || par->codec_id == AV_CODEC_ID_H264 || par->codec_id == AV_CODEC_ID_HEVC || - par->codec_id == AV_CODEC_ID_TRUEHD || - par->codec_id == AV_CODEC_ID_AC3) && !trk->vos_len && + par->codec_id == AV_CODEC_ID_TRUEHD) && !trk->vos_len && !TAG_IS_AVCI(trk->tag)) { /* copy frame to create needed atoms */ trk->vos_len = size; @@ -6107,7 +6096,8 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) } } - } else if (par->codec_id == AV_CODEC_ID_EAC3) { + } else if (par->codec_id == AV_CODEC_ID_EAC3 || + par->codec_id == AV_CODEC_ID_AC3) { size = handle_eac3(mov, pkt, trk); if (size < 0) return size; From patchwork Thu Jun 30 06:42:37 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: 36544 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp106895pzh; Wed, 29 Jun 2022 23:43:55 -0700 (PDT) X-Google-Smtp-Source: AGRyM1ufp2IvoMiKwJkVg4YpeImDd3s4icKBgC2b3ySG1QB3pksWI6/cq1BEmOuR1EWKoYe1iiXC X-Received: by 2002:a17:907:9488:b0:722:e5c8:c647 with SMTP id dm8-20020a170907948800b00722e5c8c647mr7113053ejc.291.1656571435326; Wed, 29 Jun 2022 23:43:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656571435; cv=none; d=google.com; s=arc-20160816; b=T83ck1ZCG+eXfyrMxWyKcJsVsiz0CsExqZ8y/VXcgRwXVVfPAC53Rv+qSmP+LMtZmC uXL/xPLMOhu0lOF6SUXXgnLLJ/Rugl+Lt6VdPgAo0Bp7eHXrCMLKqDt7VoH8F6Q9IANC wSKBby4GCuxlMpdQH1kpJ5zL7hEjB/LdH6TTg5nREzHHrFwynQPNJaN2NU9l4A8/6sL2 uhfqoTTC8dYFXXJPP1QhxHOInY3MmTCD5gq1iI2uGYqKrdH9bwpfo3+G0/3EEc7gCJsF Fj1DhQz7lrGpL6iy8vz+jfkjYe+vVTFnFuJSEwKga9MWbzfCoNeGH0E2Na0q+0/l8h71 CgyQ== 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=9wYMeoD/qYxtihPizQjWTPGMmSB7ad+Ls9pv2lVV4vg=; b=aEyXtgBZJVv29y4kPiNP3ctsATm7zzdyHsCy5kY8ZyE9OZ+FYC5s5OW7tRQjkBW7kc ovt8WqzfVr7f5YWNl5cBAKMInwxO7+UESoc+332kG0k4muCa986pwj7cTztg4zYvcAsH YI7JeiD9J5OpGrUHZG1jznhveObvLVwSlSiPV5otL8kq7l23nTFSmbS1JO3c30FocsI0 d77XrhdKefv1YMloYCJ3koMH+9z84dyizUqwd8WtzfS2JPFGzyd+J2yh2Twxg5j9uEDX waXPFU5OvCoeKrKTRtgycic1b44PXuS1O6ATJ1l+EsQ7BMVrQN5/0UlgRpgr4JiRl8nU mcPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=W3vOf8E7; 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 sb36-20020a1709076da400b0072625d8a873si941858ejc.927.2022.06.29.23.43.54; Wed, 29 Jun 2022 23:43:55 -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=W3vOf8E7; 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 AFA3F68B7DF; Thu, 30 Jun 2022 09:43:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8618168B748 for ; Thu, 30 Jun 2022 09:42:51 +0300 (EEST) Received: by mail-lf1-f54.google.com with SMTP id y16so8125520lfb.9 for ; Wed, 29 Jun 2022 23:42:51 -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=d15wzqY4w4aqmd12ER9pFuSaUjsuEW0kZn7pujcLHNk=; b=W3vOf8E7s2L4RQShNEVCAV++5YoLIfPb91O7MJt2ouSjyAkrEn/4nWOnpWpozJg/mn XWyznTgCj4odF2XWnlA2oOPx1MJJOTW2o0UAzVm35PlaPXvyNfJGdEaTMRtaGXE7v7iC 0042XhoyfdiGbvvqaRCDEvtujDy4kdg0LulQo0OK0P8c7R72W2ubkG9Kk1MV8fYKKAbN itApMDQpF2rvK2Y9OX4dyqDk9XR/MdgzxqhBT2hAlP3TaW74WoMJWM9tS5zOi0I4f9R5 uqLVxTsxDqN+XobEN16zRvidWNKb0RLh2Oi8qcKsV/RrNn+MspbVFpUfnCvKS+ZImlKq ZibQ== 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=d15wzqY4w4aqmd12ER9pFuSaUjsuEW0kZn7pujcLHNk=; b=oN6qBuJXQo6x0S604j6IPUjr8JKMUzx6AJf4872WW59oaY915yEpMETqKF61b4oLhG FRXajru2PIIdeh0MRtE5EIIcmvPkp51OQgp/bQPADMgMgbZiUYnuJBTXVial82KjziRC 4LGP99Y+PuDk6DALVl34ye3J0LZYriJn2S/aev5j7GDpYltQF62mGTWkhEygw5m8kIag 0lPCa+1ksPTghxQtFLSVpeCrw177x1yABUuSA2mMLOGnfmktbujMJwL8q5PUmWBQ8GIw 5sUk0cfA94xRaayOvoA3gYQG+DLv1JXvNCtnyN82FhRlO8twLf5Sd1JD6k+eDbt4p+wJ bgZQ== X-Gm-Message-State: AJIora/7GdhGJhoKo8YpW56R3u0aEXBofs4900kEhSvQla/G+chDtYTv qYoB6PrqYx4ok/JgLVAfzpgv70RVwCg= X-Received: by 2002:a05:6512:1321:b0:481:31e2:1b3d with SMTP id x33-20020a056512132100b0048131e21b3dmr4258198lfu.263.1656571370987; Wed, 29 Jun 2022 23:42:50 -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.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jun 2022 23:42:50 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Jun 2022 09:42:37 +0300 Message-Id: <20220630064238.45315-7-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 6/7] avformat/movenc: handle OOM situations when parsing AC-3 headers 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: 8srEcskB/CwQ From: Jan Ekström Signed-off-by: Jan Ekström --- libavformat/movenc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 382c2f2e75..022fab675e 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -416,7 +416,10 @@ static int handle_eac3(MOVMuxContext *mov, AVPacket *pkt, MOVTrack *track) if (!info->pkt && !(info->pkt = av_packet_alloc())) return AVERROR(ENOMEM); - if (avpriv_ac3_parse_header(&hdr, pkt->data, pkt->size) < 0) { + if ((ret = avpriv_ac3_parse_header(&hdr, pkt->data, pkt->size) < 0)) { + if (ret == AVERROR(ENOMEM)) + goto end; + /* drop the packets until we see a good one */ if (!track->entry) { av_log(mov->fc, AV_LOG_WARNING, "Dropping invalid packet from start of the stream\n"); From patchwork Thu Jun 30 06:42:38 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: 36545 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp106937pzh; Wed, 29 Jun 2022 23:44:04 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sCzYWP+lbxNZxz5TlyJtUV2S00EQuvJVtDiCH06R/0Y1S/h5qEcCKt5U3s6d2jeH9rzOIi X-Received: by 2002:a17:907:8a01:b0:726:2c8e:4cad with SMTP id sc1-20020a1709078a0100b007262c8e4cadmr7095649ejc.611.1656571443807; Wed, 29 Jun 2022 23:44:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656571443; cv=none; d=google.com; s=arc-20160816; b=qwHtdHeEsVAwDmxkfjYNqqKzIt10LbMkE+lE2zSXvkamA41hrKl/CEm8UQTsxsFRRf KuUPTI55+wyt1E3sXLN3YAPMUgXlq9hMnvn5RHD3oF0PyXDZpbi6U+OrOVhQU4tlHGUu A+3EDV2nmyH5NKxNWIoSeLYgEt5CtfSsmE9NqQF6meVzQDu9cWvZGLntxTHc2d0lgK0W BNl1uT+2U4uKcRjrOwJNkjwu3t9+9jcYTIlyZzX65b5DkjajHl9gQk3KGoylKWOG7qUL LBBB+FejPveQPhgMs8Ibh5Ky2qVz9Bga7X31HMKeagoOyspZeNlOccBwUKjOaCj7aSb2 3feQ== 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=Lpnecq7xAIjDP1RusbYBg+qZ9/EObYHsXzEoMoNepMc=; b=zBCd3r4UR+3KmaFPi+QwJ7k2YANPOIUHYfkivsml/ghaAiotprjfnyFRRAsp5JZac2 Fuh4/JINsV+fvA3hCUt3L8mkT3VaJ59e8qhJ2mSj+HqJqa4m59o2PGdxHn1jN4TElb5P Ep/VR40psMkA7sTobUOqDpEY1mhI/+0eZ3oW2WmKKLCuCZA8bxD9WUvrX1M/yRPkBmHu WbOxqRJMhZ/Qp8LVfbruB9l1hxvD4OU81PKOx9/c8P9nxy7EMRU9caDHQj5qbPzLEaHL t3NVjvETQKgazYKCzG1xh4LrjLngHEqsVD3RQhDEFy0D4hHW0ltP95ErNdi7+pELH5zw 7q9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="aIHP/96f"; 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 go40-20020a1709070da800b00726e0ea1733si3650333ejc.993.2022.06.29.23.44.03; Wed, 29 Jun 2022 23:44: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=20210112 header.b="aIHP/96f"; 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 B1C3A68B7BF; Thu, 30 Jun 2022 09:43:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com [209.85.208.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6FB5668B7C2 for ; Thu, 30 Jun 2022 09:42:52 +0300 (EEST) Received: by mail-lj1-f181.google.com with SMTP id u14so8428313ljh.2 for ; Wed, 29 Jun 2022 23:42: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=T92QvE3Zdh344Uv8rdyRtA5m6VtKc59oh3pMDF4m41E=; b=aIHP/96fpg4UVbuyIzV5kRZzmleBSZj64O+ReOM5DRus36E3IjrDn2cR5ib+6QCtXh VRFfjM3VrTREdcbxVLOMWpCqMN53seRKo296fUhEoPUfe/0ln4qjdxEXc+sb2OtgA2jg JhskKsy55TNKuGMTNx5YgiKmY5/hfFVfFlGsCggn6c6mHGxAzp2yuDVMvBVRjTokmqI0 i67MWpYEdFhxl8kST5nwB7tO2eqvhBDlLfPACsCLxMJWMZ4rMMr4H1Se/45XHB41oBe7 FwZhSvvQNB23O63SGY6VW95H7pHlrlgV/85iCj0aough4RiBRjNMT4Pg4IWgtiKNMWva jthQ== 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=T92QvE3Zdh344Uv8rdyRtA5m6VtKc59oh3pMDF4m41E=; b=UM7jxvaX/N/JIaGq4K/zgcjlvhieNulbikoIsYEGqfXXE0aBFr3yH0x6HCcwN4mRPw 0etCn1XYN2rn0jbm1f60MkV6+0pD1+mWzD3yQUcroBEDjlm84tlBR/rneKCyAqJDzkz/ uLYGsUlWHGIK1INmyalgIOFpr3bq6VDL7v0CACbtOI6ehi8QPoSnl37xxlMPXibTUcx2 vOBNpYzIzGvg22wP1eXHgrqx3ont/+4V9n4+ckUp8AhtdcXWOQ/y3YtYmCK2lyWmcRiV 4I3IyM51uhv/cfbVFQ+fSOjJrjYPPToeicOUYVY4jTczl5jgrfQYor3qLEEQLO9lPo7n pvLw== X-Gm-Message-State: AJIora864LcYherlP04gJ4Qb7cUmsj8g/LdYQuE6AMLIpL3N8x7KIh8D Wjy1u062/TLgYXn8oKZHBFvtTEmhsno= X-Received: by 2002:a2e:9ad8:0:b0:25a:7391:238d with SMTP id p24-20020a2e9ad8000000b0025a7391238dmr4013619ljj.502.1656571371825; Wed, 29 Jun 2022 23:42: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 c17-20020a056512075100b00479112bb555sm2948091lfs.60.2022.06.29.23.42.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jun 2022 23:42:51 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Jun 2022 09:42:38 +0300 Message-Id: <20220630064238.45315-8-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 7/7] avformat/movenc: limit ISOBMFF AC-3 mapping to bsids <=8 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: d7qbI4UkGkWQ From: Jan Ekström This leaves out RealAudio DolbyNet, which utilizes bsids 9 and 10, It is not clear whether the interpreted bit rate value (divided by 2 or 4 depending on the variant), or the original bit rate value should be utilized to receive the bit_rate_code index. Signed-off-by: Jan Ekström --- libavformat/movenc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 022fab675e..3c605f6474 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -374,6 +374,14 @@ static int mov_write_ac3_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *trac return AVERROR(EINVAL); } + if (info->substream[0].bsid > 8) { + av_log(s, AV_LOG_ERROR, + "RealAudio AC-3/DolbyNet with bsid %d is not defined by the " + "ISOBMFF specification in ETSI TS 102 366!\n", + info->substream[0].bsid); + return AVERROR(EINVAL); + } + if (info->ac3_bit_rate_code < 0) { av_log(s, AV_LOG_ERROR, "No valid AC3 bit rate code for data rate of %d!\n",