Merge branch 'float-pc' into 1586_ref_PortFlpMR1386 (1711982f) · Commits · SA4 / Audio / IVAS BASOP

lib_com/options.h

+4 −1

Original line number	Diff line number	Diff line
		@@ -214,8 +214,11 @@
		#define FIX_983_DISC_ISM_DIGEST_NUM_OBJS /* FhG: issue #983: the discrete ISM digest function uses the wrong number of objects */
		#define FIX_966_VAR_OVERFLOW_IN_HARM_MODEL_ARI /* FhG: fix and undef behaviour bug in the harmonic TCX model arithmetic coder */
		#define NONBE_FIX_974_OSBA_JBM_MONO_RS_USAN /* FhG : issue #974: usan in mono and stereo output in OSBA JBM RS */

		#define NONBE_FIX_982_OMASA_DELAY_COMP_5MS /* FhG : issue #982 : 5ms and 20ms output different for OMASA */
		#define NONBE_FIX_975_JBM_USAN /* FhG: Fix issue #975, USAN in JBM decoding ad 13.2kbps */

		#define FIX_ACCESS_WITHIN_NULL_STRUCT_MC_BW_SWITCHING /* FhG: fix usan error in MCT with bw swicthing */
		#define NONBE_FIX_986_MC_BW_SWITCHING /* FhG: fix crash in bw and br switching with MC */

		/* #################### End BASOP porting switches ############################ */

+12 −2

Original line number	Diff line number	Diff line
		@@ -2397,8 +2397,18 @@ ivas_error IVAS_DEC_VoIP_FeedFrame(
		return IVAS_ERR_INVALID_BITSTREAM;
		}

		#ifdef NONBE_FIX_975_JBM_USAN
		partialCopyFrameType = 0;
		partialCopyOffset = 0;

		if ( hIvasDec->mode == IVAS_DEC_MODE_EVS )
		{
		#endif
		/* check if frame contains a partial copy and get its offset */
		evs_dec_previewFrame( au, auSize, &partialCopyFrameType, &partialCopyOffset );
		#ifdef NONBE_FIX_975_JBM_USAN
		}
		#endif

		/* create data unit for primary copy in the frame */
		dataUnit = JB4_AllocDataUnit( hIvasDec->hVoIP->hJBM );

+21 −0

Original line number	Diff line number	Diff line
		@@ -713,6 +713,26 @@ int16_t set_bw_mct(
		}

		bw_changed = 0;
		#ifdef NONBE_FIX_986_MC_BW_SWITCHING
		if ( mct_bwidth != last_mct_bwidth )
		{
		bw_changed = 1;
		}

		/*
		* always set bw for all CPEs even if it is the same value as before,
		* in case of bw + br switching when changing to MCT, this overwrites
		* potentially incorrect initial values
		*/
		for ( cpe_id = 0; cpe_id < nCPE; cpe_id++ )
		{
		for ( ch = 0; ch < CPE_CHANNELS; ch++ )
		{
		st = hCPE[cpe_id]->hCoreCoder[ch];
		st->bwidth = mct_bwidth;
		}
		}
		#else
		if ( mct_bwidth != last_mct_bwidth )
		{
		bw_changed = 1;
		@@ -726,6 +746,7 @@ int16_t set_bw_mct(
		}
		}
		}
		#endif

		return bw_changed;
		}

+8 −0

Original line number	Diff line number	Diff line
		@@ -578,7 +578,15 @@ ivas_error ivas_cpe_enc(
		if ( ( hCPE->last_element_brate != hCPE->element_brate \|\| hCPE->element_mode != hCPE->last_element_mode \|\| ( hCPE->element_mode == IVAS_CPE_TD && sts[0]->bits_frame_nominal != last_bits_frame_nominal ) \|\| sts[n]->last_bwidth != sts[n]->bwidth ) && ( n == 0 \|\| hCPE->element_mode == IVAS_CPE_MDCT ) )
		{
		int16_t igf;

		#ifdef NONBE_FIX_986_MC_BW_SWITCHING
		int16_t bw;

		bw = ( hCPE->element_mode == IVAS_CPE_MDCT ) ? sts[n]->bwidth : sts[n]->max_bwidth;
		igf = getIgfPresent( sts[n]->element_mode, sts[n]->bits_frame_nominal * FRAMES_PER_SEC, bw, sts[n]->rf_mode );
		#else
		igf = getIgfPresent( sts[n]->element_mode, sts[n]->bits_frame_nominal * FRAMES_PER_SEC, sts[n]->max_bwidth, sts[n]->rf_mode );
		#endif
		if ( ( error = IGF_Reconfig( &sts[n]->hIGFEnc, igf, 0, sts[n]->bits_frame_nominal * FRAMES_PER_SEC, sts[n]->max_bwidth, sts[n]->element_mode, sts[n]->rf_mode ) ) != IVAS_ERR_OK )
		{
		return error;

+8 −2

Original line number	Diff line number	Diff line
		@@ -279,8 +279,14 @@ void ivas_mct_core_enc(

		if ( switch_bw )
		{
		initMdctStereoEncData( hMCT->hBlockData[ch]->hStereoMdct, ivas_format, sts[ch_core]->element_mode, sts[ch_core]->element_brate, sts[ch_core]->bwidth,
		sts[ch_core]->igf, sts[ch_core]->hIGFEnc->igfData.igfInfo.grid, 0 );
		#ifdef FIX_ACCESS_WITHIN_NULL_STRUCT_MC_BW_SWITCHING
		H_IGF_GRID igf_grid;

		igf_grid = sts[ch_core]->igf ? sts[ch_core]->hIGFEnc->igfData.igfInfo.grid : NULL;
		initMdctStereoEncData( hMCT->hBlockData[ch]->hStereoMdct, ivas_format, sts[ch_core]->element_mode, sts[ch_core]->element_brate, sts[ch_core]->bwidth, sts[ch_core]->igf, igf_grid, 0 );
		#else
		initMdctStereoEncData( hMCT->hBlockData[ch]->hStereoMdct, ivas_format, sts[ch_core]->element_mode, sts[ch_core]->element_brate, sts[ch_core]->bwidth, sts[ch_core]->igf, sts[ch_core]->hIGFEnc->igfData.igfInfo.grid, 0 );
		#endif
		}

		if ( sts[ch_core]->igf )