From patchwork Tue Nov 10 10:47:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23496 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 8493344B3FF for ; Tue, 10 Nov 2020 12:55:11 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 45B0868BE52; Tue, 10 Nov 2020 12:49:58 +0200 (EET) 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 E3C7268BE0D for ; Tue, 10 Nov 2020 12:49:45 +0200 (EET) Received: by mail-wr1-f67.google.com with SMTP id o15so4302370wru.6 for ; Tue, 10 Nov 2020 02:49:45 -0800 (PST) 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:reply-to :mime-version:content-transfer-encoding; bh=k9rBlqICthceAUn3PBSWw4sp1ueSf26cOCwYO7tZXCU=; b=qOvSg0d8wHJ774sv7t838gl2kcbE/KVnFkM072ZxO/KMkNDB/tFcIIrL91+Co9g3X5 gvX0/FjUoDtWc+cByvsphBGqewwo2zbsQyeDJiOx8nTIbjmpH7rpEpUIdTHVs4Vt+mh+ CVZqg+YZ84djqQQAW2VYStnl5+l801EGcsajg1foBZBk5mnxyN4CTJ9hhHWQEyMwu6bJ /0KYYuOmDQCC5q26sL8WcLiey9a6OrUAajqh41EdxYAvTVztKCnNIAWLKf+w8TOk4UAC 2toMdjxoqOu8aW7r+yZC8EomtADvcQ2zvxs1P/Csq8hJIX3LNI6yDWoyR2n1Fca0TOd/ +hkA== 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:reply-to:mime-version:content-transfer-encoding; bh=k9rBlqICthceAUn3PBSWw4sp1ueSf26cOCwYO7tZXCU=; b=XYbJ4uVIz+JqI6K86JZBzCnvLy8QBwDCXRjqLRjAFMbf4B4mkfFVWa/sGkWdCSG84E HoGubw2MwKP5mCvOVTEYJuABsFgySvmocL8DAgUCMjlg+Trfl3tt8NZLDCZ4abMJUiot bOyJH2+opJat5KYo7lB1Z9xZuwNAvpYqmHk5hVLyHyOGZ7/6+87g8WoVRCmQOeT5+9J3 KgNy6UQUX/8m9CkgR0fJwuV7a8TTZ17APwmoXhJ2NK+UCHNyvaa4SI9saghC/aD83iSi m65llQiOl01/VHg9bHWG3gjEj6MRVHGlaRGpOA/krOAkzWeVbfgjIgVfGzgZ0tz2DBtX DG4A== X-Gm-Message-State: AOAM531ukGLq8SDg3Vy6neu5uiCxif+sao0JwN4c4pIK1vEEutqxvueF W4GNUKMXMomDi7Nw1UEZswJAUgYbbNE= X-Google-Smtp-Source: ABdhPJy0FzNooE4+EgCJzgbAwR2oFd2TmEQYxIrQECuu9GxBBeUwcBaWFIqXFhEZK/fycqzaTlZeWw== X-Received: by 2002:adf:9e4c:: with SMTP id v12mr22391845wre.22.1605005385080; Tue, 10 Nov 2020 02:49:45 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id l24sm2572543wmi.7.2020.11.10.02.49.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 02:49:44 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Nov 2020 11:47:22 +0100 Message-Id: <20201110104851.321029-26-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201110104851.321029-1-andreas.rheinhardt@gmail.com> References: <20201110104851.321029-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 025/114] avcodec/cook: 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/cook.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libavcodec/cook.c b/libavcodec/cook.c index 75422d18aa..0fa42d681d 100644 --- a/libavcodec/cook.c +++ b/libavcodec/cook.c @@ -65,6 +65,9 @@ #define SUBBAND_SIZE 20 #define MAX_SUBPACKETS 5 +#define QUANT_VLC_BITS 9 +#define COUPLING_VLC_BITS 6 + typedef struct cook_gains { int *now; int *previous; @@ -210,7 +213,7 @@ static av_cold int init_cook_vlc_tables(COOKContext *q) result = 0; for (i = 0; i < 13; i++) { - result |= build_vlc(&q->envelope_quant_index[i], 9, + result |= build_vlc(&q->envelope_quant_index[i], QUANT_VLC_BITS, envelope_quant_index_huffcounts[i], envelope_quant_index_huffsyms[i], 1, -12); } @@ -224,7 +227,7 @@ static av_cold int init_cook_vlc_tables(COOKContext *q) for (i = 0; i < q->num_subpackets; i++) { if (q->subpacket[i].joint_stereo == 1) { - result |= build_vlc(&q->subpacket[i].channel_coupling, 6, + result |= build_vlc(&q->subpacket[i].channel_coupling, COUPLING_VLC_BITS, ccpl_huffcounts[q->subpacket[i].js_vlc_bits - 2], ccpl_huffsyms[q->subpacket[i].js_vlc_bits - 2], 1, 0); @@ -394,7 +397,7 @@ static int decode_envelope(COOKContext *q, COOKSubpacket *p, vlc_index = 13; // the VLC tables >13 are identical to No. 13 j = get_vlc2(&q->gb, q->envelope_quant_index[vlc_index - 1].table, - q->envelope_quant_index[vlc_index - 1].bits, 2); + QUANT_VLC_BITS, 2); quant_index_table[i] = quant_index_table[i - 1] + j; // differential encoding if (quant_index_table[i] > 63 || quant_index_table[i] < -63) { av_log(q->avctx, AV_LOG_ERROR, @@ -773,7 +776,7 @@ static int decouple_info(COOKContext *q, COOKSubpacket *p, int *decouple_tab) for (i = 0; i < length; i++) decouple_tab[start + i] = get_vlc2(&q->gb, p->channel_coupling.table, - p->channel_coupling.bits, 3); + COUPLING_VLC_BITS, 3); else for (i = 0; i < length; i++) { int v = get_bits(&q->gb, p->js_vlc_bits);