From patchwork Wed Dec 30 23:31:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24721 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 CDE4D44BA0E for ; Thu, 31 Dec 2020 01:37:06 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2738A68AA25; Thu, 31 Dec 2020 01:33:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D9B1F68AA7B for ; Thu, 31 Dec 2020 01:33:01 +0200 (EET) Received: by mail-ej1-f45.google.com with SMTP id b9so23749435ejy.0 for ; Wed, 30 Dec 2020 15:33:01 -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=S0uujJkqm2dmmNgXvZj9ryUqHgNVv06Dv5I7MTl7M/c=; b=XmoQZPlTnmcmLrpayz1MfN8+6pElD86KNG0fkpNJJEsCaC9pFQD9mxyQohfvCtFr+m iOT3/f8n9SR0w5Fck72ytqlBiPxNxo4IJzV7j7YpzPMNJOUr+CJZb0JdnMUorILu1o8y VnlJNtOjul1Oo1Qkg2DXuVuTOgT65zdVs1MRHSSN363E4MumLBN9Cqn57XgRP5h4as77 vLK9nPmPoetpgUZRphJWuNI5LL1w6fban4qWrNtHolGJLi5A9HqI4yHQWOe8MB8m2Fyz wGUvokPktUzde61XGww8wUjeBo1+orDSYjCXMfnG7qrCTTUiE3whTDnPfUSuCLk7ZWG2 Z7Ng== 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=S0uujJkqm2dmmNgXvZj9ryUqHgNVv06Dv5I7MTl7M/c=; b=Sl1RYGvNECxRLjW1PnAQ94v5vZoEt/6iUvgWszJ/JSqwVReF9xG/w8BWuBjjoSW/Ta e/x9VWQpX+WcE+hGFAGL3McOgzmpeh7MrSe09FGZa2aKONb57ffBKVDI/142bQXVJIka Fns5tBDetwKapKam+U3QY4v0IPQYbfgb8I/0E7nZidKhlgiHixfBcWU2tO7j62AY+SvD ebC06HGissMMt6w/nALkcJC5u/o63pmWkW3FSAG/aObNQnqJJah47FC/WT0SgUQejccA KkHgzLI7LokBVETeGXNfg5ssGwPjkAikzjL9WKvX3ukTxwhmou0pIeO9xTcWlt2gVrkJ N4rQ== X-Gm-Message-State: AOAM530eqtECa4FWtJOOsvDLIkSSnYbeNFQAGCRmmIJNXERYOezhSc// 7KyHv+cio/ir2MO8AwLywnhxZkdvmJ0= X-Google-Smtp-Source: ABdhPJwUkzKGyjXsal7zJ9g1Bi5ZpeVvPdxyKZA8CptClymQt+xTYBCCg8v0Ewds5S1/5rqV9ThlVw== X-Received: by 2002:a17:906:1a4e:: with SMTP id j14mr50913461ejf.507.1609371181181; Wed, 30 Dec 2020 15:33:01 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id u19sm19630409ejg.16.2020.12.30.15.33.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Dec 2020 15:33:00 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 31 Dec 2020 00:31:56 +0100 Message-Id: <20201230233157.1055287-29-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201230233157.1055287-1-andreas.rheinhardt@gmail.com> References: <20201230233157.1055287-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 29/30] avcodec/svq1dec: Increment nb_bits of VLC to read it in one go 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/svq1dec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c index 7aea138060..e9c068de19 100644 --- a/libavcodec/svq1dec.c +++ b/libavcodec/svq1dec.c @@ -456,7 +456,7 @@ static int svq1_decode_delta_block(AVCodecContext *avctx, HpelDSPContext *hdsp, int result = 0; /* get block type */ - block_type = get_vlc2(bitbuf, svq1_block_type.table, 2, 2); + block_type = get_vlc2(bitbuf, svq1_block_type.table, 3, 1); /* reset motion vectors */ if (block_type == SVQ1_BLOCK_SKIP || block_type == SVQ1_BLOCK_INTRA) { @@ -765,9 +765,9 @@ err: static av_cold void svq1_static_init(void) { - INIT_VLC_STATIC(&svq1_block_type, 2, 4, + INIT_VLC_STATIC(&svq1_block_type, 3, 4, &ff_svq1_block_type_vlc[0][1], 2, 1, - &ff_svq1_block_type_vlc[0][0], 2, 1, 6); + &ff_svq1_block_type_vlc[0][0], 2, 1, 8); INIT_VLC_STATIC(&svq1_motion_component, 7, 33, &ff_mvtab[0][1], 2, 1,