From patchwork Mon Oct 31 21:15:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 39092 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8e01:b0:a3:a294:714c with SMTP id y1csp1159628pzj; Mon, 31 Oct 2022 14:16:18 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5m1kOBd166tvByI/w3zV8AS/gXjWpqiHF/sWoYW3az0wVMxt6ba2Fh9IWEOsLK+hoDJ6nf X-Received: by 2002:a17:907:1c88:b0:7ad:8f76:699e with SMTP id nb8-20020a1709071c8800b007ad8f76699emr14906710ejc.114.1667250978545; Mon, 31 Oct 2022 14:16:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667250978; cv=none; d=google.com; s=arc-20160816; b=ErtMbG5kULDj77jhMTkOqvn2lyS+L+NCpXn0MY8ObybETPhY+xWtIu4ehMQQtqCVrA /xexfZpOQO/7AAX/RONONW9WolxSlu368iaJ64MfsbxhDOncUjgIACVn6+oaborTQihT gEz3JEvsxQmlTdYLHDUc0pI/HRYp0FpLIsJ3kWYiyXvcEV0xdAvytkfqwGrMuAJojmY3 +v0kKHfCdui5Kj64akuyIKEO7bpUeFS3oLhH1yzyWhgp3EgVzMCCRQ6Ixlig/r4YdHbH e0Y2BiMAnN4omfpXpQFSHEfoFsZZPWhgWmpRoDRAdMGcQgEc1VOoyapdFsoY/aTTpzk1 4mGA== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=IyA1fZH+GC/Qh90sCfjirId8s6+BYyF1TKu/1ISntPs=; b=d0iYP/yXg5ZPUZdIcNFBMCgVIseWiMcu0vbqh4fG9f9xhEHrMNq3GyGQFAH7hgVyG3 cF6AbGhefkEPW2vAXis/uFC3HXC/IlutB2CPhoV+clGp5Gkxt6JlGGwMvHHdk02q5Dtf bY089A8+vo3R+mhzoDs0K1h14lgte8fs1a9TFDcyQHINogj65YW9/gZZE2RD6n0TxH22 wKKwzCBP7Ujn3Cjq0CjbPZ1ZoZsY+tyOLbCY0HeDcfw3uxhiX7WoYsXHO1n1q9+z1Tfr TOLfT86ZvL7G/dk2rYvD6ZCSJihEYtthj5f9BqiKLTiH5PNA1gG5b762wf6fAUKiPy08 endg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=G3Wemnre; 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 y10-20020a50eb0a000000b004574154f09asi8605464edp.529.2022.10.31.14.16.17; Mon, 31 Oct 2022 14:16:18 -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=G3Wemnre; 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 96E1F68BE20; Mon, 31 Oct 2022 23:16:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f49.google.com (mail-oa1-f49.google.com [209.85.160.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ECF9068BD6B for ; Mon, 31 Oct 2022 23:16:07 +0200 (EET) Received: by mail-oa1-f49.google.com with SMTP id 586e51a60fabf-1322d768ba7so14865142fac.5 for ; Mon, 31 Oct 2022 14:16:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=wXK0ITM7oCnXxT3K3ympAEgq0r+gR5JSsxccejbYp48=; b=G3Wemnree7lsYbNPNfuaAIif+GQEWs5It5yyctiSwtlctGK2FBeQKkJqGmIkfRzWde HbbLwwScc9C+Z8vis5qZ8icS9mjJmqKcWlzUkwcpzWNbYdrElbTjeL/2f9/Vf4u6Qisg sTIZiIHa3kCXbVCJ7VzPDNYRbDOZadfESnVsidfgLwbfVkjRDzzETULmHjn9dU38wQN6 4SQdcHJZqMlvg0KqoxMoFZBXgL0DIZDPUcDQDdXR1iNdO9C9jJrLjMLF5Q0+NBroZF1F a3gLIrV8VnWcpH4r+zRbogae4fcSsP37gOIHcCYHv2/H6ioFW1u0YGf19VY5D4145Xd4 gdxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=wXK0ITM7oCnXxT3K3ympAEgq0r+gR5JSsxccejbYp48=; b=OH5ddruyw0R/zcE5FO6Hgu61uroTaKhU7VZWCaYI2qeO7xGHuUfZdSlDSWKR6pnieV LnwHgBReVYkpGhmA4Nwone/nXH3ELoGrqcalQJWBh4C7s18UcB6mu3I2/azNfD70dW18 C0C3TSF14/XTXp02aS4pGl4YEz2RODAGGPb26veVwKEzrZjx/BsUQ506HPQmmMY1lkSw ho1eKspNo89qVSrSvbPsNdW3cIE0UCyQGMSRwm5U2qqGrEBltn8TRKwyeI7lS4jnGDLh ZjFEsWVqabgqRRT/3PZkK+M2IA12N7otqm1AXc8SaJLdiS+s7MpEDOuyrtrySTV4t1GX TPHw== X-Gm-Message-State: ACrzQf0JThF6RqCsOVAaAdyEBvUrUyP6jRd7+P+vBjPlIdcFoUkj/nne rbsYvV2TssxpG88EwRABVs8choI63qs= X-Received: by 2002:a05:6870:4607:b0:127:fd93:4752 with SMTP id z7-20020a056870460700b00127fd934752mr18136850oao.64.1667250966005; Mon, 31 Oct 2022 14:16:06 -0700 (PDT) Received: from localhost.localdomain ([191.97.187.183]) by smtp.gmail.com with ESMTPSA id k44-20020a9d19af000000b0063696cbb6bdsm3147091otk.62.2022.10.31.14.16.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 14:16:05 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 31 Oct 2022 18:15:49 -0300 Message-Id: <20221031211554.8176-1-jamrial@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/6 v3] avcodec/aacdec: fix parsing streams with channel configuration 11 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: q631tEjHm0g5 Set the correct amount of tags in tags_per_config[]. Also, there are no channels that correspond to a side element in this configuration, so reflect this in the list of known/supported channel layouts. Signed-off-by: James Almer --- libavcodec/aacdec_template.c | 4 +--- libavcodec/aacdectab.h | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c index 4a9513d53e..c10bc743b6 100644 --- a/libavcodec/aacdec_template.c +++ b/libavcodec/aacdec_template.c @@ -731,9 +731,7 @@ static ChannelElement *get_che(AACContext *ac, int type, int elem_id) return ac->tag_che_map[TYPE_CPE][elem_id] = ac->che[TYPE_CPE][2]; } case 11: - if (ac->tags_mapped == 2 && - ac->oc[1].m4ac.chan_config == 11 && - type == TYPE_SCE) { + if (ac->tags_mapped == 3 && type == TYPE_SCE) { ac->tags_mapped++; return ac->tag_che_map[TYPE_SCE][elem_id] = ac->che[TYPE_SCE][1]; } diff --git a/libavcodec/aacdectab.h b/libavcodec/aacdectab.h index e38b93a534..327efbcde0 100644 --- a/libavcodec/aacdectab.h +++ b/libavcodec/aacdectab.h @@ -35,7 +35,7 @@ #include -static const int8_t tags_per_config[16] = { 0, 1, 1, 2, 3, 3, 4, 5, 0, 0, 0, 4, 5, 16, 5, 0 }; +static const int8_t tags_per_config[16] = { 0, 1, 1, 2, 3, 3, 4, 5, 0, 0, 0, 5, 5, 16, 5, 0 }; static const uint8_t aac_channel_layout_map[16][16][3] = { { { TYPE_SCE, 0, AAC_CHANNEL_FRONT }, }, @@ -81,7 +81,7 @@ static const uint64_t aac_channel_layout[] = { AV_CH_LAYOUT_5POINT0_BACK, AV_CH_LAYOUT_5POINT1_BACK, AV_CH_LAYOUT_7POINT1_WIDE_BACK, - AV_CH_LAYOUT_6POINT1, + AV_CH_LAYOUT_6POINT1_BACK, AV_CH_LAYOUT_7POINT1, AV_CH_LAYOUT_22POINT2, 0, @@ -97,7 +97,7 @@ static const AVChannelLayout aac_ch_layout[] = { AV_CHANNEL_LAYOUT_5POINT0_BACK, AV_CHANNEL_LAYOUT_5POINT1_BACK, AV_CHANNEL_LAYOUT_7POINT1_WIDE_BACK, - AV_CHANNEL_LAYOUT_6POINT1, + AV_CHANNEL_LAYOUT_6POINT1_BACK, AV_CHANNEL_LAYOUT_7POINT1, AV_CHANNEL_LAYOUT_22POINT2, { 0 },