merge FIX_2280_REDUCTION_UNNECESSARY_SCALING2 into FIX_2280_REDUCTION_UNNECESSARY_SCALING (b09f8a99) · Commits · SA4 / Audio / IVAS BASOP

lib_com/options.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -110,8 +110,7 @@
		#define FIX_2397_COPY_AQ_MDCT_CORE_BFI /* FhG: prevent copying of uninit memory in MDCT stereo core if bfi is set */
		#define HARMONIZE_TBE /* VA: harmonize core-coder TBE function duplications */
		#define FIX_2280_REDUCTION_UNNECESSARY_SCALING /* VA: reduction of unnecessary scaling */
		#define FIX_2280_REDUCTION_UNNECESSARY_SCALING_NONBE
		#define FIX_2280_REDUCTION_UNNECESSARY_SCALING2
		#define FIX_2280_REDUCTION_UNNECESSARY_SCALING_NONBE /* VA: reduction of unnecessary scaling, non-BE part */

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

lib_com/prot_fx.h

+2 −5

Original line number	Diff line number	Diff line
		@@ -7576,12 +7576,9 @@ ivas_error core_switching_post_dec_fx(
		Word16 synth, / i/o: output synthesis Qsynth*/
		#ifdef FIX_2280_REDUCTION_UNNECESSARY_SCALING
		Word32 output_fx, / i/o: LB synth/upsampled LB synth Q11*/
		#else
		Word32 output_fx, / i/o: LB synth/upsampled LB synth Q4*/
		#endif
		#ifdef FIX_2280_REDUCTION_UNNECESSARY_SCALING2
		Word32 output_mem_fx32[], /* i : OLA memory from last TCX/HQ frame Qx*/
		#else
		Word32 output_fx, / i/o: LB synth/upsampled LB synth Q4*/
		Word16 output_mem_fx[], /* i : OLA memory from last TCX/HQ frame Qx*/
		#endif
		const Word16 use_cldfb_for_dft, /* i : flag to use of CLDFB for DFT Stereo Q0*/

lib_dec/core_switching_dec_fx.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -220,7 +220,7 @@ ivas_error core_switching_post_dec_fx(
		#else
		Word32 output_fx, / i/o: LB synth/upsampled LB synth Q4*/
		#endif
		#ifdef FIX_2280_REDUCTION_UNNECESSARY_SCALING2
		#ifdef FIX_2280_REDUCTION_UNNECESSARY_SCALING
		Word32 output_mem_fx32[], /* i : OLA memory from last TCX/HQ frame Qx*/
		#else
		Word16 output_mem_fx[], /* i : OLA memory from last TCX/HQ frame Qx*/
		@@ -627,7 +627,7 @@ ivas_error core_switching_post_dec_fx(
		hHQ_core->Q_old_wtda = Qtmp;
		move16();
		}
		#ifdef FIX_2280_REDUCTION_UNNECESSARY_SCALING2
		#ifdef FIX_2280_REDUCTION_UNNECESSARY_SCALING
		Word16 output_mem_fx[NS2SA( 48000, STEREO_DFT32MS_OVL_NS )];
		IF( output_mem_fx32 != NULL )
		{

lib_dec/ivas_core_dec_fx.c

+3 −6

Original line number	Diff line number	Diff line
		@@ -837,7 +837,7 @@ ivas_error ivas_core_dec_fx(
		/core_switching_post_dec/
		Q_synth = add( sub( 15, e_sig[0] ), st->Q_syn_factor );

		#ifndef FIX_2280_REDUCTION_UNNECESSARY_SCALING2
		#ifndef FIX_2280_REDUCTION_UNNECESSARY_SCALING
		/------------------fix-to-fix-end-----------------------/

		Word16 output_mem_16_fx[L_FRAME48k];
		@@ -853,12 +853,9 @@ ivas_error ivas_core_dec_fx(
		p_output_mem_16 = NULL;
		set16_fx( output_mem_16_fx, 0, NS2SA_FX2( st->output_Fs, 3125000 ) );
		}
		#endif
		#ifndef FIX_2280_REDUCTION_UNNECESSARY_SCALING

		Scale_sig32( output_32_fx[n], L_FRAME48k, Q4 - Q11 ); // Q4

		#endif
		#ifndef FIX_2280_REDUCTION_UNNECESSARY_SCALING2
		/size of synth is choosen as delay comp to start with/
		/-------------------cldfb-start-------------------------/
		#endif
		@@ -920,7 +917,7 @@ ivas_error ivas_core_dec_fx(
		Copy_Scale_sig_16_32_no_sat( synth_16_fx[n], hSCE->save_synth_fx, output_frame, sub( hSCE->q_save_synth_fx, Q_synth ) ); // q_save_synth_fx
		}

		#ifdef FIX_2280_REDUCTION_UNNECESSARY_SCALING2
		#ifdef FIX_2280_REDUCTION_UNNECESSARY_SCALING
		IF( NE_32( ( error = core_switching_post_dec_fx( st, synth_16_fx[n], output_32_fx[n], p_output_mem_fx, use_cldfb_for_dft, output_frame, 0 /core_switching_flag/, sba_dirac_stereo_flag, nchan_out, last_element_mode, &Q_synth ) ), IVAS_ERR_OK ) )
		#else
		IF( NE_32( ( error = core_switching_post_dec_fx( st, synth_16_fx[n], output_32_fx[n], p_output_mem_16, use_cldfb_for_dft, output_frame, 0 /core_switching_flag/, sba_dirac_stereo_flag, nchan_out, last_element_mode, &Q_synth ) ), IVAS_ERR_OK ) )

lib_dec/ivas_mct_dec_fx.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -371,7 +371,7 @@ ivas_error ivas_mct_dec_fx(
		}

		/* Postprocessing for ACELP/MDCT core switching and synchronization */
		#ifndef FIX_2280_REDUCTION_UNNECESSARY_SCALING2
		#ifndef FIX_2280_REDUCTION_UNNECESSARY_SCALING
		Word16 output_mem_fx[L_FRAME48k];
		IF( hCPE->output_mem_fx[1] != NULL )
		{
		@@ -396,7 +396,7 @@ ivas_error ivas_mct_dec_fx(
		dirac_stereo_flag = 0;
		}

		#ifdef FIX_2280_REDUCTION_UNNECESSARY_SCALING2
		#ifdef FIX_2280_REDUCTION_UNNECESSARY_SCALING
		IF( NE_32( ( error = core_switching_post_dec_fx( sts[n], synth_fx[n], output_fx[( cpe_id * CPE_CHANNELS ) + n], hCPE->output_mem_fx[1], 0, output_frame, 0 /core_switching_flag/, dirac_stereo_flag, -1, hCPE->last_element_mode, &Q_synth ) ), IVAS_ERR_OK ) )
		#else
		IF( NE_32( ( error = core_switching_post_dec_fx( sts[n], synth_fx[n], output_fx[( cpe_id * CPE_CHANNELS ) + n], output_mem_fx, 0, output_frame, 0 /core_switching_flag/, dirac_stereo_flag, -1, hCPE->last_element_mode, &Q_synth ) ), IVAS_ERR_OK ) )