Commit 09b6746a authored Jan 23, 2025 by Jouni Paulus

Merge remote-tracking branch 'origin/main' into...

Merge remote-tracking branch 'origin/main' into 1261-msan-in-masa-ext-metadata-delay-buffer-indexing-when-starting-with-bad-frames-and-no_delay_cmp

# Conflicts:
#	lib_com/options.h

parents 15e9d296 5e1729e2

lib_com/options.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -172,7 +172,8 @@
		#define NONBE_1217_OBJ_EDIT_FOA /* VA/Nokia: isse 1217: fix crash in object editing to FOA output in ParamISM */
		#define NONBE_1215_FIX_JBM_MAX_SCALING /* FhG: issue 1215: Fix assert hit in a specific VoIP decoder config. Caused by integer overflow in max scaling calculation. */
		#define NONBE_FIX_1255_OBJ_EDIT_JBM /* VA: issue 1255: restore object editing in JBM */

		#define NONBE_FIX_1189_GSC_IVAS_OMASA /* VA: Fix for issue 1189: Bitstream desynchornization due to reading/writing of the GSC_IVAS_mode parameter */
		#define NONBE_1214_PLC_LSF_MEMORY /* VA: issue 1224: reset ACELP PLC FEC memory in case of switching from MDCT stereo to TD/DFT stereo */
		#define NONBE_FIX_1261_MASA_EXT_META_JBM /* Nokia: issue #1261: MASA metadata EXT output delay buffer init in JBM */

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

lib_dec/acelp_core_dec.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -483,7 +483,11 @@ ivas_error acelp_core_dec(

		if ( st->element_mode > EVS_MONO && st->idchan == 0 && !( st->core_brate == FRAME_NO_DATA \|\| st->core_brate == SID_2k40 ) && !tdm_low_rate_mode )
		{
		#ifdef NONBE_FIX_1189_GSC_IVAS_OMASA
		if ( st->coder_type == AUDIO \|\| ( st->coder_type == INACTIVE && st->inactive_coder_type_flag ) )
		#else
		if ( st->coder_type == AUDIO \|\| ( st->coder_type == INACTIVE && st->total_brate <= MAX_GSC_INACTIVE_BRATE ) )
		#endif
		{
		st->GSC_IVAS_mode = get_next_indice( st, 2 );
		}

lib_dec/core_switching_dec.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -263,8 +263,14 @@ ivas_error core_switching_pre_dec(
		st->uv_count = 0;
		}

		#ifdef NONBE_1214_PLC_LSF_MEMORY
		if ( ( ( st->core == ACELP_CORE \|\| st->core == AMR_WB_CORE ) && st->last_core == HQ_CORE ) /* EVS and HQ -> ACELP */ \|\|
		( ( st->element_mode == IVAS_CPE_DFT \|\| st->element_mode == IVAS_CPE_TD \|\| ( st->element_mode == IVAS_CPE_MDCT && last_element_mode == IVAS_CPE_DFT ) ) && nchan_out == 2 && st->core_brate != SID_2k40 && st->core_brate != FRAME_NO_DATA && ( last_core_brate_st0 == FRAME_NO_DATA \|\| last_core_brate_st0 == SID_2k40 ) ) \|\|
		( st->core == ACELP_CORE && st->last_L_frame > L_FRAME16k ) /* TCX @ 25.6/32 kHz -> ACELP */ )
		#else
		if ( ( ( st->core == ACELP_CORE \|\| st->core == AMR_WB_CORE ) && st->last_core == HQ_CORE ) \|\| ( ( st->element_mode == IVAS_CPE_DFT \|\| st->element_mode == IVAS_CPE_TD \|\| ( st->element_mode == IVAS_CPE_MDCT && last_element_mode == IVAS_CPE_DFT ) ) && nchan_out == 2 &&
		st->core_brate != SID_2k40 && st->core_brate != FRAME_NO_DATA && ( last_core_brate_st0 == FRAME_NO_DATA \|\| last_core_brate_st0 == SID_2k40 ) ) )
		#endif
		{
		if ( st->element_mode == IVAS_CPE_DFT \|\| st->element_mode == IVAS_CPE_TD )
		{

lib_enc/core_switching_enc.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -171,7 +171,13 @@ void core_switching_pre_enc(
		st->uv_count = 0;
		}

		#ifdef NONBE_1214_PLC_LSF_MEMORY
		if ( ( ( st->core == ACELP_CORE \|\| st->core == AMR_WB_CORE ) && st->last_core == HQ_CORE ) /* EVS and HQ -> ACELP */ \|\|
		( ( st->element_mode == IVAS_CPE_DFT \|\| st->element_mode == IVAS_CPE_TD \|\| ( st->element_mode == IVAS_CPE_MDCT && last_element_mode == IVAS_CPE_DFT ) ) && active_cnt == 1 ) \|\|
		( st->core == ACELP_CORE && st->last_L_frame > L_FRAME16k ) /* TCX @ 25.6/32 kHz -> ACELP */ )
		#else
		if ( ( ( st->core == ACELP_CORE \|\| st->core == AMR_WB_CORE ) && st->last_core == HQ_CORE ) \|\| ( ( st->element_mode == IVAS_CPE_DFT \|\| st->element_mode == IVAS_CPE_TD \|\| ( st->element_mode == IVAS_CPE_MDCT && last_element_mode == IVAS_CPE_DFT ) ) && active_cnt == 1 ) )
		#endif
		{
		/* Reset the ACELP core in case of HQ->ACELP core switching */