From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 37B02478CF for ; Tue, 26 Sep 2023 22:23:49 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B10DD68CB8E; Wed, 27 Sep 2023 01:22:05 +0300 (EEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01olkn2090.outbound.protection.outlook.com [40.92.64.90]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4830868CB7F for ; Wed, 27 Sep 2023 01:22:04 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ctv5UT4yqpFe3VYjS8cu+Tgwy/oKw4ooTH6wCcN4+OFLreBGB7mp4hYMGRnXi9H/U9RIAlP0ySoj1v59tV0RfB8clNxn+X3EycyyzXsKllRZ2TKl/UCIsgYR9G+VOAaxjHdlJkKWNk5Zpb2h8Mc8DU9jY2LI6lOKw2cD5QrjluIDx1EZRipFZWcy63S9YO4vz/3FxxsNxgyMUijrd04uXv6UXFPODI4zuY+KeMVhJ/d9AuE4WdtsSJgcKNqxGLJJ5tkQHa5KPZ+fAj+zG+B6FXd4rqrUyGTuETSSb040gmXsZK4UMu8ynpRQgHyjipf+feg3ItjB6RUqYyyLEqDVtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=HdKXOBb4ghFW98SVztwIu0qhCQ+/4uKLlOAt0mrln6M=; b=maiyuaUv19mlF9Y00u5Agdg0+xVBzf52xbKuppJWgz/hwbOAlI17bl6+c/KkGEn3oau8PvsdQ8lBvTivBkp03b4/Jl947HUuU7gvw3yIh2rXNgZhdOI1hhgUzx5SbJwxCjyFTf/rY67k/MBUZhd4rklreIoTDh4LnIoyffvocTu9OJqapbA4ATdxX51n6ifvG0bAvEAPtjBtMm4bO2AO2M7KYdqsriSJmE4Uv5JTlNf43btDv0X46s6hOymb9yFwSf4ALmTs5/ApQhRut2FUmvgLcO8Lph0f0NV3Qtd79RicGOPIHIV8tDGN1sE7OJUgdGU18VeMX/RgArNjhuPlhQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HdKXOBb4ghFW98SVztwIu0qhCQ+/4uKLlOAt0mrln6M=; b=OrYqZT8LUG1+HBvAbK7xpMeMOq0rkFbhsCvkpQwX3I4B3nxZ5jvaLBk8A9m2o3fDyQyiQ8WIv7gc8chz24dUul2XWg7aw7sE2rMd7quQRpJkbX/zLqjs4EcnmtEky7KzmdI35RcqUGz639XZLM9LvnhUMNi7bvx9CGr2p+XZUFGTP0vGMowK6fRFmhbCFn92XQqrXX+ij/QdMZRoxXleiOkZW0copRyjkIcgechv1lwhIkxO8y+VzmGha0euEcI1KIJjoFiCSApceUhHPN+hkgnU5u71xw5SXPbr9KlBt9bS4cPt5OLAKXhiE5qmdRwMcFBM6wklVmzeFldrHG2rOA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0393.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37e::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Tue, 26 Sep 2023 22:22:02 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::9d42:7b4f:71ef:c76a]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::9d42:7b4f:71ef:c76a%3]) with mapi id 15.20.6813.027; Tue, 26 Sep 2023 22:22:02 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Sep 2023 00:17:22 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [dIhJl9I1QupAHr0Cb+7bFFKPenCPlPka] X-ClientProxiedBy: FR3P281CA0019.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230926221732.3711507-50-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0393:EE_ X-MS-Office365-Filtering-Correlation-Id: cf4f4d40-48d0-4154-2360-08dbbedf020f X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gPKsdJJPY5W2jKsG7clpJCAaZKqN92hypjisTBRtw9BBiIBPfPuLLQwyH3lK1ezTdH3bE14HMwVqtaXU08oVWulsYgRS3C0qaE41eRLjFt0z+5pgrN+ymPafkXsaBurGmIQs/b59wAm9LcRfMNgfyc7UUAMczns2sWuauRmTyD8KUCYj1kyHlSFKCK+P3ax3m6VAYA6VuCepH+jtJfCCM0+R9rd3+RgKeDat9g3JMTjRmmIlACpB1rXU7OCMWT/jOhoN3lsOS+fR4FQeeZBGXMtAavLBj0PW+IYBP04S1knB0erNOfP3MFLA3HxTccfdfky7j+gi/U9KRjRX9KMVeLuPEBlsellxHZl/So9NAZBwmt7On9uHZpznCEmSemSXGjw0fo1VXxdHtgh+dcOI1Ggg2lWKD/qThoEP/HAIjSIheTf1V2Ohd625nJ9WKnVM9J7KxnF+jAulIai8JVXGOAiwk+d/Fy++fCNoCeko5mg+WIDlHm1ZArTBamFZJCf/EbmVRLO45pq38xu7ZL9oY2JElYDBqhVBG831n7bx48yheBSNcYVlyaeDQ2EslKkGx+S+E3WLwCoAItZYJVgfiBYteCzxAofq8apIanJAtwq7iJDIIbjOH8A61hAH/D+y X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?1oIJG6MPyM409eyAApNovGuTK9m05X4j41ygDGWYcbV587ccSAPUT2HKQZcV?= =?us-ascii?Q?nBFTftuvPnhZAl40z61x47oASQyrNABmaLAttUHjw7DiKoKQ5fbTjG5uCWdX?= =?us-ascii?Q?JPBPosHUMfyZ0ZDC1uNO3KKB+9LWuU2Lt4uCNyJG6n90kXBmyiCVINlnvp5T?= =?us-ascii?Q?k/cF8U8jZPAnyqbBeyBufjWKbUrTTeTTBYdOFMJVkrDcgmSqEtNkhGQR8iex?= =?us-ascii?Q?5q7Hf/OFMYTBRFRAJnrrdiWZ6/f/qG6DJAMQk2+Sf97kIUu+v4NmdTMcFgEc?= =?us-ascii?Q?Akqu0GLk7FKig5/E0zDcPbireeNSe7T13GNSHXgFr/gHXrP0oUUrq9flZPcd?= =?us-ascii?Q?WE//sT5tQuxzvmo8M3zIW+ueEM7/+gx/SfgZg9qLQYwFROcI22Tzhzg5PAxg?= =?us-ascii?Q?IydyRD7sxIpmgsq1IvmVeHpuuy25jYGy/8T9wQqn0ly21BbZ+zW+MoCKJczQ?= =?us-ascii?Q?kgJfsyEyszMcH32S4wjHeeiAqktyqIqOeDrMSYoAaDABm3un8hs7j5P1AHfV?= =?us-ascii?Q?opcpUZqvFtdHVdkSI+tGbqs2yMT1M0WjO98fFRjwLC6zHlgKEXYqtENfHIDm?= =?us-ascii?Q?0A5PMktxMC7e4u1bXSfJetqdd9CWtN8cOOUYqXcefYsz/nvgxkrNq3FQQ5iK?= =?us-ascii?Q?VVHMtnxZ4gAyEbxWoNjsnj90eOQDX51mMoUlWPXvXE4SXGZBPZ4lLioFZt7T?= =?us-ascii?Q?8Hicirp/SvN3woJrdwuOM6C2elLk2CKFC0ArAYRK+J8bTMBDS3MCtVzERfph?= =?us-ascii?Q?t4NI1XeSRjjsrxMIA5rWOuZhssGvVeVVs/imVAnnJr6+RlmSUu1pZqhoLoOG?= =?us-ascii?Q?r79b1JheriOCQ+isjvoMMYSETLY6BVBPMJOv7DtDWcIbNLVKfighRZ0t8TQU?= =?us-ascii?Q?JMGDlyRNgD9Wb4+rXtms6yz6KHhDdrlWxY6hT77WR9CMlcbkC04o79pevxeB?= =?us-ascii?Q?BkFE+i7jPJ+knw8NukWZWRaRLJ9DiTBGB9vJPWoFtNwPJvNtFDm7cV0ztfAL?= =?us-ascii?Q?4Vj5lp9MBpQogW8W31XTEKc8tVSOJCGfnmus9/jaer5DJ8CO9/DtjNYRZOam?= =?us-ascii?Q?Wt7Iv5uRDq8d3Lv5iOfgQ1QU79j4+MuZfgA4ad1QyxS5nh0O2s8RSiaOG8U6?= =?us-ascii?Q?qdEOaVT9g1/9O0gEuzw+KyfcgcEoHCGg6bmlOtxNG/Yh2iXBEHGKfuCjy3fL?= =?us-ascii?Q?smlD+iBaIPwAwOZ+1gZmjAPKoV7UOweIRiAGQ1gB4pQWEpLeJnc0kSFhxG7r?= =?us-ascii?Q?SVc9QTGV4NhfvV5HKzGd?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cf4f4d40-48d0-4154-2360-08dbbedf020f X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 22:22:02.6990 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8P250MB0393 Subject: [FFmpeg-devel] [PATCH 51/61] avcodec/aacdec_common: Apply offset for SBR VLCs during init X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: This avoids having to apply it later after every get_vlc2(). Signed-off-by: Andreas Rheinhardt --- libavcodec/aacdec_common.c | 6 +++++- libavcodec/aacsbr.h | 3 --- libavcodec/aacsbr_template.c | 26 ++++++-------------------- 3 files changed, 11 insertions(+), 24 deletions(-) diff --git a/libavcodec/aacdec_common.c b/libavcodec/aacdec_common.c index 6a592600dc..4af60e8c7c 100644 --- a/libavcodec/aacdec_common.c +++ b/libavcodec/aacdec_common.c @@ -269,6 +269,10 @@ static const uint8_t sbr_huffman_nb_codes[] = { 121, 121, 49, 49, 63, 63, 25, 25, 63, 25 }; +static const int8_t sbr_vlc_offsets[10] = { + -60, -60, -24, -24, -31, -31, -12, -12, -31, -12 +}; + const VLCElem *ff_aac_sbr_vlc[10]; static av_cold void aacdec_common_init(void) @@ -305,7 +309,7 @@ static av_cold void aacdec_common_init(void) ff_vlc_init_tables_from_lengths(&state, 9, sbr_huffman_nb_codes[i], &tab[0][1], 2, &tab[0][0], 2, 1, - 0, 0); + sbr_vlc_offsets[i], 0); tab += sbr_huffman_nb_codes[i]; } } diff --git a/libavcodec/aacsbr.h b/libavcodec/aacsbr.h index 0d182f822c..3a19fe1c7e 100644 --- a/libavcodec/aacsbr.h +++ b/libavcodec/aacsbr.h @@ -66,9 +66,6 @@ enum { EXTENSION_ID_PS = 2, }; -static const int8_t vlc_sbr_lav[10] = - { 60, 60, 24, 24, 31, 31, 12, 12, 31, 12 }; - /** Initialize SBR. */ void AAC_RENAME(ff_aac_sbr_init)(void); /** Initialize one SBR context. */ diff --git a/libavcodec/aacsbr_template.c b/libavcodec/aacsbr_template.c index a82be8a8d5..98e9fd8fed 100644 --- a/libavcodec/aacsbr_template.c +++ b/libavcodec/aacsbr_template.c @@ -804,7 +804,6 @@ static int read_sbr_envelope(AACContext *ac, SpectralBandReplication *sbr, GetBi int bits; int i, j, k; const VLCElem *t_huff, *f_huff; - int t_lav, f_lav; const int delta = (ch == 1 && sbr->bs_coupling == 1) + 1; const int odd = sbr->n[1] & 1; @@ -812,29 +811,21 @@ static int read_sbr_envelope(AACContext *ac, SpectralBandReplication *sbr, GetBi if (ch_data->bs_amp_res) { bits = 5; t_huff = ff_aac_sbr_vlc[T_HUFFMAN_ENV_BAL_3_0DB]; - t_lav = vlc_sbr_lav[T_HUFFMAN_ENV_BAL_3_0DB]; f_huff = ff_aac_sbr_vlc[F_HUFFMAN_ENV_BAL_3_0DB]; - f_lav = vlc_sbr_lav[F_HUFFMAN_ENV_BAL_3_0DB]; } else { bits = 6; t_huff = ff_aac_sbr_vlc[T_HUFFMAN_ENV_BAL_1_5DB]; - t_lav = vlc_sbr_lav[T_HUFFMAN_ENV_BAL_1_5DB]; f_huff = ff_aac_sbr_vlc[F_HUFFMAN_ENV_BAL_1_5DB]; - f_lav = vlc_sbr_lav[F_HUFFMAN_ENV_BAL_1_5DB]; } } else { if (ch_data->bs_amp_res) { bits = 6; t_huff = ff_aac_sbr_vlc[T_HUFFMAN_ENV_3_0DB]; - t_lav = vlc_sbr_lav[T_HUFFMAN_ENV_3_0DB]; f_huff = ff_aac_sbr_vlc[F_HUFFMAN_ENV_3_0DB]; - f_lav = vlc_sbr_lav[F_HUFFMAN_ENV_3_0DB]; } else { bits = 7; t_huff = ff_aac_sbr_vlc[T_HUFFMAN_ENV_1_5DB]; - t_lav = vlc_sbr_lav[T_HUFFMAN_ENV_1_5DB]; f_huff = ff_aac_sbr_vlc[F_HUFFMAN_ENV_1_5DB]; - f_lav = vlc_sbr_lav[F_HUFFMAN_ENV_1_5DB]; } } @@ -843,7 +834,7 @@ static int read_sbr_envelope(AACContext *ac, SpectralBandReplication *sbr, GetBi // bs_freq_res[0] == bs_freq_res[bs_num_env] from prev frame if (ch_data->bs_freq_res[i + 1] == ch_data->bs_freq_res[i]) { for (j = 0; j < sbr->n[ch_data->bs_freq_res[i + 1]]; j++) { - ch_data->env_facs_q[i + 1][j] = ch_data->env_facs_q[i][j] + delta * (get_vlc2(gb, t_huff, 9, 3) - t_lav); + ch_data->env_facs_q[i + 1][j] = ch_data->env_facs_q[i][j] + delta * get_vlc2(gb, t_huff, 9, 3); if (ch_data->env_facs_q[i + 1][j] > 127U) { av_log(ac->avctx, AV_LOG_ERROR, "env_facs_q %d is invalid\n", ch_data->env_facs_q[i + 1][j]); return AVERROR_INVALIDDATA; @@ -852,7 +843,7 @@ static int read_sbr_envelope(AACContext *ac, SpectralBandReplication *sbr, GetBi } else if (ch_data->bs_freq_res[i + 1]) { for (j = 0; j < sbr->n[ch_data->bs_freq_res[i + 1]]; j++) { k = (j + odd) >> 1; // find k such that f_tablelow[k] <= f_tablehigh[j] < f_tablelow[k + 1] - ch_data->env_facs_q[i + 1][j] = ch_data->env_facs_q[i][k] + delta * (get_vlc2(gb, t_huff, 9, 3) - t_lav); + ch_data->env_facs_q[i + 1][j] = ch_data->env_facs_q[i][k] + delta * get_vlc2(gb, t_huff, 9, 3); if (ch_data->env_facs_q[i + 1][j] > 127U) { av_log(ac->avctx, AV_LOG_ERROR, "env_facs_q %d is invalid\n", ch_data->env_facs_q[i + 1][j]); return AVERROR_INVALIDDATA; @@ -861,7 +852,7 @@ static int read_sbr_envelope(AACContext *ac, SpectralBandReplication *sbr, GetBi } else { for (j = 0; j < sbr->n[ch_data->bs_freq_res[i + 1]]; j++) { k = j ? 2*j - odd : 0; // find k such that f_tablehigh[k] == f_tablelow[j] - ch_data->env_facs_q[i + 1][j] = ch_data->env_facs_q[i][k] + delta * (get_vlc2(gb, t_huff, 9, 3) - t_lav); + ch_data->env_facs_q[i + 1][j] = ch_data->env_facs_q[i][k] + delta * get_vlc2(gb, t_huff, 9, 3); if (ch_data->env_facs_q[i + 1][j] > 127U) { av_log(ac->avctx, AV_LOG_ERROR, "env_facs_q %d is invalid\n", ch_data->env_facs_q[i + 1][j]); return AVERROR_INVALIDDATA; @@ -871,7 +862,7 @@ static int read_sbr_envelope(AACContext *ac, SpectralBandReplication *sbr, GetBi } else { ch_data->env_facs_q[i + 1][0] = delta * get_bits(gb, bits); // bs_env_start_value_balance for (j = 1; j < sbr->n[ch_data->bs_freq_res[i + 1]]; j++) { - ch_data->env_facs_q[i + 1][j] = ch_data->env_facs_q[i + 1][j - 1] + delta * (get_vlc2(gb, f_huff, 9, 3) - f_lav); + ch_data->env_facs_q[i + 1][j] = ch_data->env_facs_q[i + 1][j - 1] + delta * get_vlc2(gb, f_huff, 9, 3); if (ch_data->env_facs_q[i + 1][j] > 127U) { av_log(ac->avctx, AV_LOG_ERROR, "env_facs_q %d is invalid\n", ch_data->env_facs_q[i + 1][j]); return AVERROR_INVALIDDATA; @@ -892,25 +883,20 @@ static int read_sbr_noise(AACContext *ac, SpectralBandReplication *sbr, GetBitCo { int i, j; const VLCElem *t_huff, *f_huff; - int t_lav, f_lav; int delta = (ch == 1 && sbr->bs_coupling == 1) + 1; if (sbr->bs_coupling && ch) { t_huff = ff_aac_sbr_vlc[T_HUFFMAN_NOISE_BAL_3_0DB]; - t_lav = vlc_sbr_lav[T_HUFFMAN_NOISE_BAL_3_0DB]; f_huff = ff_aac_sbr_vlc[F_HUFFMAN_ENV_BAL_3_0DB]; - f_lav = vlc_sbr_lav[F_HUFFMAN_ENV_BAL_3_0DB]; } else { t_huff = ff_aac_sbr_vlc[T_HUFFMAN_NOISE_3_0DB]; - t_lav = vlc_sbr_lav[T_HUFFMAN_NOISE_3_0DB]; f_huff = ff_aac_sbr_vlc[F_HUFFMAN_ENV_3_0DB]; - f_lav = vlc_sbr_lav[F_HUFFMAN_ENV_3_0DB]; } for (i = 0; i < ch_data->bs_num_noise; i++) { if (ch_data->bs_df_noise[i]) { for (j = 0; j < sbr->n_q; j++) { - ch_data->noise_facs_q[i + 1][j] = ch_data->noise_facs_q[i][j] + delta * (get_vlc2(gb, t_huff, 9, 2) - t_lav); + ch_data->noise_facs_q[i + 1][j] = ch_data->noise_facs_q[i][j] + delta * get_vlc2(gb, t_huff, 9, 2); if (ch_data->noise_facs_q[i + 1][j] > 30U) { av_log(ac->avctx, AV_LOG_ERROR, "noise_facs_q %d is invalid\n", ch_data->noise_facs_q[i + 1][j]); return AVERROR_INVALIDDATA; @@ -919,7 +905,7 @@ static int read_sbr_noise(AACContext *ac, SpectralBandReplication *sbr, GetBitCo } else { ch_data->noise_facs_q[i + 1][0] = delta * get_bits(gb, 5); // bs_noise_start_value_balance or bs_noise_start_value_level for (j = 1; j < sbr->n_q; j++) { - ch_data->noise_facs_q[i + 1][j] = ch_data->noise_facs_q[i + 1][j - 1] + delta * (get_vlc2(gb, f_huff, 9, 3) - f_lav); + ch_data->noise_facs_q[i + 1][j] = ch_data->noise_facs_q[i + 1][j - 1] + delta * get_vlc2(gb, f_huff, 9, 3); if (ch_data->noise_facs_q[i + 1][j] > 30U) { av_log(ac->avctx, AV_LOG_ERROR, "noise_facs_q %d is invalid\n", ch_data->noise_facs_q[i + 1][j]); return AVERROR_INVALIDDATA; -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".