From patchwork Wed Jun 17 21:45:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: t X-Patchwork-Id: 20444 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 EC4B544B402 for ; Thu, 18 Jun 2020 00:51:42 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D22BF68B5FE; Thu, 18 Jun 2020 00:51:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f66.google.com (mail-pj1-f66.google.com [209.85.216.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D6F3E68B584 for ; Thu, 18 Jun 2020 00:51:35 +0300 (EEST) Received: by mail-pj1-f66.google.com with SMTP id k2so1603306pjs.2 for ; Wed, 17 Jun 2020 14:51:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9D40cBLx1U1v/cOzLWKIaONbPmv03k9uSe4BZxIGsRg=; b=WxT0Q75I3wjm4xBIyGJTDTGCNeDJ/17jvNHqQtRrGT6goeYdNiLH6YOeMMpMWtOW6F dTa8cyLTl9Vav0tEkROVS7l6y448HiDs1Geth1jbTHOoreiVRQpdtPP72ra8XxwygW0G giI4+ZWZhs/su6KIVVpZA8BfrmWfVH6zk7FyuQm4Q+zHH+C5gQS0rvhB163wScUybClB 3u3RP/4edh5cwxW+DpdWaDKYDd8SADJ32c1Z5obbE2D0Z3EGw08KurI5NYS2Qn9IY/CR +uRU4x7m3BC03vKZ2B/JFVKn/QMhsaEunAWY3nnR3HKRPPfTeBPQ2pRVwZ2vKLs8miuO 3RwQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=9D40cBLx1U1v/cOzLWKIaONbPmv03k9uSe4BZxIGsRg=; b=Zb+jI9qdNlwQAuKIw07Y46T2xNHSLr7ri7yaVyQ1SBZpbPxGfwZQAFWnEXh8X/35JE ggP3uZkRRtRyT4kMiF96N4e/hcypCGMhsmRl/4svIxZeU3sBEyEkvdb+zXP8ZLLRRaGi tOB9Pu4V8Yi9uqB5aDhu2c9vF95ud83Ot1ICx0ldcjewEp+QmzI8E7ikmGSiOi+o/RUH 0u2m//jp5nJ8Dp/a1EGyhSmzvjNheENlxKRaJE9QhKLbWACV2tE8zL+8J3ihzQVoGiSB sygGYDmPUdn2+vDoSHepupOea0qodEvESUjjK/djVhcJuV8Mlbnfu24YQoMrqdzPjcRn D5kg== X-Gm-Message-State: AOAM533dj0+4hJG98rhPpCuK1595dfcFL6AxEzCgyRP/WtIuGwlIP1lZ EhHbb6mChtiDBnhaKzWFXIqtrH8lIVI= X-Google-Smtp-Source: ABdhPJzyLNKdJ34Uax12yA775JWGwHbLtvbFtjU1ZKLdaIbj0TAeyP1sKiAuo3kvbuB9iE2Ot2Q1Gg== X-Received: by 2002:a17:902:fe01:: with SMTP id g1mr1002388plj.254.1592430346135; Wed, 17 Jun 2020 14:45:46 -0700 (PDT) Received: from localhost.localdomain (d154-20-31-151.bchsia.telus.net. [154.20.31.151]) by smtp.gmail.com with ESMTPSA id c2sm749162pfi.71.2020.06.17.14.45.45 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Jun 2020 14:45:45 -0700 (PDT) From: t To: ffmpeg-devel@ffmpeg.org Date: Wed, 17 Jun 2020 14:45:07 -0700 Message-Id: <20200617214507.44381-2-summertriangle.dev@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200617214507.44381-1-summertriangle.dev@gmail.com> References: <20200617214507.44381-1-summertriangle.dev@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/hcadec: get intensity from correct channel 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: t Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes an issue with one output channel being slightly louder than the other. The output now matches other public HCA decoders. Signed-off-by: t --- libavcodec/hcadec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/hcadec.c b/libavcodec/hcadec.c index a890e75a13..28e7d07cec 100644 --- a/libavcodec/hcadec.c +++ b/libavcodec/hcadec.c @@ -263,7 +263,7 @@ static void apply_intensity_stereo(HCAContext *s, ChannelContext *ch1, ChannelCo int index, unsigned band_count, unsigned base_band_count, unsigned stereo_band_count) { - float ratio_l = intensity_ratio_table[ch1->intensity[index]]; + float ratio_l = intensity_ratio_table[ch2->intensity[index]]; float ratio_r = ratio_l - 2.0f; float *c1 = &ch1->imdct_in[base_band_count]; float *c2 = &ch2->imdct_in[base_band_count];