From patchwork Fri Sep 8 08:15:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Gisquet X-Patchwork-Id: 43656 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e27:b0:149:dfde:5c0a with SMTP id gk39csp324751pzb; Fri, 8 Sep 2023 01:16:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGY5aq7VYM1VXB70KqyGE6prb6dXSzKl+rjqA5NZxM8FoBaqRLrsGPV0iP/8Xg0rbCaI5yn X-Received: by 2002:ac2:4f09:0:b0:501:2071:6784 with SMTP id k9-20020ac24f09000000b0050120716784mr1765733lfr.10.1694160960851; Fri, 08 Sep 2023 01:16:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694160960; cv=none; d=google.com; s=arc-20160816; b=J8M2iM1DLbmzcbZzu+BoDztsjNfdutzQRqBgR2NrMOD1CnTrKqbTYV8lDo8vGpP72W 0FzXfFRP2soIH+5cYu8mQQbYLfKRoexWtRzosKSCBx6NnL2bSaIlKLIquejg0+9Yvxju 4+a2WgzuF26USZ/fachAAiSZUoNY7somERtdcDm/X8K7ceYfFc95fzxHb0RQ+wBtQDHx onVgkcrRrMoitpvXJn2NgbyXzBN/3T/legN2nDyaX0lSewekt3Ni1uK74LrVtufOI9UC cYha+joMbHY4QyzDrpdiyK6uuN2gL8ZIO4ZhmN/XIQzxNek9SyjFnfuv7LSyFAX6VYV3 B4uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=/45aoR6i08T6xruAMlPc6pvFRQPbmnqoRv/CkGDDfQk=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=xHJDolDXH0VmwvHh608OPONQx/cQxNED69tl8+aKVoUrR3eLhgvBewEpVvQ13y/Ble OyPK+UVar3MHrN8W/MbAl39nhdX5kDF/sulxXW56j0DWMse4DlHC5C7BTHE4R8A238FM IiENclTwS0/XLcy2TOVWvrbw/NM8/jbVj97aAwYrU/46FMYX4ROiXQChUeBelogFfJKr Iheq3eDoYKP12iXZnS1cROTZrBdsvnSTm8pd4ZFLIYAJ3PuKNXZQLO2PK7jbi2fv1AfF O9VYnx9arxrMy4zWCttfEdg/ubNRx1mmqX8JbUK+VnVOoc/WxUssbepSzU8mB4Rmj3VF qYYg== 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q5-20020aa7cc05000000b005233ded4188si1021937edt.432.2023.09.08.01.16.00; Fri, 08 Sep 2023 01:16:00 -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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E4E8F68C894; Fri, 8 Sep 2023 11:15:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtp1-g21.free.fr (unknown [212.27.42.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7EEDC68C7D9 for ; Fri, 8 Sep 2023 11:15:21 +0300 (EEST) Received: from localhost.localdomain (unknown [IPv6:2a01:e0a:8a7:6440:5540:d7b2:7ae2:c181]) (Authenticated sender: christophe.gisquet@free.fr) by smtp1-g21.free.fr (Postfix) with ESMTPSA id 2270EB00571 for ; Fri, 8 Sep 2023 10:15:20 +0200 (CEST) From: Christophe Gisquet To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Sep 2023 10:15:05 +0200 Message-ID: <20230908081508.510-4-christophe.gisquet@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230908081508.510-1-christophe.gisquet@gmail.com> References: <20230908081508.510-1-christophe.gisquet@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/7] proresdec2: offset VLCs by 1 to avoid 1 add 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: d/U83E76r4p8 Pretty harmless, but not much gained either. --- libavcodec/proresdec2.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavcodec/proresdec2.c b/libavcodec/proresdec2.c index 91c689d9ef..e3cef402d7 100644 --- a/libavcodec/proresdec2.c +++ b/libavcodec/proresdec2.c @@ -152,7 +152,9 @@ static av_cold void init_vlcs(void) switch_val = (switch_bits+1) << rice_order; // Values are actually transformed, but this is more a wrapping - for (ac = 0; ac <1< max_bits) max_bits = bits; - ac_bits [ac] = bits; - ac_codes[ac] = code; + ac_bits [ac+1] = bits; + ac_codes[ac+1] = code; } ff_free_vlc(ac_vlc+i); @@ -609,7 +611,6 @@ static av_always_inline int decode_ac_coeffs(AVCodecContext *avctx, GetBitContex } level = get_vlc2(gb, tbl->table, PRORES_LEV_BITS, 3); - level += 1; i = pos >> log2_block_count;