From patchwork Sat Feb 20 05:01:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25828 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 AE769449B5A for ; Sat, 20 Feb 2021 07:01:39 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8BF6A68A817; Sat, 20 Feb 2021 07:01:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 55DA268921B for ; Sat, 20 Feb 2021 07:01:33 +0200 (EET) Received: by mail-wr1-f44.google.com with SMTP id v15so11971664wrx.4 for ; Fri, 19 Feb 2021 21:01:33 -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 :mime-version:content-transfer-encoding; bh=YoXhAYJYQhT+9g4USDUiz6EgpuKEkZNpAj7kr7KtAzg=; b=Y29ZQrwi8JglYrZn8dER1hnqoP3UP5h4+KDOezQ2S7QvX7ZubuE10Q0Y2EK2NPtaj7 DrvCohQ1KPWCt0mTDT/gEwBIg/wvPzKieowcYC5LkbzEcLQqH+m1Zyf0WOrvwjwy9HGR 2Klk1Jn/EjlIXt/A67uLA82JrRXbGaCWAMd7orceNvq+O3HgmX9eGIptqEoXIohRZsXS w11Nk8nAqAb6yIEDgI82+jlNCyD4vi8i3RZpk3mvUZI4zHh86IswDFs4yR6GzTy+RCKT 4e5vO4B8vAjT5u/GtejG7YUx5Hq/B+q91B45NjuktQWUzynUgi8qKIUW7Pu4jaUv8spP lDxQ== 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=YoXhAYJYQhT+9g4USDUiz6EgpuKEkZNpAj7kr7KtAzg=; b=PBqumI5+3EsIZ0/VMXxbAxap1JgKyVwsCrqVzqE3WI9TxFp7K1cDdKsXzs+uJDlAiu 95pdEklNx5LFVnF35znpK2VpF4DVWHRuF9h2cBigc/8kVkQDwGGOD99/iLMs/XET2SA1 /cxR/i3+oQfOqkh9wsd6Zjta2W1CoODceZelThsctD24JZ+yKNaGBtFnUiiP5g3eT8Vb kcgY/IJJ2GICTEJHHl9ymoSvALgv8TswejbtjLPB54YFwOuMeCYX+TRMERZqmOL8GSyS D3G7Wnf5P5bP2neYswrvuHFl7RRCDsENgkN+9G7skdstDCA0E4udaBZgfb1o5ScNnEp9 OMLQ== X-Gm-Message-State: AOAM533O67K76A5qT6WSOT6HcaM2YWI/K977k0oYUL9SA58Zo9cI98l7 qkaN0zMk2s2GMc4BOE2ivRz6c9bkklw= X-Google-Smtp-Source: ABdhPJzreSCAhz2VRK0gTJtrNXQD6si72aDl7pPYgrV+lLtbh4lglV+K7pfIXV+ufoCUxBS5OyFrjA== X-Received: by 2002:adf:e802:: with SMTP id o2mr12001791wrm.133.1613797292654; Fri, 19 Feb 2021 21:01:32 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id g18sm4074893wmh.17.2021.02.19.21.01.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Feb 2021 21:01:32 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 20 Feb 2021 06:01:07 +0100 Message-Id: <20210220050107.2572205-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210218034214.2090223-1-andreas.rheinhardt@gmail.com> References: <20210218034214.2090223-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 32/32] avcodec/dirac_vlc: Make ff_dirac_golomb_lut static 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" Only used here. Signed-off-by: Andreas Rheinhardt --- libavcodec/dirac_vlc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/dirac_vlc.c b/libavcodec/dirac_vlc.c index 2c07440df0..c5a0371dae 100644 --- a/libavcodec/dirac_vlc.c +++ b/libavcodec/dirac_vlc.c @@ -45,7 +45,7 @@ typedef struct LUTState { uint16_t state; /* Expected state for the next byte */ } LUTState; -const DECLARE_ALIGNED(32, LUTState, ff_dirac_golomb_lut)[1024] = { +static const DECLARE_ALIGNED(32, LUTState, dirac_golomb_lut)[1024] = { { +16, 0, 0, 0, 0, 5, +1, 0, 0, STATE_FOLLOW }, { +17, 0, 0, 0, 0, 5, +1, 0, 0, STATE_FOLLOW }, { +8, 0, 0, 0, 0, 4, +1, 1, 0, STATE_START }, @@ -1089,13 +1089,13 @@ const DECLARE_ALIGNED(32, LUTState, ff_dirac_golomb_lut)[1024] = { dst += lut.num; \ if (dst >= last) \ return coeffs; \ - lut = ff_dirac_golomb_lut[lut.state + *buf++]; \ + lut = dirac_golomb_lut[lut.state + *buf++]; \ } while (0) int ff_dirac_golomb_read_16bit(const uint8_t *buf, int bytes, uint8_t *_dst, int coeffs) { - LUTState lut = ff_dirac_golomb_lut[*buf++]; + LUTState lut = dirac_golomb_lut[*buf++]; int16_t *dst = (int16_t *)_dst, *last = dst + coeffs; uint16_t val = 0; @@ -1115,7 +1115,7 @@ int ff_dirac_golomb_read_16bit(const uint8_t *buf, int bytes, int ff_dirac_golomb_read_32bit(const uint8_t *buf, int bytes, uint8_t *_dst, int coeffs) { - LUTState lut = ff_dirac_golomb_lut[*buf++]; + LUTState lut = dirac_golomb_lut[*buf++]; int32_t *dst = (int32_t *)_dst, *last = dst + coeffs; uint32_t val = 0;