Merge branch '20250827_maintenance' into 'main' (c43d71ca) · Commits · SA4 / Audio / IVAS BASOP

Workspace_msvc/lib_enc.vcxproj.filters

+3 −3

Original line number	Diff line number	Diff line
		@@ -46,9 +46,6 @@
		<ClCompile Include="..\lib_enc\enc_gen_voic_rf_fx.c">
		<Filter>encoder_evs_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\enc_gen_voic_fx.c">
		<Filter>encoder_evs_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\enc_nelp_fx.c">
		<Filter>encoder_evs_c</Filter>
		</ClCompile>
		@@ -596,6 +593,9 @@
		<ClCompile Include="..\lib_enc\rom_enc_fx.c">
		<Filter>encoder_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_enc\enc_gen_voic_fx.c">
		<Filter>encoder_all_c</Filter>
		</ClCompile>
		</ItemGroup>
		<ItemGroup>
		<ClInclude Include="..\lib_enc\lib_enc.h" />

apps/decoder.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -90,8 +90,8 @@ typedef struct
		uint16_t count;
		uint16_t selected;
		uint16_t frameCounter;
		} AcousticEnvironmentSequence;

		} AcousticEnvironmentSequence;

		typedef struct
		{
		@@ -504,6 +504,7 @@ int main(
		fprintf( stderr, "Failed to get Distance Attenuation \n\n" );
		goto cleanup;
		}

		if ( ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )
		{
		if ( asked_frame_size != IVAS_RENDER_FRAMESIZE_20MS &&
		@@ -2486,7 +2487,6 @@ static ivas_error decodeG192(
		cleanup:

		RenderConfigReader_close( &renderConfigReader );

		split_rend_reader_writer_close( &splitRendWriter );
		AudioFileWriter_close( &afWriter );
		MasaFileWriter_close( &masaWriter );
		@@ -2861,15 +2861,15 @@ static ivas_error decodeVoIP(
		{
		#ifdef SUPPORT_JBM_TRACEFILE
		#ifdef OBJ_EDITING_API
		if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, (void *) pcmBuf, systemTime_ms, writeJbmTraceFileFrameWrapper, jbmTraceWriter, &bitstreamReadDone, &nSamplesRendered, &parametersAvailableForEditing ) ) != IVAS_ERR_OK )
		if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, (void *) pcmBuf, writeJbmTraceFileFrameWrapper, jbmTraceWriter, &bitstreamReadDone, &nSamplesRendered, &parametersAvailableForEditing, systemTime_ms ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, (void *) pcmBuf, systemTime_ms, writeJbmTraceFileFrameWrapper, jbmTraceWriter, &bitstreamReadDone, &nSamplesRendered ) ) != IVAS_ERR_OK )
		if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, (void *) pcmBuf, writeJbmTraceFileFrameWrapper, jbmTraceWriter, &bitstreamReadDone, &nSamplesRendered, systemTime_ms ) ) != IVAS_ERR_OK )
		#endif
		#else
		#ifdef OBJ_EDITING_API
		if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, (void *) pcmBuf, systemTime_ms, &bitstreamReadDone, &parametersAvailableForEditing ) ) != IVAS_ERR_OK )
		if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, (void *) pcmBuf, &bitstreamReadDone, &parametersAvailableForEditing, systemTime_ms ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, (void *) pcmBuf, systemTime_ms, &bitstreamReadDone ) ) != IVAS_ERR_OK )
		if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, (void *) pcmBuf, &bitstreamReadDone, systemTime_ms ) ) != IVAS_ERR_OK )
		#endif
		#endif
		{

lib_com/bitalloc_fx.c

+6 −7

Original line number	Diff line number	Diff line
		@@ -225,8 +225,7 @@ Word16 BitAllocF_fx(
		Word16 B, /* i : number of available bits :Q0 */
		Word16 N, /* i : number of sub-vectors :Q0 */
		Word16 R, / o : bit-allocation indicator :Q0 */
		Word16 Rsubband_fx / o : sub-band bit-allocation vector :Q3 */
		,
		Word16 Rsubband_fx, / o : sub-band bit-allocation vector :Q3 */
		const Word16 hqswb_clas, /* i : hq swb class :Q0 */
		const Word16 num_env_bands /* i : Number sub bands to be encoded for HF GNERIC :Q0 */
		)

lib_com/cldfb_fx.c

+17 −23

Original line number	Diff line number	Diff line
		@@ -558,12 +558,9 @@ void cldfbAnalysis_ts_fx(
		}

		void cldfbAnalysis_ts_fx_var_q(
		const Word32 *timeIn_fx,
		/* i : time buffer */ // q
		Word32 realBuffer_fx[CLDFB_NO_CHANNELS_MAX],
		/* o : real value buffer */ // q_cldfb - 5
		Word32 imagBuffer_fx[CLDFB_NO_CHANNELS_MAX],
		/* o : imag value buffer */ // q_cldfb - 5
		const Word32 timeIn_fx, / i : time buffer q */
		Word32 realBuffer_fx[CLDFB_NO_CHANNELS_MAX], /* o : real value buffer q_cldfb - 5 */
		Word32 imagBuffer_fx[CLDFB_NO_CHANNELS_MAX], /* o : imag value buffer q_cldfb - 5 */
		const Word16 samplesToProcess, /* i : samples to process */
		HANDLE_CLDFB_FILTER_BANK h_cldfb, /* i : filterbank state */
		Word16 *q_cldfb )
		@@ -819,12 +816,9 @@ void cldfbAnalysis_ts_fx_var_q(


		void cldfbAnalysis_ts_fx_fixed_q(
		const Word32 *timeIn_fx,
		/* i : time buffer */ // q
		Word32 realBuffer_fx[CLDFB_NO_CHANNELS_MAX],
		/* o : real value buffer */ // q - 5
		Word32 imagBuffer_fx[CLDFB_NO_CHANNELS_MAX],
		/* o : imag value buffer */ // q - 5
		const Word32 timeIn_fx, / i : time buffer q */
		Word32 realBuffer_fx[CLDFB_NO_CHANNELS_MAX], /* o : real value buffer q - 5 */
		Word32 imagBuffer_fx[CLDFB_NO_CHANNELS_MAX], /* o : imag value buffer q - 5 */
		const Word16 samplesToProcess, /* i : samples to process */
		HANDLE_CLDFB_FILTER_BANK h_cldfb, /* i : filterbank state */
		Word16 *q_cldfb )

lib_com/cng_exc_fx.c

+17 −18

Original line number	Diff line number	Diff line
		@@ -1013,8 +1013,7 @@ void cng_params_upd_ivas_fx(
		Word16 cng_exc2_buf[], /* i/o: Excitation buffer Q_exc */
		Word16 cng_Qexc_buf[], /* i/o: Q_exc buffer Q0 */
		Word32 cng_brate_buf[], /* i/o: last_active_brate buffer Q0 */
		const Word32 last_active_brate /* i : Last active bit rate Q0 */
		,
		const Word32 last_active_brate, /* i : Last active bit rate Q0 */
		const Word16 element_mode, /* i : Element mode */
		const Word16 bwidth /* i : Audio bandwidth */
		)