Merge branch '1610_basop_port_fl1412' into 'main-pc' (d3f0ec9f) · Commits · SA4 / Audio / IVAS BASOP

lib_com/ivas_cnst.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -1318,9 +1318,7 @@ enum
		#define MASA_BIT_REDUCT_PARAM 10
		#define MASA_MAXIMUM_TWO_DIR_BANDS 24
		#define NBITS_HR_COH 4
		#ifdef NONBE_FIX_982_OMASA_DELAY_COMP_5MS
		#define OMASA_TDREND_MATCHING_GAIN_FX 26026
		#endif

		#define MASA_INV_ANGLE_AT_EQUATOR_DEG_Q30 (1453366656l)

lib_com/options.h

+0 −9

Original line number	Diff line number	Diff line
		@@ -110,18 +110,9 @@


		#define FIX_944_REMOVE_LS_RENDERER_CALL_IN_STEREO /* VA: issue 994: remove an obsolete call of function ivas_ls_setup_conversion() in stereo */
		#define NONBE_FIX_982_OMASA_DELAY_COMP_5MS /* FhG : issue #982 : 5ms and 20ms output different for OMASA */
		#define FIX_699_FILE_READER_JBM_TSM /* VA: issue 699: complement FileReader_getFilePath() logic for TSM and JBM */
		#define FIX_997_REMOVE_SPAR_DEC_UPMIXER /* VA: issue 997: remove obsolete function ivas_spar_dec_upmixer() */

		#define NONBE_FIX_947_STEREO_DMX_EVS_POC /* Orange: Fix clicks on POC */
		#ifdef NONBE_FIX_947_STEREO_DMX_EVS_POC
		#define NONBE_FIX_947_STEREO_DMX_ROMOPT /* Orange: ROM optimisation for POC*/
		#endif
		#define NONBE_FIX_947_STEREO_DMX_EVS_PHA /* Orange: Fix issues on PHA */
		#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA
		#define NONBE_FIX_947_STEREO_DMX_FADOPT /* Orange: Fading optimisation */
		#endif
		#define NONBE_FIX_978_MC_TDREND_REVERB /* Eri : activate reverb for TDREND with headtracking */
		#define NONBE_FIX_999_JBM_MCT_FLUSH /* FhG: issue #999: fix wrong flushing for MCT at a JBM rate switch */
		#define FIX_1003_PARAMISM_BINAURAL_RECONFIG_USAN /* FhG: fix for #1003: fix USAN caused by ParamISM reconfig */

lib_dec/ivas_ism_renderer_fx.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -611,15 +611,6 @@ void ivas_omasa_separate_object_render_jbm_fx(
		FOR( obj = 0; obj < num_objects; obj++ )
		{
		/* Delay the signal to match CLDFB delay. Delay the whole buffer with the first rendering call of the stretched buffer. */
		#ifndef NONBE_FIX_982_OMASA_DELAY_COMP_5MS
		IF( slots_rendered == 0 )
		{
		Word16 tcBufferSize;

		tcBufferSize = i_mult( hSpatParamRendCom->num_slots, hSpatParamRendCom->slot_size );
		delay_signal32_fx( input_fx[obj], tcBufferSize, st_ivas->hMasaIsmData->delayBuffer_fx[obj], st_ivas->hMasaIsmData->delayBuffer_size );
		}
		#endif
		offsetSamples = 0;
		move16();

lib_dec/ivas_jbm_dec_fx.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -1731,7 +1731,6 @@ void ivas_jbm_dec_feed_tc_to_renderer_fx(
		ivas_ism_dec_digest_tc_fx( st_ivas );
		}

		#ifdef NONBE_FIX_982_OMASA_DELAY_COMP_5MS
		if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC \|\| st_ivas->renderer_type == RENDERER_DIRAC )
		{
		int16_t num_objects;
		@@ -1755,7 +1754,6 @@ void ivas_jbm_dec_feed_tc_to_renderer_fx(
		delay_signal32_fx( st_ivas->hTcBuffer->tc_fx[CPE_CHANNELS + n], st_ivas->hTcBuffer->n_samples_available, st_ivas->hMasaIsmData->delayBuffer_fx[n], st_ivas->hMasaIsmData->delayBuffer_size );
		}
		}
		#endif
		}
		ELSE IF( EQ_16( st_ivas->ivas_format, MC_FORMAT ) )
		{

lib_dec/ivas_omasa_dec_fx.c

+0 −38

Original line number	Diff line number	Diff line
		@@ -45,9 +45,6 @@
		* Local constants
		------------------------------------------------------------------------/

		#ifndef NONBE_FIX_982_OMASA_DELAY_COMP_5MS
		#define OMASA_TDREND_MATCHING_GAIN_FX 26026
		#endif

		/-------------------------------------------------------------------
		* ivas_omasa_data_open()
		@@ -702,38 +699,25 @@ void ivas_omasa_dirac_rend_jbm_fx(
		Word16 n;
		Word32 data_separated_objects[MAX_NUM_OBJECTS][L_FRAME48k];

		#ifdef NONBE_FIX_982_OMASA_DELAY_COMP_5MS
		test();
		if ( !st_ivas->hDecoderConfig->Opt_tsm )
		{
		*nSamplesRendered = min( nSamplesAsked, st_ivas->hTcBuffer->n_samples_available );
		#endif


		test();
		IF( EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_MASA_ONE_OBJ ) \|\| EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_PARAM_ONE_OBJ ) )
		{
		#ifdef NONBE_FIX_982_OMASA_DELAY_COMP_5MS
		Copy32( &output_f[CPE_CHANNELS][st_ivas->hTcBuffer->n_samples_rendered], data_separated_objects[0], *nSamplesRendered );
		#else
		Copy32( output_f[CPE_CHANNELS], data_separated_objects[0], nSamplesAsked );
		#endif
		}
		ELSE
		{
		FOR( n = 0; n < st_ivas->nchan_ism; n++ )
		{
		#ifdef NONBE_FIX_982_OMASA_DELAY_COMP_5MS
		Copy32( &output_f[n + CPE_CHANNELS][st_ivas->hTcBuffer->n_samples_rendered], data_separated_objects[n], *nSamplesRendered );
		#else
		Copy32( output_f[n + CPE_CHANNELS], data_separated_objects[n], nSamplesAsked );
		#endif
		}
		}

		#ifdef NONBE_FIX_982_OMASA_DELAY_COMP_5MS
		}
		#endif


		subframes_rendered = st_ivas->hSpatParamRendCom->subframes_rendered;
		@@ -774,14 +758,8 @@ ivas_error ivas_omasa_dirac_td_binaural_jbm_fx(
		)
		{
		Word16 n;
		#ifndef NONBE_FIX_982_OMASA_DELAY_COMP_5MS
		Word16 gain_fx = OMASA_TDREND_MATCHING_GAIN_FX; // Q15
		#endif
		move16();
		ivas_error error;
		#ifndef NONBE_FIX_982_OMASA_DELAY_COMP_5MS
		Word32 *tc_local_fx[MAX_TRANSPORT_CHANNELS];
		#endif
		Word32 *p_sepobj_fx[MAX_NUM_OBJECTS]; // Q11
		Word32 data_separated_objects_fx[MAX_NUM_OBJECTS][L_FRAME48k];
		move16();
		@@ -798,22 +776,6 @@ ivas_error ivas_omasa_dirac_td_binaural_jbm_fx(
		}

		/* Delay the object signals to match the CLDFB delay. Delay the whole buffer with the first rendering call of the stretched buffer. */
		#ifndef NONBE_FIX_982_OMASA_DELAY_COMP_5MS
		IF( st_ivas->hSpatParamRendCom->slots_rendered == 0 )
		{
		Word16 tcBufferSize;

		tcBufferSize = imult1616( st_ivas->hSpatParamRendCom->num_slots, st_ivas->hSpatParamRendCom->slot_size );

		FOR( n = 0; n < st_ivas->nchan_ism; n++ )
		{
		tc_local_fx[n] = st_ivas->hTcBuffer->tc_fx[n + 2]; // Q11
		v_multc_fixed_16( tc_local_fx[n], gain_fx, tc_local_fx[n], tcBufferSize );

		delay_signal32_fx( tc_local_fx[n], tcBufferSize, st_ivas->hMasaIsmData->delayBuffer_fx[n], st_ivas->hMasaIsmData->delayBuffer_size );
		}
		}
		#endif

		ivas_dirac_dec_binaural_render_fx( st_ivas, nSamplesAsked, nSamplesRendered, nSamplesAvailable, nchan_transport, output_fx );