From patchwork Tue Oct 24 15:04:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 44347 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1b28:b0:15d:8365:d4b8 with SMTP id ch40csp2122604pzb; Tue, 24 Oct 2023 08:05:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHat3V4TUp8mp7DvLF3LczSawm9NvNmuBhXRC7TX6a4nwPjl/iDOyU2hAHcykFjykup8jF0 X-Received: by 2002:a50:8d11:0:b0:53e:8c4c:ab3e with SMTP id s17-20020a508d11000000b0053e8c4cab3emr9582882eds.19.1698159905535; Tue, 24 Oct 2023 08:05:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698159905; cv=none; d=google.com; s=arc-20160816; b=jf0RIEyRT06eC6N2gyb4NlBNeNatFT/1xh5dL0Rs49c8gzRoRmhLdhPYfYjUTJodhw IySI12q66uRpOiEuJbT44bn9ug+5jGfTot+upmGCzMZC5zDG7m0EwQ8VoNVGOc6og+Gf b3G3zYapbIO/t1wGdWo+itkjfWaVVrIYsqc2Az6UKnE+5ZSzQTwkxgbNgWzAInjcPQxg K2u8LdA9g//w8v3oO1a725FKnotqc8L62uvnBoGOmH8+rfDt932kDVhnQLwPz3BqVFS2 HqQODtYzNVZbAPtLa3d/h7TDieQ2shZ70x4/Y+3wYLF/s89DVYBzg7SVw0VqwjbQW3OM CZWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=1pH+LRLOp+DS3CwoPIuwjp0eyNuwyMxjDPiCBCJFG/A=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=ZsqSitH++D4E9VFACp8wvDJKNitcOxQGYD/HNewaT7Cgr1pCRVcqAS7GOZg4DnjBaG ejmKXTCDeoPvbNf8z+sv8eQHE3bJKIx1ZyEFK2Yk3tKPkxLuM0lWVy/cr1zDzSczwWpI FhuhLjTfZW0QkySTi4BOIAx7Zntpssie6v6SbX3Kpopqve5njmR+nwZByD6QOm+AOBHy RTwsIMBlsZbTFXz9x3EjFy4QUhLnSI6jhsxO4vHNAX5kdvj9dp/WCjh+Ai+CA32AMu/+ 1qg9qf9ysiVzxCjN1j2qtayjLg1Z4r/rXfFwp26Z8mUhw5+U3E/Xg/+c6d/c8S4YdRWM w19w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z4-20020a05640240c400b0053ee70d12a5si4660315edb.340.2023.10.24.08.04.55; Tue, 24 Oct 2023 08:05:05 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BD74068C9D6; Tue, 24 Oct 2023 18:04:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7431B68C3E2 for ; Tue, 24 Oct 2023 18:04:44 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id CC900FF81D for ; Tue, 24 Oct 2023 15:04:43 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 24 Oct 2023 17:04:40 +0200 Message-Id: <20231024150443.7438-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/magicyuv: Use a compile time constant for vlc_bits X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: iEIAFZSa5ADu This will permit further optimizations Signed-off-by: Michael Niedermayer --- libavcodec/magicyuv.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/magicyuv.c b/libavcodec/magicyuv.c index 4a143cdbbf7..78d7f44cd65 100644 --- a/libavcodec/magicyuv.c +++ b/libavcodec/magicyuv.c @@ -124,13 +124,13 @@ static void magicyuv_median_pred16(uint16_t *dst, const uint16_t *src1, x = 0; \ for (; x < width-c && get_bits_left(&gb) > 0;) {\ ret = get_vlc_multi(&gb, (uint8_t *)dst + x * b, multi, \ - vlc, vlc_bits, 3); \ + vlc, VLC_BITS, 3); \ if (ret <= 0) \ return AVERROR_INVALIDDATA; \ x += ret; \ } \ for (; x < width && get_bits_left(&gb) > 0; x++) \ - dst[x] = get_vlc2(&gb, vlc, vlc_bits, 3); \ + dst[x] = get_vlc2(&gb, vlc, VLC_BITS, 3); \ dst += stride; \ } @@ -155,7 +155,6 @@ static int magy_decode_slice10(AVCodecContext *avctx, void *tdata, ptrdiff_t stride = p->linesize[i] / 2; const VLC_MULTI_ELEM *const multi = s->multi[i].table; const VLCElem *const vlc = s->vlc[i].table; - const int vlc_bits = s->vlc[i].bits; int flags, pred; int ret = init_get_bits8(&gb, s->buf + s->slices[i][j].start, s->slices[i][j].size);