From patchwork Sat Jul 30 14:08:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 37042 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp1484207pzb; Sat, 30 Jul 2022 07:09:16 -0700 (PDT) X-Google-Smtp-Source: AGRyM1v6oTa/rqmID1mkGdyLRm7rsdmRozPJQLe4XW+sKgHe8rgKrMpHCqehWSzpgym7KiODAYqe X-Received: by 2002:a05:6402:4395:b0:43a:c694:907d with SMTP id o21-20020a056402439500b0043ac694907dmr7815443edc.310.1659190155974; Sat, 30 Jul 2022 07:09:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659190155; cv=none; d=google.com; s=arc-20160816; b=kDjys41ruFmjG1N9UhQUM6cBqg2l08sljFNgw5qcwlF0AT/QI5DvZ+N4xtv0iGVnBs 48EIC2LcbUuE8X7/kobOinpcnj4IC9afuRM5zJM21qMHP+OOKHa+nlkqh1jdbw4DeX5D LzcQN1DX3HCRYIwr6QCLwXpjGnDmA95eogDyDeEGVEHsvyJ1e8NIKvV/MKwTiT2M5OF1 NCrnfB3RhpHzJAeSf8OlL0PCSkrBLSpyKJrlXrfAvCX4qBf9IqcxlxZO9M1WPKZi61fn 02X077jzdhCS1ckND/d8od+c8b3jP8QKC3gfDfTAb9qBffDVbdWg7o8CN0+BCRmkHmK0 69sg== 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=yndwoMacEq+l/glQXxD/ZPjPVaQ7cO/xdTdJs44F6t4=; b=T4NK3a3UHPb48s3mHuYG8zkSykChoQQbc6bTW1/cKprvvvuKpfD6EXW0yPYGOyr1YA 7KYz2evIFjuH+gIqtE8yjjiEogNwEyDG4Mn3TsWeh4lEDaGp9v4PyL23JH5by8vLdoEk fYBKeOIVLpNiGvdBDmX1dO7URDnDew//cfnwOCzvNzd7LmqzvM38htVA9XiedQqcMxuq DZW3oVhh2jiDa2M5gvE1guAvFnqQKWm1EBOKO5Els5Xoft7nSrmjrXXYUNkyJSnHC2ba 9csnBIzttmuF7k/8jBs+KrKo8R4iQGr3EzHCi4chJyjOBMUya40Hd0GB5mwOnol9V223 pDqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=NgGPAghp; 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 p15-20020a170906604f00b0072f38ecf74asi5486381ejj.794.2022.07.30.07.09.15; Sat, 30 Jul 2022 07:09:15 -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=NgGPAghp; 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 E3A4F68BA50; Sat, 30 Jul 2022 17:09:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f50.google.com (mail-vs1-f50.google.com [209.85.217.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 38B0168B9F9 for ; Sat, 30 Jul 2022 17:08:54 +0300 (EEST) Received: by mail-vs1-f50.google.com with SMTP id d187so7125312vsd.10 for ; Sat, 30 Jul 2022 07:08:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=N8PRTUmn43ixYM9NeiDmXkkri68DNbAgAWyTDFJL6/U=; b=NgGPAghpDffvvix05+Sch/Rn6lRpEJp92x5GuI5QA6DktO1e5DaFNX6XK8V3P/oIWb Z8NZY4Q4WjmHkCSTVKX0a25lMGklfEyMA3al8a2SWl8M9iwp/DYwiCt6MjM4DIPTIOpJ xMswl7FbwWcXXtDTewLHb5hb/yw/vhbDcta3I55Z9iP9pdPNBy6nPY5xAswuBJeV1wlT KgQWr4Y3anLNl1wP3s+7Elq0/PkRBwcf/aS2bUFOcEBTfF0JSj7VKE5LVb0HCIIm3pqE SfxeUv3aR5iQ9HQAUoWyEjd2syYhOhka5ttgg5bzLue/Zxbdh4yXe9ybk9AuLPh2r8v7 UZMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=N8PRTUmn43ixYM9NeiDmXkkri68DNbAgAWyTDFJL6/U=; b=5m2kLa9udGdvXMaUqOKT99mhPtFvhkt9J6fHM873x/R94FUG7Lv4Hv0IRt+vTRUzDH 7UYRfZUe+vzeL4WH/t7C9xWfDqiSPz1EoP1BM6Up0uTEk1jou9v+Z2PoCWGqJ5eqomPU PC1jU828CxgarrHAtm/w/C+dm43lDntjWCcqxI7p3VIiTSJU/HlETxBV+WetXJsw02// 2+m0zSQ/lPmw9vBpyrCq/TGn4oFau4088Dt5QTQcAHxXflMvUWU1xiHthpJojassgoJI UbCI5klZrmRlnrWPhTvMqPkJrB0PxbkIjWuFc5sgafP8L4z8/Rl7C+ZaD9jUzOggJ+D8 gR3Q== X-Gm-Message-State: ACgBeo2zcLWmnvDCUUma664vzdH6QFlnXNzqCS7rlSKRyrq4RBHmsD/j bMSsNIJVanX0+/N5VvXxdX15m3hAZ4s= X-Received: by 2002:a67:d78f:0:b0:375:3450:a71b with SMTP id q15-20020a67d78f000000b003753450a71bmr1137945vsj.69.1659190131998; Sat, 30 Jul 2022 07:08:51 -0700 (PDT) Received: from localhost.localdomain ([186.136.131.204]) by smtp.gmail.com with ESMTPSA id v4-20020a1fac04000000b00376331cac9dsm2871991vke.52.2022.07.30.07.08.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Jul 2022 07:08:51 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 Jul 2022 11:08:21 -0300 Message-Id: <20220730140821.3518-2-jamrial@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220730140821.3518-1-jamrial@gmail.com> References: <20220730140821.3518-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/aacdec_fixed: also clip samples on the second channel for stereo HE-AAC 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: Vkhky9gL9hOZ Fixes outputting silence on the second channel when decoding Parametic Stereo HE-AAC. Closes ticekt #3361. Signed-off-by: James Almer --- libavcodec/aacdec_template.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c index 4266d89c6d..cec0e4eb2f 100644 --- a/libavcodec/aacdec_template.c +++ b/libavcodec/aacdec_template.c @@ -3095,7 +3095,8 @@ static void spectral_to_sample(AACContext *ac, int samples) /* preparation for resampler */ for(j = 0; jch[0].ret[j] = (int32_t)av_clip64((int64_t)che->ch[0].ret[j]*128, INT32_MIN, INT32_MAX-0x8000)+0x8000; - if(type == TYPE_CPE) + if(type == TYPE_CPE || + (type == TYPE_SCE && ac->oc[1].m4ac.ps == 1)) che->ch[1].ret[j] = (int32_t)av_clip64((int64_t)che->ch[1].ret[j]*128, INT32_MIN, INT32_MAX-0x8000)+0x8000; } }