cleaning (59abd0e4) · Commits · SA4 / Audio / IVAS BASOP

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -119,7 +119,6 @@
		#define SIMPLIFY_SCALING_OLD_INP
		#define REMOVE_UNUSED_BUFFER_CORE_ENC
		#define REMOVE_SCALING_SHB_SPEECH_BE
		#define REMOVE_SCALING_SHB_SPEECH_NONBE
		#define SCALING_SWB_SPEECH_32

		/* #################### End BE switches ################################## */

lib_com/prot_fx.h

+5 −5

Original line number	Diff line number	Diff line
		@@ -10491,12 +10491,12 @@ void swb_pre_proc_ivas_fx(
		Encoder_State st, / i/o: encoder state structure */
		Word16 new_swb_speech, / o : original input signal at 32kHz - Q0 */
		#ifndef SCALING_SWB_SPEECH_32
		Word32 new_swb_speech_fx, / o : original input signal at 32kHz - Q0 */
		Word32 new_swb_speech_fx, / o : original input signal at 32kHz - Q - q_reImBuffer */
		#endif
		Word16 shb_speech, / o : SHB target signal (6-14kHz) at 16kHz - Q0*/
		#ifndef REMOVE_SCALING_SHB_SPEECH_BE
		Word16 shb_speech, / o : SHB target signal (6-14kHz) at 16kHz- Q(Q_shb_spch) */
		#endif
		Word16 *Q_shb_spch,
		#endif
		Word32 realBuffer[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i : real buffer Q - q_reImbuffer */
		Word32 imagBuffer[CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i : imag buffer Q - q_reImbuffer */
		Word16 q_reImBuffer, /* i : scale data of real and imag CLDFB buffers*/

lib_enc/ivas_core_enc_fx.c

+8 −10

Original line number	Diff line number	Diff line
		@@ -887,35 +887,33 @@ ivas_error ivas_core_enc_fx(
		* Inter-channel BWE encoding
		-------------------------------------------------------------------/

		#ifndef SCALING_SWB_SPEECH_32
		Word16 q_new_swb_speech_buffer = getScaleFactor16( new_swb_speech_buffer_fx_16, L_FRAME48k + STEREO_DFT_OVL_MAX );
		Scale_sig( new_swb_speech_buffer_fx_16, L_FRAME48k + STEREO_DFT_OVL_MAX, q_new_swb_speech_buffer ); // st->q_inp+q_new_swb_speech_buffer
		q_new_swb_speech_buffer = add( st->q_inp, q_new_swb_speech_buffer );

		#endif
		test();
		test();
		IF( n == 0 && GE_32( input_Fs, 32000 ) && hStereoICBWE != NULL )
		{
		#ifndef SCALING_SWB_SPEECH_32
		Word32 voice_factors_fx32[CPE_CHANNELS][NB_SUBFR16k];
		#endif
		stereo_icBWE_preproc_fx( hCPE, input_frame, new_swb_speech_buffer_fx_16 /tmp buffer/, q_new_swb_speech_buffer );
		#else
		stereo_icBWE_preproc_fx( hCPE, input_frame, new_swb_speech_buffer_fx_16 /tmp buffer/, st->q_inp );
		#endif

		q_new_swb_speech_buffer = add( q_new_swb_speech_buffer, Q16 );
		#ifndef SCALING_SWB_SPEECH_32
		q_new_swb_speech_buffer = add( q_new_swb_speech_buffer, Q16 );
		Copy_Scale_sig_16_32_no_sat( new_swb_speech_buffer_fx_16, new_swb_speech_buffer_fx, L_FRAME48k + STEREO_DFT_OVL_MAX, Q16 ); // q_new_swb_speech_buffer+st->q_inp - 16 - > q_new_swb_speech_buffer+st->q_inp
		Copy_Scale_sig_16_32_no_sat( voice_factors_fx[0], voice_factors_fx32[0], NB_SUBFR16k, Q16 ); // Q31
		#endif

		#ifdef REMOVE_SCALING_SHB_SPEECH_BEaaa
		Q_shb_spch = add( getScaleFactor16( shb_speech_fx, L_FRAME16k ), Q16 );
		Copy_Scale_sig_16_32_no_sat( shb_speech_fx, shb_speech_fx32, L_FRAME16k, Q_shb_spch ); // Q_shb_spch
		#endif

		#ifdef SCALING_SWB_SPEECH_32
		#ifdef REMOVE_SCALING_SHB_SPEECH_BE
		stereo_icBWE_enc_fx( hCPE, shb_speech_fx, new_swb_speech_buffer_fx_16, sub( Q31, q_new_swb_speech_buffer ), voice_factors_fx[0] );
		stereo_icBWE_enc_fx( hCPE, shb_speech_fx, new_swb_speech_buffer_fx_16, st->q_inp, voice_factors_fx[0] );
		#else
		stereo_icBWE_enc_fx( hCPE, shb_speech_fx32, sub( Q31, Q_shb_spch ), new_swb_speech_buffer_fx_16, sub( Q31, q_new_swb_speech_buffer ), voice_factors_fx[0] );
		stereo_icBWE_enc_fx( hCPE, shb_speech_fx32, sub( Q31, Q_shb_spch ), new_swb_speech_buffer_fx_16, st->q_inp, voice_factors_fx[0] );
		#endif
		#else
		stereo_icBWE_enc_fx( hCPE, shb_speech_fx32, sub( Q31, Q_shb_spch ), new_swb_speech_buffer_fx, sub( Q31, q_new_swb_speech_buffer ), voice_factors_fx32[0] );

lib_enc/ivas_stereo_icbwe_enc_fx.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -622,11 +622,11 @@ void stereo_icBWE_enc_fx(
		#ifdef REMOVE_SCALING_SHB_SPEECH_BE
		const Word16 shb_speech_ref_fx16[], /* i : SHB speech ref channel Q0*/
		#else
		const Word32 shb_speech_ref_fx[], /* i : SHB speech ref channel Q31-shb_speech_ref_e*/
		const Word32 shb_speech_ref_fx[], /* i : SHB speech ref channel shb_speech_ref_e*/
		const Word16 shb_speech_ref_e, /* i : SHB speech ref channel */
		#endif
		#ifdef SCALING_SWB_SPEECH_32
		Word16 shb_speech_nonref_fx_16[], /* i/o: SHB speech non-ref channel Q15-shb_speech_nonref_e*/
		Word16 shb_speech_nonref_fx_16[], /* i/o: SHB speech non-ref channel shb_speech_nonref_e*/
		#else
		Word32 shb_speech_nonref_fx[], /* i/o: SHB speech non-ref channel Q31-shb_speech_nonref_e*/
		#endif
		@@ -672,6 +672,7 @@ void stereo_icBWE_enc_fx(
		Word32 shb_speech_nonref_fx[L_FRAME48k + STEREO_DFT_OVL_MAX];
		Word32 voice_factors_fx[NB_SUBFR16k];

		shb_speech_nonref_e = Q15 - shb_speech_nonref_e;
		Copy_Scale_sig_16_32_no_sat( shb_speech_nonref_fx_16, shb_speech_nonref_fx, L_FRAME48k + STEREO_DFT_OVL_MAX, Q16 ); // q_new_swb_speech_buffer+st->q_inp - 16 - > q_new_swb_speech_buffer+st->q_inp
		Copy_Scale_sig_16_32_no_sat( voice_factors_fx16, voice_factors_fx, NB_SUBFR16k, Q16 ); // Q31
		#endif

lib_enc/prot_fx_enc.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -691,7 +691,7 @@ void swb_tbe_enc_fx(
		void swb_tbe_enc_ivas_fx(
		Encoder_State st_fx, / i/o: encoder state structure */
		STEREO_ICBWE_ENC_HANDLE hStereoICBWE, /* i/o: IC-BWE state structure */
		Word16 shb_speech_fx, / i : SHB target signal (6-14kHz) at 16kHz Q_shb */
		Word16 shb_speech_fx, / i : SHB target signal (6-14kHz) at 16kHz Q0 */
		Word32 bwe_exc_extended, / i : bandwidth extended exciatation 2 * Q_new */
		const Word16 voice_factors_fx[], /* i : voicing factors Q15 */
		Word16 White_exc16k_fx, / o : shaped white excitation for the FB TBE Q_white_exc */