From patchwork Thu Jun 23 07:24:08 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: 36390 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp3301600pzb; Thu, 23 Jun 2022 00:25:38 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vd2hedJG3ch4A1gIGzAOiOyQRsw3QkBKcubjiE7Bn7ZO40Ez3OrX0v+TOEf5RqCnetkiL5 X-Received: by 2002:a17:907:1314:b0:722:fc80:3b34 with SMTP id vj20-20020a170907131400b00722fc803b34mr3737267ejb.583.1655969137909; Thu, 23 Jun 2022 00:25:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655969137; cv=none; d=google.com; s=arc-20160816; b=BxbtEmBIkCt2O4+w7qG+zVdFjurES2wy8YqENYhaJcNmSqxoLNg13a2SngX5ViUmMo 55xBVsy7ZbT8WtTx/woyuVv3twoM7F1bXpd05XjvkgujPg+rdaqZL8Z7Pr44aSUYe/+I TPd8BEiXQgMdu4Blo1XeehN3ppN9+Bf/BQjsUFJAvEzV4DyOkkcVexrqs5wad6pMK4Q6 l8WlQw7qRD78tu9YcSeHbVtKAxbEemGE1Y9QJptWmAijQtBnKTZkSqMf1C3aUOreG4FQ mdQh2EP2rRMKRrVfSgcjqgOjuAEN4bnM8oRIsJAao0h4+ktJV3ycZ+DsWY+8x3bhDyKA 8Fuw== 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=uReGTI3BwuN+B1o4BkzC17FkcUybFP9eDGJxuekyFhA=; b=intazJq3ig6FnwmiMvZc0AkjNWV+YVNnhOV5mp5YLQt92hr26yRkuLC8MtUx1Sa3iP 6XOtAR1vgasO3r2uPBk7mEx7V7nIpqWbw3bi05vFsz+GEHyiFKOn6zO82i36CSc0REX1 ug6QHfidz7Slf7wV5Q1RLVU8e+Ik44gz0lWWQKLBl/J/hS2fmR0qGWcoQHEY62v1c/O5 rOHmcQ8kZbOHzaUChsV0zCLNbdzBtBDDbERB19zIoSSgMQ+dl7KBDeQa1A6FcnWw0ERN ffj4r6tzyIJEVxp6h65XHCQwSauQEEQ/yXNzIiYFIRKVsWhbg+tQpG7GEgW6+w8ZsQ7V 39BQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=pAYeQgkG; 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 j20-20020a05640211d400b0042b9c88d5bdsi24069301edw.470.2022.06.23.00.25.37; Thu, 23 Jun 2022 00:25: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=pAYeQgkG; 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 370DC68B749; Thu, 23 Jun 2022 10:24:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EDB1168B710 for ; Thu, 23 Jun 2022 10:24:20 +0300 (EEST) Received: by mail-lf1-f46.google.com with SMTP id z13so1328247lfj.13 for ; Thu, 23 Jun 2022 00:24:20 -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=46Z3TUgjfrE7InVArlCCjrDwhXE8kADnjGNVAfuIMEQ=; b=pAYeQgkGRmTxO+t4p1QziBlGwBytzEjD9VEFwarAj+WfWEa1J2fRpCKxMBbi6puXXt AkNrZwQsQPCizwkxMaOrTH8mwS9SIjuKBHBYY0yrYKADaHS6LOvS4YWSKE70ekoatMNJ ESo+KjrB4gHLaKaC70EAVNr8Cs2M91V0AmGHPM7MO6xmz6kkzC7hUW0wFLeLLJCRM0Cu pyqBWChyWKrpCvIU3YXZRus6vdTU1gC+g4voZYvT95WnbFQ22gBiROYC6+sPmOkj2p4X jVc4uk7EUSpYNUIm1ys9O1VcWznsQtm1yaPJEA506WnLNCWDXcoO9LJmcq9rnk2aXiO5 Id9Q== 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=46Z3TUgjfrE7InVArlCCjrDwhXE8kADnjGNVAfuIMEQ=; b=C5yJrttZvg8r7RNyRmUQy4PNzL4Yl3vwUtErgGoAN2QqaQJ9+0itPWf6EbNpfwOFiD i1LpVmXETp95K9mqw+hfdAKsWJo6A3DR896o0nCLVS0+2MU0uO0rvZN5Rkk25dkD2g85 tifS8m7sNUFVNfcXrjO3TT9wT993tsod4YvfSr3iH7CJh1JEW05Ov4CA65mr08+xH4md 0HMZ1NKiEFh2W9FSQEJv9c9B2CaQeN8ZhaSgieY3KDwreBviqZM9bTxvbcZgbBZNAgmb q1tQwb4Dwo5ERZ070j7i6zYsNSpdkZAtagKh1QwYfSPr9cGdAOxCpFTADn515ohBDjfW fxjg== X-Gm-Message-State: AJIora/DsID3LTyjr+BTKMTuKaXAIRGSORn/jrYgA9xc1WaKfT7fUeL9 w4OJRRbI030YN0cdI2sQFVGqlwPnBUc= X-Received: by 2002:a05:6512:40b:b0:47f:8215:8bf9 with SMTP id u11-20020a056512040b00b0047f82158bf9mr4388198lfk.360.1655969060374; Thu, 23 Jun 2022 00:24:20 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id a15-20020a056512200f00b0047f8ec3ca4esm732843lfb.87.2022.06.23.00.24.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jun 2022 00:24:19 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Jun 2022 10:24:08 +0300 Message-Id: <20220623072408.38977-8-jeebjp@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220623072408.38977-1-jeebjp@gmail.com> References: <20220623072408.38977-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 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: KGjH7etFX3ij 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 58ba0bc545..a3e108c5af 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -375,6 +375,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); + } + for (unsigned int i = 0; i < FF_ARRAY_ELEMS(ff_ac3_bitrate_tab); i++) { if (info->data_rate == ff_ac3_bitrate_tab[i]) { ac3_bit_rate_code = i;