From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 0B9C54E336 for ; Mon, 9 Jun 2025 10:06:22 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id F30DC68CAF5; Mon, 9 Jun 2025 13:06:19 +0300 (EEST) Received: from mx.sdf.org (mx.sdf.org [205.166.94.24]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 1C82D68CAB3 for ; Mon, 9 Jun 2025 13:06:12 +0300 (EEST) Received: from 4a9ccf2f9e2070d819139a1ca4cfb063 ([1.145.244.154]) (authenticated (0 bits)) by mx.sdf.org (8.18.1/8.14.3) with ESMTPSA id 559A63La018218 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits) verified NO) for ; Mon, 9 Jun 2025 10:06:09 GMT Date: Mon, 9 Jun 2025 20:06:02 +1000 From: Peter Ross To: ffmpeg-devel@ffmpeg.org Message-ID: <04afb984e03a08909f1df886ff4d44b0201ad7f0.1749463495.git.pross@xvid.org> References: MIME-Version: 1.0 In-Reply-To: Subject: [FFmpeg-devel] [PATCHv3 1/8] avcodec/g728_template: do_hybrid_window() template 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 Content-Type: multipart/mixed; boundary="===============5661901892897373339==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============5661901892897373339== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="SOBhax6oLc4o078m" Content-Disposition: inline --SOBhax6oLc4o078m Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable intended for use by RealAudio 2.0 (28.8k) and G.728 decoders. --- libavcodec/g728_template.c | 65 ++++++++++++++++++++++++++++++++++++++ libavcodec/ra288.c | 50 ++--------------------------- 2 files changed, 68 insertions(+), 47 deletions(-) create mode 100644 libavcodec/g728_template.c diff --git a/libavcodec/g728_template.c b/libavcodec/g728_template.c new file mode 100644 index 0000000000..b60122ee37 --- /dev/null +++ b/libavcodec/g728_template.c @@ -0,0 +1,65 @@ +/* + * G.728 / RealAudio 2.0 (28.8K) decoder + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130= 1 USA + */ + +static void convolve(float *tgt, const float *src, int len, int n) +{ + for (; n >=3D 0; n--) + tgt[n] =3D ff_scalarproduct_float_c(src, src - n, len); + +} + +/** + * Hybrid window filtering, see blocks 36 and 49 of the G.728 specificatio= n. + * + * @param order filter order + * @param n input length + * @param non_rec number of non-recursive samples + * @param out filter output + * @param hist pointer to the input history of the filter + * @param out pointer to the non-recursive part of the output + * @param out2 pointer to the recursive part of the output + * @param window pointer to the windowing function table + */ +static void do_hybrid_window(void (*vector_fmul)(float *dst, const float *= src0, const float *src1, int len), + int order, int n, int non_rec, float *out, + float *hist, float *out2, const float *window) +{ + int i; + float buffer1[MAX_BACKWARD_FILTER_ORDER + 1]; + float buffer2[MAX_BACKWARD_FILTER_ORDER + 1]; + LOCAL_ALIGNED(32, float, work, [FFALIGN(MAX_BACKWARD_FILTER_ORDER + + MAX_BACKWARD_FILTER_LEN + + MAX_BACKWARD_FILTER_NONREC, 16= )]); + + av_assert2(order>=3D0); + + vector_fmul(work, window, hist, FFALIGN(order + n + non_rec, 16)); + + convolve(buffer1, work + order , n , order); + convolve(buffer2, work + order + n, non_rec, order); + + for (i=3D0; i <=3D order; i++) { + out2[i] =3D out2[i] * ATTEN + buffer1[i]; + out [i] =3D out2[i] + buffer2[i]; + } + + /* Multiply by the white noise correcting factor (WNCF). */ + *out *=3D 257.0 / 256.0; +} diff --git a/libavcodec/ra288.c b/libavcodec/ra288.c index aa499506b7..a1ee3f7eba 100644 --- a/libavcodec/ra288.c +++ b/libavcodec/ra288.c @@ -37,6 +37,8 @@ #define MAX_BACKWARD_FILTER_ORDER 36 #define MAX_BACKWARD_FILTER_LEN 40 #define MAX_BACKWARD_FILTER_NONREC 35 +#define ATTEN 0.5625 +#include "g728_template.c" =20 #define RA288_BLOCK_SIZE 5 #define RA288_BLOCKS_PER_FRAME 32 @@ -87,13 +89,6 @@ static av_cold int ra288_decode_init(AVCodecContext *avc= tx) return 0; } =20 -static void convolve(float *tgt, const float *src, int len, int n) -{ - for (; n >=3D 0; n--) - tgt[n] =3D ff_scalarproduct_float_c(src, src - n, len); - -} - static void decode(RA288Context *ractx, float gain, int cb_coef) { int i; @@ -131,45 +126,6 @@ static void decode(RA288Context *ractx, float gain, in= t cb_coef) ff_celp_lp_synthesis_filterf(block, ractx->sp_lpc, buffer, 5, 36); } =20 -/** - * Hybrid window filtering, see blocks 36 and 49 of the G.728 specificatio= n. - * - * @param order filter order - * @param n input length - * @param non_rec number of non-recursive samples - * @param out filter output - * @param hist pointer to the input history of the filter - * @param out pointer to the non-recursive part of the output - * @param out2 pointer to the recursive part of the output - * @param window pointer to the windowing function table - */ -static void do_hybrid_window(RA288Context *ractx, - int order, int n, int non_rec, float *out, - float *hist, float *out2, const float *window) -{ - int i; - float buffer1[MAX_BACKWARD_FILTER_ORDER + 1]; - float buffer2[MAX_BACKWARD_FILTER_ORDER + 1]; - LOCAL_ALIGNED(32, float, work, [FFALIGN(MAX_BACKWARD_FILTER_ORDER + - MAX_BACKWARD_FILTER_LEN + - MAX_BACKWARD_FILTER_NONREC, 16= )]); - - av_assert2(order>=3D0); - - ractx->vector_fmul(work, window, hist, FFALIGN(order + n + non_rec, 16= )); - - convolve(buffer1, work + order , n , order); - convolve(buffer2, work + order + n, non_rec, order); - - for (i=3D0; i <=3D order; i++) { - out2[i] =3D out2[i] * 0.5625 + buffer1[i]; - out [i] =3D out2[i] + buffer2[i]; - } - - /* Multiply by the white noise correcting factor (WNCF). */ - *out *=3D 257.0 / 256.0; -} - /** * Backward synthesis filter, find the LPC coefficients from past speech d= ata. */ @@ -180,7 +136,7 @@ static void backward_filter(RA288Context *ractx, { float temp[MAX_BACKWARD_FILTER_ORDER+1]; =20 - do_hybrid_window(ractx, order, n, non_rec, temp, hist, rec, window); + do_hybrid_window(ractx->vector_fmul, order, n, non_rec, temp, hist, re= c, window); =20 if (!compute_lpc_coefs(temp, order, lpc, 0, 1, 1)) ractx->vector_fmul(lpc, lpc, tab, FFALIGN(order, 16)); --=20 2.47.2 -- Peter (A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B) --SOBhax6oLc4o078m Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABECAB0WIQSpB+AvpuUM0jTNINJnYHnFrEDdawUCaEayCgAKCRBnYHnFrEDd a+A/AJ4yRkOOgwq+jkcHB13O8qcPWZMpowCeJbT9F4sHiu1nUlEK1DEbI9bUd4Y= =0xZi -----END PGP SIGNATURE----- --SOBhax6oLc4o078m-- --===============5661901892897373339== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ 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". --===============5661901892897373339==--