From patchwork Tue Jul 5 16:34:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 36678 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp3605347pzh; Tue, 5 Jul 2022 09:35:29 -0700 (PDT) X-Google-Smtp-Source: AGRyM1v7F/jAzEnaIHC/noodglZC8KgZLTdAu8jzk3Oy8JAYeZwLACcdTub/grJ/OJfzszDvVKn+ X-Received: by 2002:a17:906:f17:b0:6fe:94f6:cb8a with SMTP id z23-20020a1709060f1700b006fe94f6cb8amr34901832eji.456.1657038929569; Tue, 05 Jul 2022 09:35:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657038929; cv=none; d=google.com; s=arc-20160816; b=03VAuyRQGSNM53D0zH3S7lqC3HlMXqiXw1vROgKKTS+DuBGoOlZsvkD6ejsFNkAMPO 12OuyWufmR+RkUtoDLVRdjPEotUMq8GLzqrHXf2I9VKR0Ef/oOFywdrhenWLpxGWLSGA cYAnbEJUPMU/t7VBM1qVK9h+KHE5vwHN1460t5BVwJC1A3gBrJiIPs1QcBJTG4G2BaoP KlpD7624Tju7di+0jwEXG+I+IfV3xeO65PJDaC2geznr8L/QkhE5X+++5mJ2yHUP3Fgo CWamRb7juHWQ9JnRb7RqaVgSmNx8lMq7a3E9Vgy+e8esJPsb82jpaV7jZUZbkazLj4hB hsXw== 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=bgqr4oUQoRwr8usKr0cCUsgtbN+gzfmWmIstbHyDPQs=; b=CmOi3BGFbCQww1d8BbDYSSXpMTMmV0HIb9T4RnZviCMNzEh9iSjkWiAMnd443t2HGd nqn/+2OS4uuulIMQE3qY0J9SY/lDW8EGqFgUz6BxrjsgOLn2112WbWq9/rFJN43RBUeJ qTYjaXekJjTBjn8lgkXmAR01t9G4KGstM4Dply3RztEvOpBvVfJsEDmRtHz2q/k/rUUN HpEYSBFK8hfeqdSqcRr1p8Mlj2qre/u1ABTstAZAgAOa9e/m0Mn93k+g860HchpdHolD cTq8sViFY5AMJ9/UyOGnEYD24HsbuVIGAO1Wo8+BjPqyyOE5aHv7xqZcwHhL3V1VKy4L nKbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="p/4oBkO9"; 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 v17-20020a056402349100b004352610c39asi18441161edc.233.2022.07.05.09.35.28; Tue, 05 Jul 2022 09:35:29 -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="p/4oBkO9"; 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 B537368B9F6; Tue, 5 Jul 2022 19:35:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f48.google.com (mail-vs1-f48.google.com [209.85.217.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2A71A68B6B0 for ; Tue, 5 Jul 2022 19:35:19 +0300 (EEST) Received: by mail-vs1-f48.google.com with SMTP id o13so12461373vsn.4 for ; Tue, 05 Jul 2022 09:35:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=rn7sRpP2AoT6dShA4nIGHCPOTfTs1Jsq22FU7cxS8J8=; b=p/4oBkO9VEuOu5zL5pKTmo1cU43wOGX9U8PPXjyXJpiZHTsC+DM9p65U0ycT+3iW9z 3y/ZjZ+am9ZYs8050BtMjWNOqxESbPcA6lLckRKxa8qG5RQeCVuyHyQ1+9/ZpEHF0WXE 1FnfOgXJAFbOThp81B/gk8v7gB44OYBhySOVuPlg1Knlkq25iH1+nmoltpY0sd2ONZtI 2ku07SGniX7yU+KehG/tjT2lqP65DVUvOuOLVLVVKPIdFuy0x6EEX8/XvkcxAbXPPVJg b+TLZWTcU69IqrmMJeDj6lCjaI6oORwCS+62mfTTMYTmNIA2as5iDrvINDU7/Wms176v atxQ== 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:mime-version :content-transfer-encoding; bh=rn7sRpP2AoT6dShA4nIGHCPOTfTs1Jsq22FU7cxS8J8=; b=CYV3zkJzevwajhE+y3a2GK31KGuDovSarTbkbkpnGw+pYPmebJo+7rCBGbCRG8i9y4 prm6CwvrznawDBI1qiYWY5moq6TP2zM823OR/rQf9F488nixtTs6ivbNKgTH30h9grkt HnGefnKVfko9JDCidmxvSS0n/P+4KX1m9qbJLd1uSHQcGxqLoQSUnviW1fWehKGUea/D fgU2/huhp1GHqlYOhxIiyV2Rj5XZrtOeIuW0gB8Ag0N47Wx32WOWRIl2dU15KPCHtzWd SV6sTWwnpd4ExogZdZSh1eACeqFSyVRBu9u8gQxB2OMjei80CvjZ+VxKfl28KFjkRR7L +8+g== X-Gm-Message-State: AJIora+VANMOkT9LYrhmZhjwSqnBXHKp2w6gJH6lWCcW8eRSQXZmZKSP 6FaY1hhqv2KqoeywSZmg7CDBhaDCehXfXw== X-Received: by 2002:a05:6102:44b:b0:354:519a:c43c with SMTP id e11-20020a056102044b00b00354519ac43cmr20812008vsq.49.1657038916604; Tue, 05 Jul 2022 09:35:16 -0700 (PDT) Received: from localhost.localdomain ([186.136.131.204]) by smtp.gmail.com with ESMTPSA id df28-20020a056102441c00b00356ed39b7e6sm2644177vsb.13.2022.07.05.09.35.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Jul 2022 09:35:15 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Jul 2022 13:34:39 -0300 Message-Id: <20220705163439.58146-1-jamrial@gmail.com> X-Mailer: git-send-email 2.37.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/aacdec: fix parsing of dual mono files 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: bzzqrPhXPLZj Dual mono files report a channel count of 2 with each individual channel in its own SCE, instead of both in a single CPE as is the case with standard stereo. This commit handles this non default channel configuration scenario. Fixes ticket #1614 Signed-off-by: James Almer --- libavcodec/aacdec_template.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c index 0135cb35df..10fba3d3b2 100644 --- a/libavcodec/aacdec_template.c +++ b/libavcodec/aacdec_template.c @@ -701,14 +701,15 @@ static ChannelElement *get_che(AACContext *ac, int type, int elem_id) av_log(ac->avctx, AV_LOG_DEBUG, "stereo with SCE\n"); - if (set_default_channel_config(ac, ac->avctx, layout_map, - &layout_map_tags, 1) < 0) - return NULL; + layout_map_tags = 2; + layout_map[0][0] = layout_map[1][0] = TYPE_SCE; + layout_map[0][2] = layout_map[1][2] = AAC_CHANNEL_FRONT; + layout_map[0][1] = 0; + layout_map[1][1] = 1; if (output_configure(ac, layout_map, layout_map_tags, OC_TRIAL_FRAME, 1) < 0) return NULL; - ac->oc[1].m4ac.chan_config = 1; if (ac->oc[1].m4ac.sbr) ac->oc[1].m4ac.ps = -1; } @@ -786,8 +787,10 @@ static ChannelElement *get_che(AACContext *ac, int type, int elem_id) type == TYPE_CPE) { ac->tags_mapped++; return ac->tag_che_map[TYPE_CPE][elem_id] = ac->che[TYPE_CPE][0]; - } else if (ac->oc[1].m4ac.chan_config == 2) { - return NULL; + } else if (ac->tags_mapped == 1 && ac->oc[1].m4ac.chan_config == 2 && + type == TYPE_SCE) { + ac->tags_mapped++; + return ac->tag_che_map[TYPE_SCE][elem_id] = ac->che[TYPE_SCE][1]; } case 1: if (!ac->tags_mapped && type == TYPE_SCE) {