harmonize 'hBWE_FD' (298ebca0) · Commits · SA4 / Audio / IVAS BASOP

lib_com/prot_fx.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -6081,7 +6081,6 @@ void GenTransition_fx32(

		void GenTransition_WB_fx(
		TD_BWE_DEC_HANDLE hBWE_TD, /* i/o: TD BWE data handle */
		const Word16 prev_Qx, /* i : scaling of old_hb_synth */
		Word16 output, / o : synthesized transitions signal */
		const Word32 output_Fs /* i : output sampling rate */
		);
		@@ -6097,8 +6096,8 @@ void TBEreset_dec_fx(
		);

		void td_bwe_dec_init_fx(
		Decoder_State st_fx, / i/o: SHB decoder structure */
		TD_BWE_DEC_HANDLE hBWE_TD, /* i/o: TD BWE data handle */
		const Word16 extl, /* i : BWE extension layer */
		const Word32 output_Fs /* i : output sampling rate */
		);

lib_dec/cng_dec_fx.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -1700,13 +1700,13 @@ static void shb_CNG_decod_fx(
		/* rescale the Hilbert memories to Q0 */
		FOR( i = 0; i < HILBERT_MEM_SIZE; i++ )
		{
		hBWE_TD->genSHBsynth_Hilbert_Mem_fx[i] = L_shr( hBWE_TD->genSHBsynth_Hilbert_Mem_fx[i], st_fx->prev_Q_bwe_syn2 ); /* st_fx->prev_Q_bwe_syn2 */
		hBWE_TD->genSHBsynth_Hilbert_Mem_fx[i] = L_shr( hBWE_TD->genSHBsynth_Hilbert_Mem_fx[i], hBWE_TD->prev_Q_bwe_syn2 ); /* hBWE_TD->prev_Q_bwe_syn2 */
		move32();
		}

		FOR( i = 0; i < 2 * ALLPASSSECTIONS_STEEP; i++ )
		{
		hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx[i] = shr( hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx[i], st_fx->prev_Q_bwe_syn2 ); /* st_fx->prev_Q_bwe_syn2 */
		hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx[i] = shr( hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx[i], hBWE_TD->prev_Q_bwe_syn2 ); /* hBWE_TD->prev_Q_bwe_syn2 */
		move16();
		}
		}
		@@ -1976,13 +1976,13 @@ static void shb_CNG_decod_ivas_fx(
		/* rescale the Hilbert memories to Q0 */
		FOR( i = 0; i < HILBERT_MEM_SIZE; i++ )
		{
		hBWE_TD->genSHBsynth_Hilbert_Mem_fx[i] = L_shr( hBWE_TD->genSHBsynth_Hilbert_Mem_fx[i], st->prev_Q_bwe_syn2 ); /* st_fx->prev_Q_bwe_syn2 */
		hBWE_TD->genSHBsynth_Hilbert_Mem_fx[i] = L_shr( hBWE_TD->genSHBsynth_Hilbert_Mem_fx[i], hBWE_TD->prev_Q_bwe_syn2 ); /* hBWE_TD->prev_Q_bwe_syn2 */
		move32();
		}

		FOR( i = 0; i < 2 * ALLPASSSECTIONS_STEEP; i++ )
		{
		hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx[i] = shr( hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx[i], st->prev_Q_bwe_syn2 ); /* st_fx->prev_Q_bwe_syn2 */
		hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx[i] = shr( hBWE_TD->genSHBsynth_state_lsyn_filt_shb_local_fx[i], hBWE_TD->prev_Q_bwe_syn2 ); /* hBWE_TD->prev_Q_bwe_syn2 */
		move16();
		}
		}

lib_dec/core_dec_init_fx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -836,7 +836,7 @@ void open_decoder_LPD_fx(
		st->Mode2_lp_gainp = L_deposit_l( 0 ); /* 15Q16 */
		move32();

		st->prev_widow_left_rect = 0;
		st->hTcxDec->prev_widow_left_rect = 0;
		move16();
		if ( st->hTcxDec != NULL )
		{

lib_dec/core_switching_dec_fx.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1150,7 +1150,7 @@ ivas_error core_switching_post_dec_fx(
		move16();
		hBWE_FD->prev_weight_fx = 6554;
		move16(); /0.2 in Q15/
		st_fx->prev_fb_ener_adjust_fx = 0;
		hBWE_FD->prev_fb_ener_adjust_fx = 0;
		move16();
		}

		@@ -1782,7 +1782,7 @@ ivas_error core_switching_post_dec_ivas_fx(
		move16();
		hBWE_FD->prev_weight_fx = 6554;
		move16(); /0.2 in Q15/
		st_fx->prev_fb_ener_adjust_fx = 0;
		hBWE_FD->prev_fb_ener_adjust_fx = 0;
		move16();
		}

lib_dec/dec_tcx_fx.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -153,7 +153,7 @@ void decoder_tcx_fx(
		L_frameTCX = st->L_frameTCX_past;
		move16();

		left_rect = st->prev_widow_left_rect;
		left_rect = hTcxDec->prev_widow_left_rect;
		move16();

		IF( left_rect != 0 )
		@@ -190,7 +190,7 @@ void decoder_tcx_fx(
		move16();
		left_rect = 1;
		move16();
		st->prev_widow_left_rect = 1;
		hTcxDec->prev_widow_left_rect = 1;
		move16();
		}
		ELSE
		@@ -202,7 +202,7 @@ void decoder_tcx_fx(
		move16();
		left_rect = 0;
		move16();
		st->prev_widow_left_rect = 0;
		hTcxDec->prev_widow_left_rect = 0;
		move16();
		}