From patchwork Fri Nov 20 07:33:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23898 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 E0191449F1B for ; Fri, 20 Nov 2020 09:53:15 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 575B968BD99; Fri, 20 Nov 2020 09:35:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f68.google.com (mail-ej1-f68.google.com [209.85.218.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 12E4068BD7E for ; Fri, 20 Nov 2020 09:34:53 +0200 (EET) Received: by mail-ej1-f68.google.com with SMTP id bo9so5777167ejb.13 for ; Thu, 19 Nov 2020 23:34:53 -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=7ucOcmKFVcPewOXCLKh4air0ydHCJsbwaonjXx6AJzQ=; b=YbymncsyQXU+cLfTIe75bbdjhsGTO/2EyXs3Or3A2jdElMEZH5JjkR7SHjXXCRmDSK bn/xNSUz05hdl4Z8i20U1V30beFZ+2iqreCz9Id50rLrmqXD6VtKvF1VgH8y0zCAb2tv BC6vkwsljCl3KZHWQVuB/Jce8CKNScK1X5vC/OiQcGEHcL3RwGnYH7DHRLU8tE70dqAc /OGjb22LzrGl6MAWn69YkE89HXgUX1WZI39lwNYD2hHKo8DGfkz7w2azFvZkpNGTyskN /UUKxZTVvRiWPTiNB+KnhjpyOh5alBNAh7WBhjtFUt77zSoN7WEzqCJUIqTtXCaOUEBv 0fCg== 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=7ucOcmKFVcPewOXCLKh4air0ydHCJsbwaonjXx6AJzQ=; b=Ojruv4NzMuq1XOQYNq9uh9ZOCMrm2tEsQnbqj3aCyQwBwC7ieHWNbXOGtTBMbt+mRN UB3ylIHdxkWK1tuTD807D1d8zslJYDp4bcctdTNUBonsLkj2uW7tU5olIMNySKr/1yOj +vr0oqQFAaBWm/i3XbvmKzNbPtnuneTcheZZuSEkxjSUQTOP2SqOfN4NN2ol1aCgG2EP zGkrmm1AAJXZqegSD9zPFT4beH4HfRcA0WvX1F+bmpj8j35VOdZy7L93y3ON9nCypdbg vPOgepvbyI9cG+lX0mLrSk8YKdsEfnvcaD+LiAifUv3h6zA0lWI9Vg/p/TV2cK3wFG5r UhkA== X-Gm-Message-State: AOAM531yKpdGghNaQ9LvRndRywdP/kpsLsZf/bb4hO66ORvSTHYyu1n1 4jiuwU0wik1exJ8Vd3UA6fsmXdfZqp/7VA== X-Google-Smtp-Source: ABdhPJxdJA3e1Df2iZppu2y5ZU4W3QTdl8bVF/XYmYT3XATa/2lie9nvFX5mJYWO1vFWYaKJvVTZ+g== X-Received: by 2002:a17:906:3153:: with SMTP id e19mr5461726eje.17.1605857692260; Thu, 19 Nov 2020 23:34:52 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id i13sm769110ejv.84.2020.11.19.23.34.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2020 23:34:51 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Nov 2020 08:33:12 +0100 Message-Id: <20201120073327.820745-48-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201120072116.818090-1-andreas.rheinhardt@gmail.com> References: <20201120072116.818090-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 147/162] avcodec/imm4: 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/imm4.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavcodec/imm4.c b/libavcodec/imm4.c index cee8e39773..4cbafffd9d 100644 --- a/libavcodec/imm4.c +++ b/libavcodec/imm4.c @@ -34,6 +34,7 @@ #include "internal.h" #define CBPLO_VLC_BITS 6 +#define CBPHI_VLC_BITS 6 #define BLKTYPE_VLC_BITS 9 #define BLOCK_VLC_BITS 12 @@ -116,7 +117,7 @@ static int get_cbphi(GetBitContext *gb, int x) { int value; - value = get_vlc2(gb, cbphi_tab.table, cbphi_tab.bits, 1); + value = get_vlc2(gb, cbphi_tab.table, CBPHI_VLC_BITS, 1); if (value < 0) return AVERROR_INVALIDDATA; @@ -133,7 +134,7 @@ static int decode_block(AVCodecContext *avctx, GetBitContext *gb, for (i = !flag; i < 64; i++) { int value; - value = get_vlc2(gb, block_tab.table, block_tab.bits, 1); + value = get_vlc2(gb, block_tab.table, BLOCK_VLC_BITS, 1); if (value < 0) return AVERROR_INVALIDDATA; if (value == 0) { @@ -286,7 +287,7 @@ static int decode_inter(AVCodecContext *avctx, GetBitContext *gb, continue; } - value = get_vlc2(gb, blktype_tab.table, blktype_tab.bits, 1); + value = get_vlc2(gb, blktype_tab.table, BLKTYPE_VLC_BITS, 1); if (value < 0) return AVERROR_INVALIDDATA; @@ -478,7 +479,7 @@ static av_cold void imm4_init_static_data(void) &cbplo[0][1], 2, &cbplo[0][0], 2, 1, 0, 0, 1 << CBPLO_VLC_BITS); - INIT_VLC_SPARSE_STATIC(&cbphi_tab, 6, FF_ARRAY_ELEMS(cbphi_bits), + INIT_VLC_SPARSE_STATIC(&cbphi_tab, CBPHI_VLC_BITS, FF_ARRAY_ELEMS(cbphi_bits), cbphi_bits, 1, 1, cbphi_codes, 1, 1, NULL, 0, 0, 64); INIT_VLC_STATIC_FROM_LENGTHS(&blktype_tab, BLKTYPE_VLC_BITS, FF_ARRAY_ELEMS(blktype),