From patchwork Tue Nov 10 10:58:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23521 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 870AC44A3F2 for ; Tue, 10 Nov 2020 12:59:30 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6B45768BFDB; Tue, 10 Nov 2020 12:59:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DB18A68BFDD for ; Tue, 10 Nov 2020 12:59:24 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id k2so8797352wrx.2 for ; Tue, 10 Nov 2020 02:59:24 -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=HXn0rAwPqFv7NM5Xe1dzZrLpfaBJvg55XXpTNF7geKE=; b=hsMjWl9XhSmgu4bDV4uL5lqcAZO/txqmM+UyVgqe7e9xzWY0limotDQARNhltBGNG3 +Pnyh2AV0llXXWuAYK6g4/mnQnICHGIggp6X+3d0cICugu0DMLsLvEujCDCP3tJS0jKH WZoCcF6lhgC73jKrQlHvBms91LJFmUajRb1Ir8e/+GWeDt0lBxNdcSN9qriEp3gcOsC1 mgymYdMc7zHzLGquPZyMpNZHG3U0K+rizEfHVF1cRM8fdasFcVUrMF1CPwsOG96V+LcP IUx5wrdv/rGOcM4t0rzuXhBAKV3uv5MVGfdGaARlhWdbsFLA3unKc8UyMOPDtXg/b0MF dY5g== 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=HXn0rAwPqFv7NM5Xe1dzZrLpfaBJvg55XXpTNF7geKE=; b=tR6ngJwYUGmo5GZW8i590flK+NIJIxfCh3W2uL1r3aQzDLENqeqdNt3+0r+0gziiXj zcfOBZhb9JfBIsrA6goceu8nxua3EKC3QV/8RH9ngA7kIXHFJB89RsmIMUyVCzfLcOeT Z97I2OCCUOu+x8t9MPYKJ2gZfKvFcfEdkzCbjnHKro9mFlAHnF5gNbnxsx+zZTYymefw XFs1Na6wpZqTc9Esw7F4eD5D/goyrBzAEIdmaHj1dfR1bn+ZZKOQVt18o+Pt/7CIanLu 7aqLRPLIClNmT9SwZsCufE2QAru+bGuYqR/mhAFBBgJ9fGheE3KKEwE2SocdkNZ2M88V pdzw== X-Gm-Message-State: AOAM532pRXfxYeFxGIQ7go1Dj50nzZox5cGhzlMI4Q+OJ1NY1lfi4XSK /ubKgT0aqHQGKp0XUpROVDezRf1F8Cs= X-Google-Smtp-Source: ABdhPJy3aGHUZnwEsSEcOyuBrwF4O3fuxiAzB+YfNDkmL1IIdkgY1ZACVePZuICx8w4/FJu1skQpGw== X-Received: by 2002:a5d:6a0b:: with SMTP id m11mr7228383wru.190.1605005964181; Tue, 10 Nov 2020 02:59:24 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id o197sm2561308wme.17.2020.11.10.02.59.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 02:59:23 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Nov 2020 11:58:23 +0100 Message-Id: <20201110105836.321916-10-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 101/114] avcodec/vp3: Remove code duplication when initializing Theora 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" theora_init_huffman_tables() does essentially the same as ff_init_vlcs_from_lengths(). Signed-off-by: Andreas Rheinhardt --- libavcodec/vp3.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index f288a53fe1..743d00390c 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -2319,20 +2319,6 @@ static av_cold int init_frames(Vp3DecodeContext *s) return 0; } -static av_cold int theora_init_huffman_tables(VLC *vlc, const HuffTable *huff) -{ - uint32_t code = 0, codes[32]; - - for (unsigned i = 0; i < huff->nb_entries; i++) { - codes[i] = code >> (31 - huff->entries[i].len); - code += 0x80000000U >> huff->entries[i].len; - } - return ff_init_vlc_sparse(vlc, 11, huff->nb_entries, - &huff->entries[0].len, sizeof(huff->entries[0]), 1, - codes, 4, 4, - &huff->entries[0].sym, sizeof(huff->entries[0]), 1, 0); -} - static av_cold int vp3_decode_init(AVCodecContext *avctx) { Vp3DecodeContext *s = avctx->priv_data; @@ -2458,7 +2444,11 @@ static av_cold int vp3_decode_init(AVCodecContext *avctx) } } else { for (i = 0; i < FF_ARRAY_ELEMS(s->coeff_vlc); i++) { - ret = theora_init_huffman_tables(&s->coeff_vlc[i], &s->huffman_table[i]); + const HuffTable *tab = &s->huffman_table[i]; + + ret = ff_init_vlc_from_lengths(&s->coeff_vlc[i], 11, tab->nb_entries, + &tab->entries[0].len, sizeof(*tab->entries), + &tab->entries[0].sym, sizeof(*tab->entries), 1, 0, 0); if (ret < 0) return ret; }