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",