Commit ed91389b authored Apr 21, 2025 by Sandesh Venkatesh

Merge branch 'bug_fix_process_igf_mct' into 'main'

Q-mismatch bug fix for ProcessIGF in mct path

See merge request !1442

parents 166b854a 1c32f217

lib_dec/ivas_dirac_dec_fx.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2186,7 +2186,7 @@ void ivas_dirac_dec_render_sf_fx(
		move16();


		FOR( Word16 i = 0; i < MAX_OUTPUT_CHANNELS; i++ )
		FOR( i = 0; i < MAX_OUTPUT_CHANNELS; i++ )
		{
		FOR( Word16 j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ )
		{
		@@ -2195,7 +2195,7 @@ void ivas_dirac_dec_render_sf_fx(
		}
		}

		FOR( Word16 i = 0; i < BINAURAL_CHANNELS; i++ )
		FOR( i = 0; i < BINAURAL_CHANNELS; i++ )
		{
		FOR( Word16 j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ )
		{

lib_enc/ext_sig_ana_fx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1401,7 +1401,7 @@ void core_signal_analysis_high_bitrate_ivas_fx(
		IF( st->igf )
		{
		Word16 q_spectrum = sub( Q31, hTcxEnc->spectrum_e[frameno] );
		ProcessIGF_ivas_fx( st, N_MAX + L_MDCT_OVLP_MAX, hTcxEnc->spectrum_fx[frameno], hTcxEnc->spectrum_fx[frameno], &q_spectrum, powerSpec, powerSpec_e, transform_type[frameno] == TCX_20, frameno, 0, vad_hover_flag );
		ProcessIGF_ivas_fx( st, N_MAX + L_MDCT_OVLP_MAX, hTcxEnc->spectrum_fx[frameno], &q_spectrum, hTcxEnc->spectrum_fx[frameno], q_spectrum, powerSpec, powerSpec_e, transform_type[frameno] == TCX_20, frameno, 0, vad_hover_flag );
		}
		}
		}

lib_enc/ivas_mct_core_enc_fx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -646,7 +646,7 @@ void ivas_mct_core_enc_fx(
		q_spectrum = sub( 31, st->hTcxEnc->spectrum_e[n] );
		set16_fx( exp_powerSpec[ch], sub( Q31, q_powSpec[ch] ), N_MAX + L_MDCT_OVLP_MAX );

		ProcessIGF_ivas_fx( st, L_FRAME48k, st->hTcxEnc->spectrum_fx[n], orig_spectrum_fx[ch][n], &q_spectrum, &powerSpec_fx[ch][n * L_subframeTCX], &exp_powerSpec[ch][n * L_subframeTCX], st->core == TCX_20_CORE, n, sp_aud_decision0[ch], 0 );
		ProcessIGF_ivas_fx( st, L_FRAME48k, st->hTcxEnc->spectrum_fx[n], &q_spectrum, orig_spectrum_fx[ch][n], q_origSpec, &powerSpec_fx[ch][n * L_subframeTCX], &exp_powerSpec[ch][n * L_subframeTCX], st->core == TCX_20_CORE, n, sp_aud_decision0[ch], 0 );

		st->hIGFEnc->spec_be_igf_e = sub( 31, q_origSpec );
		st->hTcxEnc->spectrum_e[n] = sub( 31, q_spectrum );

lib_enc/ivas_mct_enc_mct_fx.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1122,7 +1122,7 @@ void mctStereoIGF_enc_fx(
		q_spectrum = sub( 31, st->hTcxEnc->spectrum_e[n] );

		set16_fx( exp_powerSpec[p_ch[ch]], sub( Q31, q_powerSpec[p_ch[ch]] ), N_MAX + L_MDCT_OVLP_MAX );
		ProcessIGF_ivas_fx( st, L_FRAME48k, st->hTcxEnc->spectrum_fx[n], orig_spectrum_fx[p_ch[ch]][n], &q_spectrum, &powerSpec_fx[p_ch[ch]][n * L_subframeTCX], &exp_powerSpec[p_ch[ch]][n * L_subframeTCX], st->core == TCX_20_CORE, n, sp_aud_decision0[ch], 0 );
		ProcessIGF_ivas_fx( st, L_FRAME48k, st->hTcxEnc->spectrum_fx[n], &q_spectrum, orig_spectrum_fx[p_ch[ch]][n], q_origSpec, &powerSpec_fx[p_ch[ch]][n * L_subframeTCX], &exp_powerSpec[p_ch[ch]][n * L_subframeTCX], st->core == TCX_20_CORE, n, sp_aud_decision0[ch], 0 );

		st->hTcxEnc->spectrum_e[n] = sub( 31, q_spectrum );
		move16();
		@@ -1163,7 +1163,7 @@ void mctStereoIGF_enc_fx(
		q_spectrum = sub( 31, st->hTcxEnc->spectrum_e[n] );

		set16_fx( exp_powerSpec[ch], sub( Q31, q_powerSpec[ch] ), N_MAX + L_MDCT_OVLP_MAX );
		ProcessIGF_ivas_fx( st, L_FRAME48k, st->hTcxEnc->spectrum_fx[n], orig_spectrum_fx[ch][n], &q_spectrum, &powerSpec_fx[ch][n * L_subframeTCX], &exp_powerSpec[ch][n * L_subframeTCX], st->core == TCX_20_CORE, n, sp_aud_decision0[ch], 0 );
		ProcessIGF_ivas_fx( st, L_FRAME48k, st->hTcxEnc->spectrum_fx[n], &q_spectrum, orig_spectrum_fx[ch][n], q_origSpec, &powerSpec_fx[ch][n * L_subframeTCX], &exp_powerSpec[ch][n * L_subframeTCX], st->core == TCX_20_CORE, n, sp_aud_decision0[ch], 0 );

		st->hTcxEnc->spectrum_e[n] = sub( 31, q_spectrum );
		move16();

lib_enc/ivas_stereo_mdct_core_enc_fx.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -710,7 +710,7 @@ void stereo_mdct_core_enc_fx(
		q_spectrum = sub( Q31, st->hTcxEnc->spectrum_e[n] );

		Scale_sig32( orig_spectrum_fx[ch][n], st->hIGFEnc->infoStopLine, sub( q_spectrum, sub( Q31, p_orig_spectrum_e[ch] ) ) ); /* q_spectrum */
		ProcessIGF_ivas_fx( st, N_MAX, st->hTcxEnc->spectrum_fx[n], orig_spectrum_fx[ch][n], &q_spectrum, &powerSpec_fx[ch][n * L_subframeTCX], &exp_powerSpec[ch][n * L_subframeTCX], st->core == TCX_20_CORE, n, hCPE->hCoreCoder[0]->sp_aud_decision0, 0 );
		ProcessIGF_ivas_fx( st, N_MAX, st->hTcxEnc->spectrum_fx[n], &q_spectrum, orig_spectrum_fx[ch][n], q_spectrum, &powerSpec_fx[ch][n * L_subframeTCX], &exp_powerSpec[ch][n * L_subframeTCX], st->core == TCX_20_CORE, n, hCPE->hCoreCoder[0]->sp_aud_decision0, 0 );
		}
		}
		}
		@@ -787,7 +787,7 @@ void stereo_mdct_core_enc_fx(

		Scale_sig32( orig_spectrum_fx[ch][n], st->hIGFEnc->infoStopLine, sub( q_spectrum, sub( Q31, p_orig_spectrum_e[ch] ) ) ); /* q_spectrum */

		ProcessIGF_ivas_fx( st, N_MAX, st->hTcxEnc->spectrum_fx[n], orig_spectrum_fx[ch][n], &q_spectrum, &powerSpec_fx[ch][n * L_subframeTCX], &exp_powerSpec[ch][n * L_subframeTCX], st->core == TCX_20_CORE, n, hCPE->hCoreCoder[0]->sp_aud_decision0, 0 );
		ProcessIGF_ivas_fx( st, N_MAX, st->hTcxEnc->spectrum_fx[n], &q_spectrum, orig_spectrum_fx[ch][n], q_spectrum, &powerSpec_fx[ch][n * L_subframeTCX], &exp_powerSpec[ch][n * L_subframeTCX], st->core == TCX_20_CORE, n, hCPE->hCoreCoder[0]->sp_aud_decision0, 0 );
		}
		}
		}