From patchwork Tue Nov 10 10:48:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23480 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 155D5449E81 for ; Tue, 10 Nov 2020 12:50:38 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F036168BF28; Tue, 10 Nov 2020 12:50:37 +0200 (EET) 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 3B6EE68BED3 for ; Tue, 10 Nov 2020 12:50:22 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id b6so810650wrt.4 for ; Tue, 10 Nov 2020 02:50:22 -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=kUqpQTqH/KBB8ZR40qiQfacoXXSoW4GIjsi3P6OiC5I=; b=i4hVE/j0WIqqZDVmVdxxOwjpTdmipE0BlkH9PIC2bYEzAmfGRLYdP4O0etWJnJhaYB AJrGb6J89BJnWPhBHDztpjV1SmyJgfbn2bOEmcRNkps/kwRgqSEuLx2DlNsyb9u17vkZ TR+RCZhcgKCY/Ur3cDntR87ufnN1HmvPmOfZB8BBWcjVhrjDfYiHbyAvIX6hKaqwCE2P qSUAbG2gflhYHX6symSy7bOZzHwkeds/qsflNskwRBj3rmngNjvQRC6I91CJzAMJhmrH AohMIIAzOME6u+kCeynHJIqItlPaP8RUDicEUKEyYz9jB9Evrd91AhB1P5IK3WXwhBV9 mZTg== 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=kUqpQTqH/KBB8ZR40qiQfacoXXSoW4GIjsi3P6OiC5I=; b=PM3OBvZbkntcA2lRfbX5iPeXtNTIZQWwRfU5YTw4PM4vy3s3DRbJzJjjUmkC4VTmWc 2kmM1KopwJI1V3ABpPk6wkpntegIJ9leUPwtprikuwKN9vLfjyw0EDCB4DPHg9iXGdaH mAbo2ZhVoSNQhnFIkhFXKSW7RbZIAb7BdgLur+wxW1Gs/V5Gl2XYcOBxr0vZeVZgaLoo /gRNVpWs2fnWIBvRd8i9Ueo7HkMdBcvPlLIM6xdXvI8Lb6sQKhhFbzsVmgKVt9Mn73pw qtj/l030/yJldOV03HM5mhPiSgI0KSgqSyTWzTbWTmlMAd0/dfjQ34CxaQfCWinGg8wP KaTw== X-Gm-Message-State: AOAM531TqsFdu1wxdv59isMxpIbDmU8GP0UbICQl/07WE3m7znRk9khj icCEUJUebRH3r5eVPer8WwyM8VW2e5Q= X-Google-Smtp-Source: ABdhPJwu93zsmeY4lYvjpLemRwh3bKDWXaCgmOY/Vl4P7C+mKk8XHeuFBJL4qXV6cgEZzKGRcgPP6A== X-Received: by 2002:adf:e388:: with SMTP id e8mr23019759wrm.65.1605005421530; Tue, 10 Nov 2020 02:50:21 -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.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 02:50:20 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Nov 2020 11:48:00 +0100 Message-Id: <20201110104851.321029-64-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 063/114] avcodec/sheervideo: Simplify creating VLC table 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" ff_init_vlc_from_lengths() can be used to offload the computation of the codes; it also needn't check whether the codes are already properly ordered (they are). Signed-off-by: Andreas Rheinhardt --- libavcodec/sheervideo.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/libavcodec/sheervideo.c b/libavcodec/sheervideo.c index 3e60ef26a5..98093d500a 100644 --- a/libavcodec/sheervideo.c +++ b/libavcodec/sheervideo.c @@ -1784,11 +1784,10 @@ static void decode_rgb(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) static av_cold int build_vlc(VLC *vlc, const SheerTable *table) { const uint8_t *cur = table->lens; - uint16_t codes[1024]; uint8_t lens[1024]; unsigned count = 0; - for (unsigned step = 1, len = 1, index = 0; len > 0; len += step) { + for (unsigned step = 1, len = 1; len > 0; len += step) { unsigned new_count = count; if (len == 16) { @@ -1797,17 +1796,13 @@ static av_cold int build_vlc(VLC *vlc, const SheerTable *table) } else new_count += *cur++; - for (; count < new_count; count++) { - codes[count] = index >> (32 - len); - index += 1U << (32 - len); + for (; count < new_count; count++) lens[count] = len; - } } ff_free_vlc(vlc); - return init_vlc(vlc, SHEER_VLC_BITS, count, - lens, sizeof(*lens), sizeof(*lens), - codes, sizeof(*codes), sizeof(*codes), 0); + return ff_init_vlc_from_lengths(vlc, SHEER_VLC_BITS, count, + lens, sizeof(*lens), NULL, 0, 0, 0, 0); } static int decode_frame(AVCodecContext *avctx,