Commit 5d4b5482 authored Aug 03, 2023 by vaclav

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

Merge remote-tracking branch 'remotes/origin/main' into 664-encode_ratio_ism_subframe-compiler-warning-with-debugging-disabled

parents 96647b86 3fe633f9

lib_com/options.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -214,6 +214,7 @@
		#define FIX_549_PARAM_ISM_BIN_GAIN /* FhG: Issue 549 : fix too quiet binaural output in ParamISM */
		#define FIX_618_STEREO_SW_DIV_BY_ZERO /* VA: fix issue 618 - UBSAN: division-by-zero in stereo bitrate switching */
		#define FIX_625_IDX_OOB /* FhG: Fix index out-of-bounds UBSAN error (issue 625) */
		#define FIX_613_DIRAC_NULL_PTR_USAN /* Nokia: Issue #613: USAN in DirAC decoder setup */

		#define MASA_AND_OBJECTS /* Nokia: Combination of MASA and objects */

lib_dec/ivas_stereo_ica_dec.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -148,8 +148,6 @@ void stereo_tca_dec(

		prevNCShift = (int16_t) abs( hStereoTCA->prevCorrLagStats );
		currentNCShift = (int16_t) abs( hStereoTCA->corrLagStats );
		/* IVAS_fmToDo: QCTodo: Need to address [16, 32] kHz @ Encoder --> 48 kHz Decoder. 48kHz-->48kHz is ok */
		/target_idx = (hStereoTCA->refChanIndx == L_CH_INDX) ? R_CH_INDX : L_CH_INDX;/

		if ( hCPE->element_mode == IVAS_CPE_TD && hCPE->last_element_mode == IVAS_CPE_TD )
		{

lib_dec/ivas_stereo_icbwe_dec.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -739,7 +739,6 @@ void stereo_icBWE_decproc(
		{
		if ( hCPE->element_mode == IVAS_CPE_TD )
		{
		/* QC: TODO - TBV */
		v_add( output[0], hStereoICBWE->memOutHB[hStereoICBWE->prev_refChanIndx_bwe], output[0], memOffset );
		v_add( output[1], hStereoICBWE->memOutHB[!hStereoICBWE->prev_refChanIndx_bwe], output[1], memOffset );
		}