From patchwork Thu Jan 21 16:51:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konstantin Mamalakis X-Patchwork-Id: 25051 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 4BF9144B22E for ; Thu, 21 Jan 2021 18:58:33 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1879D689BC3; Thu, 21 Jan 2021 18:58:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 882F4680A2C for ; Thu, 21 Jan 2021 18:58:26 +0200 (EET) Received: by mail-ej1-f54.google.com with SMTP id 6so3618506ejz.5 for ; Thu, 21 Jan 2021 08:58:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=boffins-se.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=RWqv5HwyES38EsGn4Zcac375heVRfhuNPHnLtGCYcjQ=; b=Nb03CYVPM+cB4QbdXLUIwLAublaggr8wv5baHEkkxKHQlSfPh6dwJpIDxs0ahKyIYd L7yhwlHWrWsH6aIrSEndt2l+qpFXZs/7Chwz36rFXl96lhjamb7zi94avq4zCqCfKJLV VRGGPvl9JrZHXzsKeyPqdHwsmZQEBeTJ022Fy336c3YUBDXZ0P4ZhIrZNkwSUyq5Jw/W eFF7pbWBoSmSH3Yw9CIuVXMvDdHfXCA7PlOeIzEXVYuMBSEGDvI/j2ICUCpuD2jk9+yX Y5pzVMZED4gs+TdJvCRY5DeXbqfdFPl5Nfz1J5wNP1chMgClkGOnTb3IJ47PI+SNHW1z Kj4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=RWqv5HwyES38EsGn4Zcac375heVRfhuNPHnLtGCYcjQ=; b=MZHxSe7PWD8x1oVmET7maRr7GOrwTTaX0gBoq/aBLq0VLUJwuGtVdJo6ET7MV21yaT wyGsb5CbNhaGEAANdBoxJNsb5J042avVkPlxuAkAy7PdGIVD2DN3d30qyxAtC/Xvhyim 1SFEOh+pnCnEdiRQaRPleqA86tOLWRQhGue+dNWWqK+3bjh9uWVrjFyWD2Bhi5yTB46Q ZRkLGHNAbFm8aNmj8o8zoZf0SLRPH0QZr69j642YL56SiH0jGQ+8pTQiUsMennZnH+I4 xMOxduyNTweq1/l+EYrLm3gTjHalkzb+yuQNxL/nbmHGFnuS1qwV2ZMLJvxhVTpR/f2y dlwQ== X-Gm-Message-State: AOAM53333ZvWKv2G2tKlmwpuBZyk6GtgBxAbDkN8spoztHWvMWBZxjQD jGmLK7a0ZEjnbzIMqrponlXdpo7M2YixmMR+qhQoPjWA8FpDeKeKNcm5UBZL7hkMPt9H4HaiS3f 3aaQYlpcuwMInV1yMBRZMV/czOO9rzXeDTx8xsqhVGk6XPPnOUy6C/wH3oPz9EUiP4F258OBiAb rh X-Google-Smtp-Source: ABdhPJyiID3HmSlALXMR/CobM7Cq8B6Jj7y5r/++U+gfLoeeyd7V+04+qGeEX4nrH5dlMSvRCbHkDg== X-Received: by 2002:a17:907:9810:: with SMTP id ji16mr247065ejc.394.1611247908974; Thu, 21 Jan 2021 08:51:48 -0800 (PST) Received: from localhost.localdomain ([2a02:85f:1514:d800:a7df:cb0:2f71:1dde]) by smtp.gmail.com with ESMTPSA id i4sm2467799eje.90.2021.01.21.08.51.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Jan 2021 08:51:48 -0800 (PST) From: konstantin@boffins.se To: ffmpeg-devel@ffmpeg.org Date: Thu, 21 Jan 2021 18:51:14 +0200 Message-Id: <20210121165114.15808-1-konstantin@boffins.se> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] fix for https://trac.ffmpeg.org/ticket/9057 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: KM Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: KM --- libavcodec/aacdec_template.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c index fbe3074..3c2dbe3 100644 --- a/libavcodec/aacdec_template.c +++ b/libavcodec/aacdec_template.c @@ -639,11 +639,14 @@ static int set_default_channel_config(AACContext *ac, AVCodecContext *avctx, * As actual intended 7.1(wide) streams are very rare, default to assuming a * 7.1 layout was intended. */ - if (channel_config == 7 && avctx->strict_std_compliance < FF_COMPLIANCE_STRICT && (!ac || !ac->warned_71_wide++)) { - av_log(avctx, AV_LOG_INFO, "Assuming an incorrectly encoded 7.1 channel layout" - " instead of a spec-compliant 7.1(wide) layout, use -strict %d to decode" - " according to the specification instead.\n", FF_COMPLIANCE_STRICT); + if (channel_config == 7 && avctx->strict_std_compliance < FF_COMPLIANCE_STRICT) { layout_map[2][2] = AAC_CHANNEL_SIDE; + + if (!ac || !ac->warned_71_wide++) { + av_log(avctx, AV_LOG_INFO, "Assuming an incorrectly encoded 7.1 channel layout" + " instead of a spec-compliant 7.1(wide) layout, use -strict %d to decode" + " according to the specification instead.\n", FF_COMPLIANCE_STRICT); + } } return 0;