From patchwork Wed Dec 30 23:31:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24704 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 16E5D44A7BE for ; Thu, 31 Dec 2020 01:32:57 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EFB4868A83C; Thu, 31 Dec 2020 01:32:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DDBBF68A82B for ; Thu, 31 Dec 2020 01:32:41 +0200 (EET) Received: by mail-ej1-f42.google.com with SMTP id b9so23748791ejy.0 for ; Wed, 30 Dec 2020 15:32:41 -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=N2FYFjufUs1CcePmB28IIe5D8xE9qqtLAjdrGZBAr8U=; b=MNMDUv+q82S6/0Ud5tTvQbfMtYLza6lAWk6HtJHYh9APVm8k/CMN4cAnyzEsEmBfwU XVdtz0ScITrFzy0bagU91htNTd5o+3m2kfiMUtRMV+Rn0l1oEZZvoYR664f9mybRlHXQ RqPFLSrBaQrgiWxtiWWgcvOrvfm+OrBkYTdu1/8pt49Hy8CvoO+mWnLf+4oG6ATeHvwT xspykyn0izMLY+g3a4zjngptfQC8sgoy8ibBRuO/7s1J/avh7MKCYknwBJn0epVjR+Q9 hfwtF3mCKSrcigyznW/OxKQrgQSU+8EKVZBx2fs5X/lYHno3zniwTxBYxbYs+lZpz0eu PnaQ== 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=N2FYFjufUs1CcePmB28IIe5D8xE9qqtLAjdrGZBAr8U=; b=ketBVCKPsGZph+lrNUp7supH0gQ3ltZS7fC2R22xKJs/KRknl+RjkyNvY5eHW6wylL iS/KOjhUFnyB4If+h0RXDt2tXg1mo8R74ST3l5NZkfsr5okoCjcXb7laQ0DA7S7YCRK9 o8wmkEj93uXYv+jPjiFTCS8h7F0N82AEjTGWzyIqez8yXUr+OAfQU08M3Tw2RJByR5UQ Pvb/diQ+6YKHS4olCd73HRGKM8dcUinNyL39s6WPPIyQb9cjBQ6h8uDCYGJXhNLwve0s i9IRSzDiwbJMw6396PFBTTKq29UUoGkLyiUtYuQUOxr94YW9S/qi7DgaCNs2xWNG2Evu T9TQ== X-Gm-Message-State: AOAM530lDChDNT+Gv5aENewDyJGrhwHW5hakzKuIqDpy3Upm0O8nBGbc uFEhz8RHJ/Vl+AtN5hfCroDjj9Dd/P4= X-Google-Smtp-Source: ABdhPJyV1aV3HGLEHTvJyMscxLINFGXDrcz8+AdmerVKuHecnhEIBvWJa6iOMPHqbJijOWDSVxv3IA== X-Received: by 2002:a17:906:d146:: with SMTP id br6mr50852715ejb.331.1609371161241; Wed, 30 Dec 2020 15:32:41 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id u19sm19630409ejg.16.2020.12.30.15.32.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Dec 2020 15:32:40 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 31 Dec 2020 00:31:35 +0100 Message-Id: <20201230233157.1055287-8-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201230233157.1055287-1-andreas.rheinhardt@gmail.com> References: <20201230233157.1055287-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/30] avcodec/truespeech: Avoid indirection for truespeech codebooks 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/truespeech.c | 16 ++++++++-------- libavcodec/truespeech_data.h | 4 ---- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/libavcodec/truespeech.c b/libavcodec/truespeech.c index 3cdae8c556..d28779a610 100644 --- a/libavcodec/truespeech.c +++ b/libavcodec/truespeech.c @@ -82,14 +82,14 @@ static void truespeech_read_frame(TSContext *dec, const uint8_t *input) dec->bdsp.bswap_buf((uint32_t *) dec->buffer, (const uint32_t *) input, 8); init_get_bits(&gb, dec->buffer, 32 * 8); - dec->vector[7] = ts_codebook[7][get_bits(&gb, 3)]; - dec->vector[6] = ts_codebook[6][get_bits(&gb, 3)]; - dec->vector[5] = ts_codebook[5][get_bits(&gb, 3)]; - dec->vector[4] = ts_codebook[4][get_bits(&gb, 4)]; - dec->vector[3] = ts_codebook[3][get_bits(&gb, 4)]; - dec->vector[2] = ts_codebook[2][get_bits(&gb, 4)]; - dec->vector[1] = ts_codebook[1][get_bits(&gb, 5)]; - dec->vector[0] = ts_codebook[0][get_bits(&gb, 5)]; + dec->vector[7] = ts_cb_7[get_bits(&gb, 3)]; + dec->vector[6] = ts_cb_6[get_bits(&gb, 3)]; + dec->vector[5] = ts_cb_5[get_bits(&gb, 3)]; + dec->vector[4] = ts_cb_4[get_bits(&gb, 4)]; + dec->vector[3] = ts_cb_3[get_bits(&gb, 4)]; + dec->vector[2] = ts_cb_2[get_bits(&gb, 4)]; + dec->vector[1] = ts_cb_1[get_bits(&gb, 5)]; + dec->vector[0] = ts_cb_0[get_bits(&gb, 5)]; dec->flag = get_bits1(&gb); dec->offset1[0] = get_bits(&gb, 4) << 4; diff --git a/libavcodec/truespeech_data.h b/libavcodec/truespeech_data.h index 73ebda5e85..85a9bafce3 100644 --- a/libavcodec/truespeech_data.h +++ b/libavcodec/truespeech_data.h @@ -66,10 +66,6 @@ static const int16_t ts_cb_7[8] = { 0xCEF0, 0xE4F9, 0xF6BB, 0x0646, 0x14F5, 0x23FF, 0x356F, 0x4A8D, }; -static const int16_t * const ts_codebook[8] = { - ts_cb_0, ts_cb_1, ts_cb_2, ts_cb_3, ts_cb_4, ts_cb_5, ts_cb_6, ts_cb_7 -}; - /* table used for decoding pulse positions */ static const int16_t ts_pulse_values[120] = { 0x0E46, 0x0CCC, 0x0B6D, 0x0A28, 0x08FC, 0x07E8, 0x06EB, 0x0604,