From patchwork Fri Oct 23 20:54:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23186 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 3FDB044B5CA for ; Fri, 23 Oct 2020 23:55:33 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 20CD168A0C3; Fri, 23 Oct 2020 23:55:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0B469680932 for ; Fri, 23 Oct 2020 23:55:26 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id a72so3193367wme.5 for ; Fri, 23 Oct 2020 13:55:26 -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=hbeh8olRGaiDp0xbVCrtAntWzsAOdX+1OV5nl5HPTuw=; b=sSmP/8uBjmXMoo7W8SttuDyMRL1cmdJvzetPDR1pN6FsBW08QNbChwuCWoukH+SR+Z SwlREsu4NnUFggWOG5C5e/hjVIUjz72w58ZbrOF1h/8o7saSW+lAOSY32JaUBqmNsnt6 WikeJztT2b+L6Z/YKUy/6+aSEV74WNZc1veLpw13U/76Gdlk+3nYYDoZ0SVQCeQfndT4 CADcbtqnDgGtSbsPy/aSMNhjO+U77DMkl9fdM9hotte8E9j+Rl/CHp3mlnXb8TINCBOc FK7qIS9BfRuQAjeMtJEJqYc67xr2tdLIDgmintynD3wZTU8mlR0JRfsACiiIM9dfFHti uwKg== 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=hbeh8olRGaiDp0xbVCrtAntWzsAOdX+1OV5nl5HPTuw=; b=Vesdmo4+b7XMMOUuqvR5B9xOCHJ8ng3fyTAVt2m1eT0W75j5tZ5iEsMBVKEpikOO9H low3YxaIIkoquGtxe/aM1w1C48YXoCnNVQFNlcaxlVKxqwtn46mWTaRC1ZssmbL3mNIu TdyX4TjlXvuC72HDd2UPH2Sy60fIHqi4Dp8OSuDNh9qiED5H+bvIrmly7a1zPzTBwyKb Fi0ng9Imj+yItu/o2iqqCjz78AGdgaJurdxq17f15Ivzuj7HmOOGM4zlBOoKjXfb83w/ 7soKUOsVdKFDhlHYiK80lr5beWfAeTe261kgZYIj1DZMWjFe+vcpilLoq2Vpgs/chNXv zmrg== X-Gm-Message-State: AOAM531M9BhOGGjBcWMBe6L4JLBTF+8DmRiWUzu+ex71/RGB3Z315oUH p6OJFPWem3xxSwhP7ifcSLNIF2ypKpQ= X-Google-Smtp-Source: ABdhPJxmzTwcKJjnRa+kry32onSpkKLn1zF8VoBFt1tD+tbC3XeEGkkBCgStMFEFT8MRySGk5PUWrw== X-Received: by 2002:a1c:7214:: with SMTP id n20mr4093072wmc.93.1603486525261; Fri, 23 Oct 2020 13:55:25 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id z6sm5153350wmi.28.2020.10.23.13.55.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Oct 2020 13:55:24 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Oct 2020 22:54:52 +0200 Message-Id: <20201023205454.851696-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201023205454.851696-1-andreas.rheinhardt@gmail.com> References: <20201023205454.851696-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/imc: 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/imc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/imc.c b/libavcodec/imc.c index 6766d53643..70ad5b1dbd 100644 --- a/libavcodec/imc.c +++ b/libavcodec/imc.c @@ -110,6 +110,7 @@ typedef struct IMCContext { static VLC huffman_vlc[4][4]; +#define IMC_VLC_BITS 9 #define VLC_TABLES_SIZE 9512 static const int vlc_offsets[17] = { @@ -238,7 +239,7 @@ static av_cold int imc_decode_init(AVCodecContext *avctx) for (j = 0; j < 4; j++) { huffman_vlc[i][j].table = &vlc_tables[vlc_offsets[i * 4 + j]]; huffman_vlc[i][j].table_allocated = vlc_offsets[i * 4 + j + 1] - vlc_offsets[i * 4 + j]; - init_vlc(&huffman_vlc[i][j], 9, imc_huffman_sizes[i], + init_vlc(&huffman_vlc[i][j], IMC_VLC_BITS, imc_huffman_sizes[i], imc_huffman_lens[i][j], 1, 1, imc_huffman_bits[i][j], 2, 2, INIT_VLC_USE_NEW_STATIC); } @@ -348,7 +349,7 @@ static void imc_read_level_coeffs(IMCContext *q, int stream_format_code, levlCoeffs[0] = get_bits(&q->gb, 7); for (i = start; i < BANDS; i++) { levlCoeffs[i] = get_vlc2(&q->gb, hufftab[cb_sel[i]]->table, - hufftab[cb_sel[i]]->bits, 2); + IMC_VLC_BITS, 2); if (levlCoeffs[i] == 17) levlCoeffs[i] += get_bits(&q->gb, 4); }