From patchwork Tue Nov 10 10:47:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23529 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 9D6DC44ACE4 for ; Tue, 10 Nov 2020 13:01:10 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 20A4168BEDB; Tue, 10 Nov 2020 12:50:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 448A068BE97 for ; Tue, 10 Nov 2020 12:50:11 +0200 (EET) Received: by mail-wm1-f48.google.com with SMTP id c16so2538720wmd.2 for ; Tue, 10 Nov 2020 02:50:11 -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=Y2ou6A9f0fPXq01ixqmuZ5u7flfsr16S1gMrp2/B4oE=; b=hIg1AlB/EKz3opq0kkBGfN3ftbjYfJtcq3Hwz4fBSQONYZNoxWbZIzTt5tAqeQbXZQ iBNfGm5LOUgS++PayksOBGdVmN3V02VFP5y8oilctNV0/uaEqO3cPx6wv16r/LjVltSR dp873oMcj0DJDBMQ5JvckV37A3u2RwuguhkwepLoVWOuQeJLDRYP/FRkUQkvreFXRkDw 7v0dVDS0VPMoEL8rYsFf7KzWX/EfsXUpiNN3xm8aPtSEFMxw3J3GdaoTqSDA2OkxI8bc Ke7+0Gh3goShsSnBNSpepgwTS+a4S63RgJ0e2+jLmPsRDDNqZJR01BUIEfgxNdivInUg jCRg== 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=Y2ou6A9f0fPXq01ixqmuZ5u7flfsr16S1gMrp2/B4oE=; b=lXndcPIRBJ5r0RHRE3T4oHypr7jqomxJiNvYcaax8Sp0gJ2SdFwCYSbWwfCvt5xfVP CM3UQq6qq2Og3ZJK4+S46bAp5bC8Ncp7ddkyMCj2y2sMw0FE2drPb9Rln5U7Vlm5GLvq 7V30cx+0kwJVVeqXsGGvbZpzFH5Wz3p0b+hScVTmsh3VsOkfAjQMldu4psqpOPSrtiX8 ENPmyK94X1w3HZH20pteHOI9EYosIPxvg4DnQPkZ/ZITllgj3EE45MYNVz+JHcy1uDQk EBk/yNleGUFs4MnsebRrJrsQs9RfZUqudNKM89U3poLldd4Vk1dNU6pdipvF+EmPzDv1 P7kA== X-Gm-Message-State: AOAM533oygXxAbxrBbRRzfkdConRPh7k+gSqhxtWghjxtkG0bDm7MOR4 QRLg3ErCP7jtYhV1ekj4wib4e7JcodM= X-Google-Smtp-Source: ABdhPJy46vO9eyqb3kB7qHS+rH0I/nH2b8VBTU7Wr7dpJWb+ZsVOpMh/zPQG1pT72z7A1mjQq1fREA== X-Received: by 2002:a1c:7215:: with SMTP id n21mr3967417wmc.173.1605005410312; Tue, 10 Nov 2020 02:50:10 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id l24sm2572543wmi.7.2020.11.10.02.50.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 02:50:09 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Nov 2020 11:47:48 +0100 Message-Id: <20201110104851.321029-52-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201110104851.321029-1-andreas.rheinhardt@gmail.com> References: <20201110104851.321029-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 051/114] avcodec/qdm2: Apply offsets when initializing VLCs 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/qdm2.c | 2 +- libavcodec/qdm2_tablegen.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c index 657b2da64d..bdfe710840 100644 --- a/libavcodec/qdm2.c +++ b/libavcodec/qdm2.c @@ -205,7 +205,7 @@ static int qdm2_get_vlc(GetBitContext *gb, const VLC *vlc, int flag, int depth) value = get_vlc2(gb, vlc->table, vlc->bits, depth); /* stage-2, 3 bits exponent escape sequence */ - if (value-- == 0) + if (value < 0) value = get_bits(gb, get_bits(gb, 3) + 1); /* stage-3, optional */ diff --git a/libavcodec/qdm2_tablegen.h b/libavcodec/qdm2_tablegen.h index 0e57902fc9..aaa7356caf 100644 --- a/libavcodec/qdm2_tablegen.h +++ b/libavcodec/qdm2_tablegen.h @@ -122,7 +122,7 @@ static av_cold void build_vlc(VLC *vlc, int nb_bits, int nb_codes, int idx, vlc->table_allocated = qdm2_vlc_offs[idx + 1] - qdm2_vlc_offs[idx]; ff_init_vlc_from_lengths(vlc, nb_bits, nb_codes, &tab[0][1], 2, &tab[0][0], 2, 1, - 0, INIT_VLC_USE_NEW_STATIC | INIT_VLC_OUTPUT_LE); + -1, INIT_VLC_USE_NEW_STATIC | INIT_VLC_OUTPUT_LE); } static av_cold void qdm2_init_vlc(void)