From patchwork Fri Nov 20 07:19:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23762 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 A52CC44AC1A for ; Fri, 20 Nov 2020 09:25:30 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 83EF068BA86; Fri, 20 Nov 2020 09:25:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f54.google.com (mail-ed1-f54.google.com [209.85.208.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1482B68BB58 for ; Fri, 20 Nov 2020 09:25:17 +0200 (EET) Received: by mail-ed1-f54.google.com with SMTP id q16so8461251edv.10 for ; Thu, 19 Nov 2020 23:25:17 -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=c8Fe9AUuQtnogfM7EqJE0JD+reYpFUA4eKwmuOovqbU=; b=NVFuJsIWqxH5SQU5OvrM1gHBSObUM2xKLvWeiG5VyZwTgHV3Vu9twjLf2etGXLGExf uBHGlcM23DWQf7A9h1dvu9W1fceZnnD5av705GMWbVdRK4iyTCoPzGZa05iNMjI7jQOR zJZipwanBimbY9xGwzZQwp3E85C4QvRyqnE6Ih+upcGQeu/VNEY57jgspmJ7alJQfjzU 8TiJfs02cqwzb8ER5CQXcxiM0EpJqUlVRrXbs+6OJV8DSwWVoWWgRdCr25sTtSxBCR2h uBmtk2+sw/vDpoBuawkiJ0o4eEe2uzVIyhDyKYy5ktZ362LdaAolGJ7fyeVWTRtn+BPr YdVA== 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=c8Fe9AUuQtnogfM7EqJE0JD+reYpFUA4eKwmuOovqbU=; b=o8+VaByRQpWbUl6Fljv1EpqyVWcnsADaHwoELtHJQ6zQWydqChXAktUGy2jv4LMr3o G/VjSa83PBLvjISRvwY3Upn5jmcRjf9+m2OVE4okEwi/D0+JTy1hGD+5Qvbb+Jx1mkwv GPdgptYPfvWIr3fKP+8zzq71pX/ifbnqc5aIDtSkcbRPk4AvK33/lIs+svY8ca+fdxhX V9yF0pIoDkSyeANnhw7xnLJee2JII5Z/e0aKMohZ+LsY065NUWAPc2U3xshbHuk4E5/a X32aBFs5hx9vpoZB3JdNJc2ChBvE8YuG5is3qVDE5fdcJHx92fAKdJUfzafuIwBC3ld7 sJAw== X-Gm-Message-State: AOAM531DO9NF13pbfTs0zwVL75evzu2jP+aUf8Is5RkBfsQSVhj+cmi3 1XBxmioGLXYBRLmgIE3Bg00LcjDgAVx72Q== X-Google-Smtp-Source: ABdhPJyqZq2Wrsp3mQsLyqZ4nbos3gBC7fMhYzHh2+LUFiuVhRiX10piYDh/B7DnouZJ4JspLNkK9A== X-Received: by 2002:a50:eb96:: with SMTP id y22mr35056512edr.116.1605857116252; Thu, 19 Nov 2020 23:25:16 -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.25.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2020 23:25:15 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Nov 2020 08:19:39 +0100 Message-Id: <20201120072116.818090-67-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 066/162] 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 bd365739ce..f2e78c3fa2 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 d91bd04dc8..e948e92295 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_LE, NULL); + -1, INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE, NULL); } static av_cold void qdm2_init_vlc(void)