Commit 71df852f authored Dec 05, 2025 by vaclav

fix FIX_2252_TD_CNG_STARTS_SID

parent 315f7421

lib_com/options.h

+1 −3

Original line number	Diff line number	Diff line
		@@ -169,11 +169,9 @@
		/* #################### Start NON-BE switches ############################ */
		/* any switch which is non-be wrt. TS 26.258 V3.0 */



		#define FIX_1435_MOVE_STEREO_PANNING /* VA: issue 1435: do the EVS stereo panning in the renderer */
		#define FIX_1454_FIX_STEREO_TO_FOA_JBM /* VA: issue 1454: fix buggy stereo to FOA in JBM */

		#define FIX_2252_TD_CNG_STARTS_SID /* VA: issues 2251 and 2252: Resolve "MSAN with bitstream that starts with an SID" */

		/* ##################### End NON-BE switches ########################### */

lib_dec/decision_matrix_dec.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -101,6 +101,10 @@ void decision_matrix_dec(
		if ( get_next_indice( st, 1 ) == 1 )
		{
		st->L_frame = L_FRAME16k;
		#ifdef FIX_2252_TD_CNG_STARTS_SID
		st->nb_subfr = NB_SUBFR16k;
		st->bwidth = WB;
		#endif
		}
		}
		else

lib_dec/init_dec.c

+13 −0

Original line number	Diff line number	Diff line
		@@ -79,8 +79,21 @@ ivas_error init_decoder(
		st->last_total_brate_ber = -1;
		st->core_brate = ACELP_8k00;
		st->ini_frame = 0;
		#ifdef FIX_2252_TD_CNG_STARTS_SID
		if ( st->element_mode == EVS_MONO )
		{
		st->bwidth = NB;
		st->last_bwidth = NB;
		}
		else
		{
		st->bwidth = WB;
		st->last_bwidth = WB;
		}
		#else
		st->bwidth = NB;
		st->last_bwidth = NB;
		#endif
		st->extl_brate = 0;

		st->coder_type = GENERIC;

lib_dec/ivas_decision_matrix_dec.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -95,6 +95,10 @@ void ivas_decision_matrix_dec(
		if ( get_next_indice( st, 1 ) )
		{
		st->L_frame = L_FRAME16k;
		#ifdef FIX_2252_TD_CNG_STARTS_SID
		st->nb_subfr = NB_SUBFR16k;
		st->bwidth = WB;
		#endif
		}
		else
		{