Commit a76bb9bc authored Aug 09, 2024 by Sandesh Venkatesh

Merge branch '844-crash-in-mdct-core-decoder-for-bitrate-switching' into 'main'

proposed fix to 844

Closes #844

See merge request !516

parents e3439979 09e00d58

lib_com/options.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -159,8 +159,8 @@
		#define FIX_833_CORRECTION_to_826 /* VA : fix indexing error introduced in 826 */
		#endif
		#define NONE_BE_FIX_816_LFE_PLC_FLOAT /* DLB: issue 816: reduce required precision to float for LFE-PLC*/
		#define FIX_844_Q_SYN_INIT /* VA : proposed fix to 844, initializing q_old_synth when switching to MDCT*/
		#define FIX_839_FB_CONTENT_SOMETIME_MISSING /* VA : Fix scaling error for FB TB BWE */

		/* ################## End DEVELOPMENT switches ######################### */

		/* clang-format on */

lib_dec/ivas_core_dec.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -748,6 +748,7 @@ ivas_error ivas_core_dec_fx(
		move16();
		#endif
		st->prev_Q_syn = st->Q_syn;

		move16();

		Scale_sig( st->hHQ_core->old_out_LB_fx, L_FRAME32k, sub( st->Q_syn, st->hHQ_core->Q_old_wtda_LB ) );

lib_dec/ivas_stereo_switching_dec.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -1693,7 +1693,10 @@ ivas_error stereo_memory_dec_fx(
		Copy32( tmpF_buff, st->hTcxDec->old_syn_Overl_32, L_FRAME16k / 2 );
		Copy_Scale_sig32_16( st->hTcxDec->old_syn_Overl_32, st->hTcxDec->old_syn_Overl, L_FRAME16k / 2, add( st->Q_syn, 5 ) ); //(st->Qsyn - (11 - 16))
		}

		#ifdef FIX_844_Q_SYN_INIT
		st->hTcxDec->q_old_synth = st->Q_syn;
		move16();
		#endif
		set16_fx( st->hTcxDec->FBTCXdelayBuf, 0, 111 );
		set32_fx( st->hTcxDec->FBTCXdelayBuf_32, 0, 111 );
		st->hTcxDec->old_synthFB_fx = st->hTcxDec->synth_history_fx + NS2SA_FX2( st->output_Fs, PH_ECU_MEM_NS );