From patchwork Fri Oct 23 10:12:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23169 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 29F6744B156 for ; Fri, 23 Oct 2020 13:12:43 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1549968A912; Fri, 23 Oct 2020 13:12:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D5CF168A2B6 for ; Fri, 23 Oct 2020 13:12:36 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id b8so1191380wrn.0 for ; Fri, 23 Oct 2020 03:12:36 -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=BO80rg6IhGVa6dO/i72PSElaIe+KNGHzGwM+Y8dT1Kg=; b=tEtRqfaOWftDaYRWfmBWMVQUKUbr/sgovG0vM+vcwvSgfZjlsdooyB5YZgbrK/WBTt a50fkxVPKfMpwJESjIxdi1Z61YxThrCNws5GZdk10tX9CQz+j+jd5R7VNXvmBEJ61wGt L8DbMJq/pB/fnI/Izqw6qzG7gO6d592Ym+h2kZ2nP7G+ykJiE+ARwsLudCjNLqdaOoMn TiiNpCsfIaWUtsyW8fD4DYkwVKpgaxrkpgVLSYqDGoXeBahA3+j23yXMhmkPnG4LlnAf cR3Sc8laAPLSmsKsBnsIj97DPTxKaRJTU1qcqsk0A7ULrqIqP5yd7BOcP/iQ+Tt6hUmW ky+w== 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=BO80rg6IhGVa6dO/i72PSElaIe+KNGHzGwM+Y8dT1Kg=; b=n+nGr/kdziwfkaIG8EO4UxkHdWW5gVfvj5VUt1ZHVGqrwM2+YPGGdNXKe8tZ8YhUZb Pd6cHo/G2Pvv7h6ikElzx4RxrE+JeUqvHQRe09CipDi5H+cUhr/JsfD9mxZXg+q2LQor rINDyYAQbZohqbJBMcHd878dBuT1OojyRyw2Hl22+okyedRwOvsp1Jb2mnCKw/h+3XRz AfQ5nO8t9GXBxztfhqJWlGHYw5CwtZeLPFavB6QteGdFT0Pca0glSMxW8+XCjsWxFylZ Q3uM9EJjNSzIUvj63f/tRcO9xLDAWHhBRDWUCe12oi0SYq9BTdOLmFI3yiAwJt2DAGPx 3e1w== X-Gm-Message-State: AOAM531fAcIEHMDcolvbSNTHOlbYV3+omeFiW90v4GCkxxRfHzEgX/uh XAP0cMQR3nxRyqEOLrIFMFTmvyCHrVc= X-Google-Smtp-Source: ABdhPJwqKRHrLZHrBRyxB3dRrNLhnZuj7pZI7kUf/9Sw/+cGuJa5rayi7C8B+3uKMd5ve+5C0VvAyg== X-Received: by 2002:a5d:688c:: with SMTP id h12mr1894700wru.92.1603447956108; Fri, 23 Oct 2020 03:12:36 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id c130sm2515263wma.1.2020.10.23.03.12.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Oct 2020 03:12:35 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Oct 2020 12:12:03 +0200 Message-Id: <20201023101204.760326-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201023101204.760326-1-andreas.rheinhardt@gmail.com> References: <20201023101204.760326-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/atrac3: Inline constants 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavcodec/atrac3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c index 01b7f06bff..a3e7d96a65 100644 --- a/libavcodec/atrac3.c +++ b/libavcodec/atrac3.c @@ -247,7 +247,7 @@ static void read_quant_spectral_coeffs(GetBitContext *gb, int selector, if (selector != 1) { for (i = 0; i < num_codes; i++) { huff_symb = get_vlc2(gb, spectral_coeff_tab[selector-1].table, - spectral_coeff_tab[selector-1].bits, 3); + ATRAC3_VLC_BITS, 3); huff_symb += 1; code = huff_symb >> 1; if (huff_symb & 1) @@ -257,7 +257,7 @@ static void read_quant_spectral_coeffs(GetBitContext *gb, int selector, } else { for (i = 0; i < num_codes; i++) { huff_symb = get_vlc2(gb, spectral_coeff_tab[selector - 1].table, - spectral_coeff_tab[selector - 1].bits, 3); + ATRAC3_VLC_BITS, 3); mantissas[i * 2 ] = mantissa_vlc_tab[huff_symb * 2 ]; mantissas[i * 2 + 1] = mantissa_vlc_tab[huff_symb * 2 + 1]; }