From patchwork Fri Nov 20 07:18:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23773 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 D8059449F1B for ; Fri, 20 Nov 2020 09:28:37 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 45D5268BA1D; Fri, 20 Nov 2020 09:24:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f67.google.com (mail-ej1-f67.google.com [209.85.218.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A35E168B9C1 for ; Fri, 20 Nov 2020 09:24:34 +0200 (EET) Received: by mail-ej1-f67.google.com with SMTP id f20so11490588ejz.4 for ; Thu, 19 Nov 2020 23:24:34 -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=0hZK3Eh6zLJJ1R1ZMdyA2cs4YzGrGjCaDFM4y4PtXcc=; b=gwSf2byWZjg4uJsdrh0QZhxV9l2gzdjFveT59d7z/Sl9kPADCSBsM82jJ0w2WX5WXE zoyp2tcJ+91iwZVRRmdt46K68wBE82qze46+Lqjht6O9c/sZm6raQzTVi2WMWZjvgH1n 2mrCgyJrDVxPiYWnhUON6I6Ten9b90SOESlK0fMoYSdnaX3TTFkpTRL5hdSN8kVIQ1iL lRIBINDjOTpRRNZgqpKtMLMcvb6d5FVQXAi8JKRQPsJjdxAlcG2H69EN/TvXGzL9Vd/H /QP4YUKCAPIie8gTxGi8CoqMmRwvsldkHsBO5ktyvvhHNL4Kua4v+DTfkil1vDPSpNrC JaQg== 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=0hZK3Eh6zLJJ1R1ZMdyA2cs4YzGrGjCaDFM4y4PtXcc=; b=HeTS3zB/6n3RlcEjGDZERJcAuirUFzMTYsJ4QceTXrDAZJOhhEOSo5r1ePV8rrZwRw tPpm7QvPdqy83w0v024CtAAwBjOm6qSXdJKJl1efB5CDLKj26a9Dp0IwSyliKHyy3gSN GjsM2JCq2WPNWKiBsn4Ayt3kDJh1Ffi+26/ZekmXmQljmADAEEtbgSyUwj+ItopGRUH+ WhKBF/LpRjS8IOxbOitx4I8cLCLyHJuoAYgG0NYemz7fBXgBc+JNjKLVRL4+WFF83J+Z XXdKl0lE5qLQBMgwIfYwJLAPRCb7hAOLSjtNpnrgM5j64ILuCrkYi1feN3YBCbnZIS7O AeiQ== X-Gm-Message-State: AOAM530yHaRV08TGDZdYO3qp8OK+LAzKWOpPJL2/TaUl+/8AgOJAAWfC gnmKV9AioAdLr9EcJRG+DHYEL4muye5SSw== X-Google-Smtp-Source: ABdhPJzs6fp2ySuyCXmUiY8NIMzYJSVAm8eCg/BlWFvqvX6xT3pJv6Eo5I4CjZ9O4FtR9io0imRlSg== X-Received: by 2002:a17:906:7d1:: with SMTP id m17mr31860164ejc.98.1605857073808; Thu, 19 Nov 2020 23:24:33 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id lz27sm779419ejb.39.2020.11.19.23.24.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2020 23:24:33 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Nov 2020 08:18:57 +0100 Message-Id: <20201120072116.818090-25-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 024/162] avcodec/wnv1: Apply offset during init, not later every time 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/wnv1.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/wnv1.c b/libavcodec/wnv1.c index f8a9b94746..7dd0e72596 100644 --- a/libavcodec/wnv1.c +++ b/libavcodec/wnv1.c @@ -43,10 +43,10 @@ static inline int wnv1_get_code(GetBitContext *gb, int shift, int base_value) { int v = get_vlc2(gb, code_vlc.table, CODE_VLC_BITS, 1); - if (v == 15) + if (v == 8) return get_bits(gb, 8 - shift) << shift; else - return base_value + ((v - 7U) << shift); + return base_value + v * (1 << shift); } static int decode_frame(AVCodecContext *avctx, @@ -119,7 +119,7 @@ static av_cold int decode_init(AVCodecContext *avctx) INIT_VLC_STATIC_FROM_LENGTHS(&code_vlc, CODE_VLC_BITS, 16, &code_tab[0][1], 2, &code_tab[0][0], 2, 1, - 0, INIT_VLC_OUTPUT_LE, 1 << CODE_VLC_BITS); + -7, INIT_VLC_OUTPUT_LE, 1 << CODE_VLC_BITS); return 0; }