From patchwork Sun Oct 18 06:40:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23061 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 37C57447EE5 for ; Sun, 18 Oct 2020 09:40:50 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 20C4668B9E5; Sun, 18 Oct 2020 09:40:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3E48A6804E4 for ; Sun, 18 Oct 2020 09:40:39 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id h5so7850617wrv.7 for ; Sat, 17 Oct 2020 23:40:39 -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=DSyVeIxuEEIK0CcCD4nGyZurELcca1V42brPvHBNh6s=; b=XL/BMVfpo+cUMFHYncI4MPomqX2SiwIKd5nxL7Q3qnFsv2Qf/3N+x4s7TUrwzrEPu+ ULciCsWNryBoFUpAXw15+4ihpO5E8jFUFKwZ55lgHGMta2c/rPU+aponZjwqupJjUI4B avfS6UQ8m7tSCGeiqnSmAnDOAu6TSEJcvZIMdftEsvDbWKRdVJcK6NK9GXEeqdNgqurF 3iYVa8hdKBU7ifJU7AmoPjX+tfJt1x2PwK33W6Hmwp0zJEO43RQgOSlIxk9fd1gcstdp klGorwpByBbdvz8NY56dcicKsStHe/DSZ3zfALQM4NPrXEvRFCBhan3uY50mHcFHR8MP u/lA== 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=DSyVeIxuEEIK0CcCD4nGyZurELcca1V42brPvHBNh6s=; b=q5dB6FOcvr2axBWNjMopP/evenTS4XGW6mxZQo/KFdigwyKkk2wkE0KANn0kSLrmsv izmOgfyAyLT73iJyebTKkEMzDMFlffeXHsT4QSmc5JHzK4I+FGTBDgitEKaGX+tu394R 0jxLVl5+CnXHCK3fLZzc9VbnZeX4cCLiceRfLZ78A+tSlqMV94kPfYaaNAuYjeI6LWQt fAjncxrbOekK72hZ6ZR9CCFR7HY/zMChWarB3gRhBeQSwwesz76dsRu4mIBjBqVcE/jL pZ8LyaeYQlb8RRnxLt3hGDCexu+U8YpcfxvnYECUy0a+ILZMhtgYpDTZBFKtymLMUAq0 hRJg== X-Gm-Message-State: AOAM532SMPOY9js/3ZMgo8HGXNQT0IznrRxoQfuaNhNG+LgIEGiBAly0 VvWKBKpICbnAQrOWDULCiJ7lATtG2j0= X-Google-Smtp-Source: ABdhPJxvNUBs8DmwHbKQDNY/jEsWmlFKErpdhUiZU5lUWE3CNpeMlAR533x8me2aj7hkKXVe4GqdDA== X-Received: by 2002:adf:df03:: with SMTP id y3mr13323571wrl.70.1603003238191; Sat, 17 Oct 2020 23:40:38 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id f8sm12360327wrw.85.2020.10.17.23.40.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Oct 2020 23:40:37 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Oct 2020 08:40:04 +0200 Message-Id: <20201018064004.667741-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201018064004.667741-1-andreas.rheinhardt@gmail.com> References: <20201018064004.667741-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/on2avc: Use least max_depth for get_vlc2() 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" The longest codes of any VLC codebooks are 18 bits long and the VLC tables itself use 9 bits; therefore it is sufficient to read twice from the table, yet this has been done thrice. Signed-off-by: Andreas Rheinhardt --- libavcodec/on2avc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/on2avc.c b/libavcodec/on2avc.c index e54c23cb1c..625e733ca3 100644 --- a/libavcodec/on2avc.c +++ b/libavcodec/on2avc.c @@ -195,7 +195,7 @@ static int on2avc_decode_quads(On2AVCContext *c, GetBitContext *gb, float *dst, int i, j, val, val1; for (i = 0; i < dst_size; i += 4) { - val = get_vlc2(gb, c->cb_vlc[type].table, 9, 3); + val = get_vlc2(gb, c->cb_vlc[type].table, 9, 2); for (j = 0; j < 4; j++) { val1 = sign_extend((val >> (12 - j * 4)) & 0xF, 4); @@ -228,7 +228,7 @@ static int on2avc_decode_pairs(On2AVCContext *c, GetBitContext *gb, float *dst, int i, val, val1, val2, sign; for (i = 0; i < dst_size; i += 2) { - val = get_vlc2(gb, c->cb_vlc[type].table, 9, 3); + val = get_vlc2(gb, c->cb_vlc[type].table, 9, 2); val1 = sign_extend(val >> 8, 8); val2 = sign_extend(val & 0xFF, 8);