Commit 544d3aad authored Mar 21, 2025 by emerit

merge versions

parent 84301fb0

lib_dec/ivas_init_dec.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -451,10 +451,7 @@ ivas_error ivas_dec_setup(
		* Read IVAS format
		-------------------------------------------------------------------/

		IF( ( error = ivas_read_format( st_ivas, &num_bits_read ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		ivas_read_format( st_ivas, &num_bits_read );

		Word16 SrcInd[MAX_NUM_TDREND_CHANNELS];
		Word16 num_src = 0;

lib_dec/lib_dec_fx.c

+91 −93

Original line number	Diff line number	Diff line
		@@ -1211,12 +1211,10 @@ ivas_error IVAS_DEC_GetSamples(
		{
		/* check if we need to run the setup function */
		test();
		IF( !hIvasDec->isInitialized \|\| hIvasDec->hasBeenFedFrame )
		{
		IF( !hIvasDec->isInitialized \|\| hIvasDec->hasBeenFedFrame ){
		/* setup */

		IF( NE_32( ( error = IVAS_DEC_Setup( hIvasDec, &l_ts, &nTransportChannels, &nOutChannels, &nSamplesRendered_loop, pcmBuf + imult3216( nSamplesRendered, nOutChannels ) ) ), IVAS_ERR_OK ) )
		{
		IF( NE_32( ( error = IVAS_DEC_Setup( hIvasDec, &l_ts, &nTransportChannels, &nOutChannels, &nSamplesRendered_loop, pcmBuf + imult3216( nSamplesRendered, nOutChannels ) ) ), IVAS_ERR_OK ) ){
		return error;
		}
		}

lib_rend/ivas_objectRenderer_mix_fx.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -413,9 +413,8 @@ static ivas_error DefaultBSplineModel_fx(
		ivas_error error;
		#ifdef FIX_TDREND_HRTF_FILE_FORMAT
		Word16 azimSegSamples;
		#endif
		set_c( (int8_t *) HrFiltSet_p, 0, (int32_t) sizeof( TDREND_HRFILT_FiltSet_t ) );

		#endif
		HrFiltSet_p->FilterMethod = TDREND_HRFILT_Method_BSplineModel;
		move16();
		model = &( HrFiltSet_p->ModelParams );

lib_com/ivas_prot_fx.h

+3 −3

File changed.

Contains only whitespace changes.

lib_rend/ivas_dirac_dec_binaural_functions_fx.c

+1 −1

File changed.

Contains only whitespace changes.

lib_rend/ivas_prot_rend_fx.h

+1 −1

File changed.

Contains only whitespace changes.

lib_rend/ivas_reverb_fx.c

+13 −13

File changed.

Contains only whitespace changes.

lib_rend/ivas_stat_rend.h

+1 −1

File changed.

Contains only whitespace changes.