From patchwork Tue Nov 10 10:48:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23541 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 65DEF44B15F for ; Tue, 10 Nov 2020 13:03:54 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EB96068BF2B; Tue, 10 Nov 2020 12:50:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5AB3D68BED8 for ; Tue, 10 Nov 2020 12:50:23 +0200 (EET) Received: by mail-wr1-f66.google.com with SMTP id j7so4891447wrp.3 for ; Tue, 10 Nov 2020 02:50:23 -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=IL/ZQvPYbxK6n4rsq6/JfEe/+m9y9VUBbF2WI9APe9U=; b=fhbi4r6MuNVN0/fOS5hRUlW7zjUldTnFcl4q0Oknz23BiHpfALMQ7ql8vijNIITyPc dc4wSn+dQEwBIiN40nY1vjThQXRS46tSaSVC7UfzIyEEKrJA8HzeGauyWNiO3bQLNdfo 4ZhY3AbIQdXdaaHuxnLta2nbaKnUdPzjRzeuEX68zk6bavSDbN2FtMCreAenQNrqvKFk 9P0x4KZsYDTe85r6hOgvw8/pHcYRw9Qnf3WTqGrR9Yw+eBAxE8aVbnF4OskfUcLQji4H z5mE90yMVXpjJqGdiW6wXlW6dY4oZUQZ1rNg22XbbpunclbmEAFKQtEGHaEDjU5qhMby celQ== 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=IL/ZQvPYbxK6n4rsq6/JfEe/+m9y9VUBbF2WI9APe9U=; b=pCgbGuYq6Uxl+ECr8GnlVeDsg+b4PGp2Qbzm/rK/lnWOdZYb54mmFEScjnw6ldvchD CuyqeP3RYrPLfc3gvI3GXGX77YT1wy041Vj0As9/9oaJTTTrI0HIpqjfhjDSuAlY48FX RMWV7jrip3eLlPpXOVfxWVQ0PXQmo5iTDfYVaF5O3pL3CxN+Xow73BrCVZGKRZa5QI1l iWQN5qKmrcMu5s/bMffkrKHAaNCrC3oOMSB57qjWAxQYiBOCQWBPcQPIurE2HTUjxV23 KoWLzMfIJAGFGVxGvssayzeaJG2z1G8GdaHGEkhlDh5+7c524T6fQfvgdEgoTiWMaSNP 7R8Q== X-Gm-Message-State: AOAM5309SSdQV1q81LeUzo5k4ivx1M0/xes+GE7UXCy5sEUx/QF57irW UIknzK7oWuRDmKwqgEku65P6Jn2K8zc= X-Google-Smtp-Source: ABdhPJzCGma2Od1YS/gUTPslYoMX5T0q/aNAc+XC8UgDyiyvgRtH5K3JWFq23V4FASwP8eMMeTsl/w== X-Received: by 2002:adf:f888:: with SMTP id u8mr12960440wrp.381.1605005422599; Tue, 10 Nov 2020 02:50:22 -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.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 02:50:22 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Nov 2020 11:48:01 +0100 Message-Id: <20201110104851.321029-65-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 064/114] avcodec/g2meet: Use least max_depth in 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 AC codes of the standard JPEG tables are 16 bits long; for the DC tables, the maximum is 11, so using max_depth of two is sufficient. Signed-off-by: Andreas Rheinhardt --- libavcodec/g2meet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c index 6b870ae3d4..f6aa636bde 100644 --- a/libavcodec/g2meet.c +++ b/libavcodec/g2meet.c @@ -248,7 +248,7 @@ static int jpg_decode_block(JPGContext *c, GetBitContext *gb, return AVERROR_INVALIDDATA; c->bdsp.clear_block(block); - dc = get_vlc2(gb, c->dc_vlc[is_chroma].table, 9, 3); + dc = get_vlc2(gb, c->dc_vlc[is_chroma].table, 9, 2); if (dc < 0) return AVERROR_INVALIDDATA; if (dc) @@ -259,7 +259,7 @@ static int jpg_decode_block(JPGContext *c, GetBitContext *gb, pos = 0; while (pos < 63) { - val = get_vlc2(gb, c->ac_vlc[is_chroma].table, 9, 3); + val = get_vlc2(gb, c->ac_vlc[is_chroma].table, 9, 2); if (val < 0) return AVERROR_INVALIDDATA; pos += val >> 4;