From patchwork Mon Jan 4 00:28:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24768 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 93A6D44907C for ; Mon, 4 Jan 2021 02:28:54 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7DE8B68A987; Mon, 4 Jan 2021 02:28:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0FF7768A882 for ; Mon, 4 Jan 2021 02:28:52 +0200 (EET) Received: by mail-wm1-f45.google.com with SMTP id 3so17542200wmg.4 for ; Sun, 03 Jan 2021 16:28:52 -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=Re3KGmP0ED56X7PH6UrWixnj3+ZZW1C6jUM0QJqUwkM=; b=QCXl854HXZMgGqLUo7sYYhJaUVb0aR2Rgx/Nm8DKeOI+GhKZQafUWwAlyRQh8M9CBa ctjc2J3LUqpRk6LB6FsPphURA7DLMHBKvUDN7GZZV0oJcNsZjy5/rtOooLrzBOYS1l1N zHZoDJSSPwfPpAz3K+kUAtBIvoHfhJCG5vuciZJeRR0vhr95dFv73injseP4QJImCijS ByxHxO/biGHMMPNBeKG2hq1mVxOO5S06PQBqbYwiIQBCg6TohXSD501+kxI/N3fZ+A32 N4Rd+9JiBJbeTZjvghyODsuugaR99wfpsqLFX5IkWaafXhvpPfNaYFYEx7K/anIwNuZN 3Adg== 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=Re3KGmP0ED56X7PH6UrWixnj3+ZZW1C6jUM0QJqUwkM=; b=iPF7kSbp54WqaE0R8bWtEZ1xgPfFL/YFEwsPeGVGAvxvGPjtL7laMWtMA8jNgY2S2d N1M29NxTGF1FOWIliX2endP/z0Hb062Cud/EZyzML49gxVrAHCyyq9mi/xUcfUahvsmF wMCMY+4Rq/2v7XEeMoskIyE4M6x2Vq6eN1gh7i8T28MeXEgdaWcUxkiB51JbWm/JuTPn sxOiVmRLRWtm14pgcSd/10xte325MOCP5rE8RKISvfWXT3K3mpsXsCuG5QHeoaUCiIBs uSOznsD7NPn+WCxhpwiy+QXY0vbCrsfdnhMXSH2+GReTFIgvG+TSJbkbAun7PGIw2ePU Zqlg== X-Gm-Message-State: AOAM531b8Lv1x+ixm+CjCkXqypoDE9v+RNslryk3+yCM8xrrLVRkCisB ZKjlZnu4QrXLMbD6Y0uvb4cejOllmkc= X-Google-Smtp-Source: ABdhPJyJxtlWukV70QR0fri6M5B3JkEuqiHiEhLANg6p6Cu2Tcvd7URe8okQzOgjVFk3uvDBt3+i+g== X-Received: by 2002:a1c:9a57:: with SMTP id c84mr24021185wme.183.1609720132220; Sun, 03 Jan 2021 16:28:52 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id u26sm30032046wmm.24.2021.01.03.16.28.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jan 2021 16:28:51 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Jan 2021 01:28:05 +0100 Message-Id: <20210104002816.2321974-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210104002816.2321974-1-andreas.rheinhardt@gmail.com> References: <20210104002816.2321974-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/16] avcodec/vp3data: Deduplicate coeff_tables 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/vp3data.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavcodec/vp3data.h b/libavcodec/vp3data.h index 1fbeac731b..272af4e3a0 100644 --- a/libavcodec/vp3data.h +++ b/libavcodec/vp3data.h @@ -179,8 +179,7 @@ static const int16_t coeff_table_token_15[2] = { 5, -5 }; static const int16_t coeff_table_token_16[2] = { 6, -6 }; static const int16_t coeff_table_token_23_24_25_26_27_28_29[2] = { 1, -1 }; -static const int16_t coeff_table_token_30[4] = { 2, 3, -2, -3 }; -static const int16_t coeff_table_token_31[4] = { 2, 3, -2, -3 }; +static const int16_t coeff_table_token_30_31[4] = { 2, 3, -2, -3 }; static const int16_t coeff_table_token_17[4] = { 7, 8, -7, -8 @@ -377,8 +376,8 @@ static const int16_t *const coeff_tables[32] = { coeff_table_token_23_24_25_26_27_28_29, coeff_table_token_23_24_25_26_27_28_29, coeff_table_token_23_24_25_26_27_28_29, - coeff_table_token_30, - coeff_table_token_31 + coeff_table_token_30_31, + coeff_table_token_30_31 }; static const uint8_t vp3_bias[5 * 16][32][2] = {