# HG changeset patch # User Mychaela Falconia # Date 1714974331 0 # Node ID 693ea1d5cf1e4db1c929e1a7a61e21943ae28f6a # Parent 32bc48faec4b844d91fc6d329fa8da8b0b23d9a9 libtwamr: integrate int_lsf.c diff -r 32bc48faec4b -r 693ea1d5cf1e libtwamr/Makefile --- a/libtwamr/Makefile Mon May 06 05:35:21 2024 +0000 +++ b/libtwamr/Makefile Mon May 06 05:45:31 2024 +0000 @@ -7,8 +7,8 @@ d_gain_p.o d_plsf.o d_plsf_3.o d_plsf_5.o dec_gain.o dec_lag3.o \ dec_lag6.o dhf_check.o dhf_tables.o e_homing.o ec_gains.o enc_lag3.o \ enc_lag6.o ex_ctrl.o g_adapt.o g_code.o g_pitch.o gain_q.o gains_tab.o \ - gc_pred.o gmed_n.o graytab.o hp_max.o int_lpc.o inv_sqrt.o log2.o \ - lsfwt.o lsp_az.o lsp_lsf.o mac_32.o oper_32b.o pow2.o prmno.o \ + gc_pred.o gmed_n.o graytab.o hp_max.o int_lpc.o int_lsf.o inv_sqrt.o \ + log2.o lsfwt.o lsp_az.o lsp_lsf.o mac_32.o oper_32b.o pow2.o prmno.o \ q_gain_c.o q_gain_p.o q_plsf.o q_plsf3_tab.o q_plsf5_tab.o q_plsf_3.o \ q_plsf_5.o qgain475.o qgain795.o qua_gain.o qua_gain_tab.o reorder.o \ s10_8pf.o set_sign.o sqrt_l.o tls_flags.o window.o diff -r 32bc48faec4b -r 693ea1d5cf1e libtwamr/int_lsf.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libtwamr/int_lsf.c Mon May 06 05:45:31 2024 +0000 @@ -0,0 +1,112 @@ +/* +******************************************************************************** +* +* GSM AMR-NB speech codec R98 Version 7.6.0 December 12, 2001 +* R99 Version 3.3.0 +* REL-4 Version 4.1.0 +* +******************************************************************************** +* +* File : int_lsf.c +* +******************************************************************************** +*/ +/* +******************************************************************************** +* MODULE INCLUDE FILE AND VERSION ID +******************************************************************************** +*/ +#include "namespace.h" +#include "int_lsf.h" + +/* +******************************************************************************** +* INCLUDE FILES +******************************************************************************** +*/ +#include "typedef.h" +#include "basic_op.h" +#include "no_count.h" +#include "cnst.h" + +/* +******************************************************************************** +* LOCAL VARIABLES AND TABLES +******************************************************************************** +*/ +/* +*--------------------------------------* +* Constants (defined in cnst.h) * +*--------------------------------------* +* M : LSF order * +*--------------------------------------* +*/ + +/* +******************************************************************************** +* PUBLIC PROGRAM CODE +******************************************************************************** +*/ + +/* +************************************************************************** +* +* Function : Int_lsf +* Purpose : Interpolates the LSFs for selected subframe +* Description : The 20 ms speech frame is divided into 4 subframes. +* The LSFs are interpolated at the 1st, 2nd and 3rd +* subframe and only forwarded at the 4th subframe. +* +* |------|------|------|------| +* sf1 sf2 sf3 sf4 +* F0 F1 +* +* sf1: 3/4 F0 + 1/4 F1 sf3: 1/4 F0 + 3/4 F1 +* sf2: 1/2 F0 + 1/2 F1 sf4: F1 +* Returns : void +* +************************************************************************** +*/ +void Int_lsf( + Word16 lsf_old[], /* i : LSF vector at the 4th SF of past frame */ + Word16 lsf_new[], /* i : LSF vector at the 4th SF of present frame */ + Word16 i_subfr, /* i : Pointer to current sf (equal to 0,40,80 or 120) */ + Word16 lsf_out[] /* o : interpolated LSF parameters for current sf */ +) +{ + Word16 i; + + if ( i_subfr == 0 ) + { + test (); + for (i = 0; i < M; i++) { + lsf_out[i] = add(sub(lsf_old[i], shr(lsf_old[i], 2)), shr(lsf_new[i], 2)); + move16 (); + } + } + else if ( sub(i_subfr, 40) == 0 ) + { + test (); test (); + for (i = 0; i < M; i++) { + lsf_out[i] = add(shr(lsf_old[i],1), shr(lsf_new[i], 1) ); + move16 (); + } + } + else if ( sub(i_subfr, 80) == 0 ) + { + test (); test (); test (); + for (i = 0; i < M; i++) { + lsf_out[i] = add(shr(lsf_old[i], 2), sub(lsf_new[i], shr(lsf_new[i], 2))); + move16 (); + } + } + else if ( sub(i_subfr, 120) == 0 ) + { + test (); test (); test (); test (); + for (i = 0; i < M; i++) { + lsf_out[i] = lsf_new[i]; move16 (); + } + } + + return; +} diff -r 32bc48faec4b -r 693ea1d5cf1e libtwamr/int_lsf.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libtwamr/int_lsf.h Mon May 06 05:45:31 2024 +0000 @@ -0,0 +1,63 @@ +/* +******************************************************************************** +* +* GSM AMR-NB speech codec R98 Version 7.6.0 December 12, 2001 +* R99 Version 3.3.0 +* REL-4 Version 4.1.0 +* +******************************************************************************** +* +* File : int_lsf.h +* Purpose : Interpolates the LSFs +* +******************************************************************************** +*/ +#ifndef int_lsf_h +#define int_lsf_h "$Id $" + +/* +******************************************************************************** +* INCLUDE FILES +******************************************************************************** +*/ +#include "typedef.h" + +/* +******************************************************************************** +* DEFINITION OF DATA TYPES +******************************************************************************** +*/ + +/* +******************************************************************************** +* DECLARATION OF PROTOTYPES +******************************************************************************** +*/ + +/* +************************************************************************** +* +* Function : Int_lsf +* Purpose : Interpolates the LSFs for selected subframe +* Description : The 20 ms speech frame is divided into 4 subframes. +* The LSFs are interpolated at the 1st, 2nd and 3rd +* subframe and only forwarded at the 4th subframe. +* +* |------|------|------|------| +* sf1 sf2 sf3 sf4 +* F0 F1 +* +* sf1: 3/4 F0 + 1/4 F1 sf3: 1/4 F0 + 3/4 F1 +* sf2: 1/2 F0 + 1/2 F1 sf4: F1 +* Returns : void +* +************************************************************************** +*/ +void Int_lsf ( + Word16 lsf_old[], /* i : LSF vector at the 4th SF of past frame */ + Word16 lsf_new[], /* i : LSF vector at the 4th SF of present frame */ + Word16 i_subfr, /* i : Pointer to current sf (equal to 0,40,80 or 120) */ + Word16 lsf_out[] /* o : interpolated LSF parameters for current sf */ +); + +#endif diff -r 32bc48faec4b -r 693ea1d5cf1e libtwamr/namespace.list --- a/libtwamr/namespace.list Mon May 06 05:35:21 2024 +0000 +++ b/libtwamr/namespace.list Mon May 06 05:45:31 2024 +0000 @@ -23,7 +23,7 @@ D_plsf_reset D_plsf_5 D_plsf_3 Init_D_plsf_3 Enc_lag3 Enc_lag6 Ex_ctrl G_code G_pitch -Int_lpc_1and3 Int_lpc_1and3_2 Int_lpc_1to3 Int_lpc_1to3_2 +Int_lpc_1and3 Int_lpc_1and3_2 Int_lpc_1to3 Int_lpc_1to3_2 Int_lsf Lsf_lsp Lsp_lsf Reorder_lsf Lsf_wt Lsp_Az Q_plsf_reset Q_plsf_3 Q_plsf_5 Qua_gain