Merge with main (7ff92de0) · Commits · SA4 / Audio / IVAS BASOP

Workspace_msvc/lib_enc.vcxproj

+0 −1

Original line number	Diff line number	Diff line
		@@ -242,7 +242,6 @@
		<ClCompile Include="..\lib_enc\ivas_stereo_dft_td_itd_fx.c" />
		<ClCompile Include="..\lib_enc\ivas_stereo_dmx_evs_fx.c" />
		<ClCompile Include="..\lib_enc\cod4t64_fast_fx.c" />
		<ClCompile Include="..\lib_enc\igf_scf_enc.c" />
		<ClCompile Include="..\lib_enc\ivas_mcmasa_enc_fx.c" />
		<ClCompile Include="..\lib_enc\ivas_core_enc_fx.c" />
		<ClCompile Include="..\lib_enc\ivas_cpe_enc_fx.c" />

+0 −3

Original line number	Diff line number	Diff line
		@@ -253,9 +253,6 @@
		<ClCompile Include="..\lib_enc\igf_enc_fx.c">
		<Filter>encoder_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\igf_scf_enc.c">
		<Filter>encoder_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\igf_scf_enc_fx.c">
		<Filter>encoder_all_c</Filter>
		</ClCompile>

+10 −1

Original line number	Diff line number	Diff line
		@@ -2962,6 +2962,10 @@ static ivas_error decodeVoIP(

		phIvasDec = hIvasDec; / Update for main()' s free */
		ivasRtp.restartNeeded = false;
		#ifdef FIX_1525_UNINIT_FORMAT_SWITCHING_DEC
		bitstreamReadDone = false;
		parametersAvailableForEditing = false;
		#endif
		}

		/* reference vector */
		@@ -3211,6 +3215,10 @@ static ivas_error decodeVoIP(
		}

		phIvasDec = hIvasDec; / Update for main()' s free */
		#ifdef FIX_1525_UNINIT_FORMAT_SWITCHING_DEC
		bitstreamReadDone = false;
		parametersAvailableForEditing = false;
		#endif
		}

		/* Placeholder for memory reallocation */
		@@ -3974,12 +3982,13 @@ static ivas_error restartDecoder(
		}
		}

		#ifndef FIX_1525_UNINIT_FORMAT_SWITCHING_DEC
		if ( ( error = IVAS_DEC_PrintConfig( hIvasDec, 1, arg->voipMode ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_PrintConfig failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		#endif
		/* ISAR frame size is set from command line, not renderer config file.
		* This will be ignored if output format is not split rendering. */
		if ( renderConfig != NULL )

+0 −4

Original line number	Diff line number	Diff line
		@@ -872,11 +872,7 @@ void cng_params_upd_fx(
		Word16 index = 0;
		move32();
		move16();
		#ifdef HARM_2456_APPLY_SCALE
		index = apply_scale_ind( &att_fx, bwidth, last_active_brate, scaleTableStereo, SIZE_SCALE_TABLE_STEREO );
		#else
		apply_scale_ivas_fx( &att_fx, bwidth, last_active_brate, scaleTableStereo, SIZE_SCALE_TABLE_STEREO, &index );
		#endif
		att_fx = pow_10_q23[index]; // Q23
		move32();
		tmp = extract_h( att_fx ); // Q7

+0 −31

Original line number	Diff line number	Diff line
		@@ -166,9 +166,6 @@ void initFdCngCom(

		set16_fx( hFdCngCom->coherence_fx, 16384 /* 0.5 in Q15 */, MDCT_ST_DTX_NUM_COHERENCE_BANDS );

		#ifndef FIX_BASOP_2262_OLAP_BUFFER_SYNTH_SWITCHING
		set32_fx( hFdCngCom->olapBufferSynth_fx, 0, FFTLEN );
		#endif
		#ifndef FIX_BASOP_REMOVE_SYNTH2_FX
		set32_fx( hFdCngCom->olapBufferSynth2_fx, 0, FFTLEN );
		#endif
		@@ -1759,34 +1756,6 @@ Word16 apply_scale_ind(
		return i;
		}

		#ifndef HARM_2456_APPLY_SCALE
		void apply_scale_ivas_fx(
		Word32 scale, / o : scalefactor */
		const Word16 bwmode, /* i : audio bandwidth */
		const Word32 bitrate, /* i : Bit rate */
		const SCALE_SETUP scaleTable, / i : Scale table Q7 */
		const Word16 scaleTableSize, /* i : Size of scale table */
		Word16 *index )
		{
		Word16 i;
		FOR( i = 0; i < scaleTableSize; i++ )
		{
		cast16();
		IF( s_and( (Word16) EQ_16( bwmode, (Word16) scaleTable[i].bwmode ),
		s_and( L_sub( bitrate, scaleTable[i].bitrateFrom ) >= 0,
		L_sub( bitrate, scaleTable[i].bitrateTo ) < 0 ) ) )
		{
		BREAK;
		}
		}
		assert( i < scaleTableSize );

		scale = L_add( scale, L_deposit_h( scaleTable[i].scale ) );
		move32();
		*index = i;
		move16();
		}
		#endif
		/*-------------------------------------------------------------------
		* bandcombinepow()
		*