Merge branch 'main' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop into... (e0d9f79e) · Commits · SA4 / Audio / IVAS BASOP

apps/renderer.c

+26 −0

Original line number	Diff line number	Diff line
		@@ -74,6 +74,11 @@
		#define IVAS_MIN16B_FLT ( -32768.0f )
		#define IVAS_MAX16B_FX 32767
		#define IVAS_MIN16B_FX ( -32768 )

		#ifdef NONBE_1359_FIX_IVASREND_OMASA_BINAURAL_LOUDNESS
		#define OMASA_TDREND_MATCHING_GAIN_DB ( -2.0f )
		#endif

		#if !defined( DEBUGGING ) && !defined( WMOPS )
		static
		#endif
		@@ -1262,20 +1267,41 @@ int main(
		}
		}

		#ifndef NONBE_1359_FIX_IVASREND_OMASA_BINAURAL_LOUDNESS
		/* Set the total number of objects */
		#endif
		if ( args.inConfig.numAudioObjects > 0 )
		{
		#ifdef NONBE_1359_FIX_IVASREND_OMASA_BINAURAL_LOUDNESS
		/* Set the total number of objects */
		#endif
		if ( ( error = IVAS_REND_SetTotalNumberOfObjects( hIvasRend, args.inConfig.numAudioObjects ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_REND_SetTotalNumberOfObjects(): %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}

		#ifdef NONBE_1359_FIX_IVASREND_OMASA_BINAURAL_LOUDNESS
		/* Set the metadata delay for objects */
		#endif
		Word32 var1 = (Word32) ( args.syncMdDelay );
		IF( ( error = IVAS_REND_SetIsmMetadataDelay( hIvasRend, var1 ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_REND_SetIsmMetadataDelay(): %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}

		#ifdef NONBE_1359_FIX_IVASREND_OMASA_BINAURAL_LOUDNESS

		/* For OMASA input and BINAURAL output, apply a gain to objects to match the loudness with MASA part */
		if ( args.inConfig.numMasaBuses > 0 && args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL )
		{
		for ( i = 0; i < args.inConfig.numAudioObjects; ++i )
		{
		args.inConfig.audioObjects[i].gain_dB += OMASA_TDREND_MATCHING_GAIN_DB;
		}
		}
		#endif
		}

		IVAS_REND_LfePanMtx lfePanMatrix;

lib_com/options.h

+6 −1

Original line number	Diff line number	Diff line
		@@ -86,6 +86,8 @@
		#define FIX_2166_ASSERT_OSBA_PLC_STEREO_OUT /* FhG: fix for issue 2166 - add missing averaging factor 0.5 in for the sum of energies in function stereo_dft_dmx_swb_nrg_fx()*/

		#define FIX_1793_DEC_MC_TO_MONO_SCALING_ISSUE /* FhG: Use dynamic Q factor for synth_fx and synthFB_fx to prevent overflow */
		#define FIX_2082_FP_LEFTOVERS_OMASA_DEC /* Nokia: fix for issue 2082, cleaning remaining floating point code */

		/* ################### End FIXES switches ########################### */

		/* #################### Start BASOP porting switches ############################ */
		@@ -113,10 +115,13 @@
		#define FIX_NCHAN_BUFFERS /* VA: issue 1322: Correct the number of float buffers (channels) at the decoder */
		#define FIX_RENDERER_STACK /* VA: issue 1322: reduction of renderers' buffers size */
		#define JBM_MEMORY_OPT /* VA: issue 916: optimization of RAM in the JBM decoder */
		/#define NONBE_1324_TC_BUFFER_MEMOERY_KEEP/ /* VA: issue 1324: do not reset TSM memory in JBM bitrate switching */
		#define FIX_1370_EXTERNAL_ORIENTATION_CHECK /* Nokia: add sanity check for Euler angles for external orientations */
		#define FIX_1413_IGF_INIT_PRINTOUT /* FhG: use correct variable for IGF initiliazation */
		#define CODE_IMPROVEMENTS

		#define NONBE_1359_FIX_IVASREND_OMASA_BINAURAL_LOUDNESS /* Nokia: issue 1339: Apply scaling to the object-part of OMASA for binaural rendering in IVAS_rend. */
		#define NONBE_1362_FIX_OMASA_TO_MASA1_RENDERING /* Nokia: Fix OMASA to MASA1 rendering in IVAS_rend */
		#define FIX_1383_HEAD_TRACK_SANITIZER /* Nok: issue 1383: Fix head tracking struc values reading in renderer */

		// object-editing feature porting
		#define TMP_FIX_SPLIT_REND // temporary fix to split-rendering (it follows the later state of the framework but it is needed now because of current test-conditions)

lib_dec/ivas_jbm_dec_fx.c

+34 −0

Original line number	Diff line number	Diff line
		@@ -3638,6 +3638,10 @@ ivas_error ivas_jbm_dec_tc_buffer_reconfigure_fx(
		const Word16 n_samples_granularity /* i : new granularity of the renderer/buffer */
		)
		{
		#ifdef NONBE_1324_TC_BUFFER_MEMOERY_KEEP
		Word16 ch_idx, num_tc_buffer_mem, n_samples_still_available;
		Word32 tc_buffer_mem[MAX_INTERN_CHANNELS][L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES - 1];
		#endif
		#ifdef JBM_MEMORY_OPT
		ivas_error error;
		#else
		@@ -3649,6 +3653,28 @@ ivas_error ivas_jbm_dec_tc_buffer_reconfigure_fx(
		hTcBuffer = st_ivas->hTcBuffer;
		move16();

		#ifdef NONBE_1324_TC_BUFFER_MEMOERY_KEEP
		num_tc_buffer_mem = 0;
		move16();
		n_samples_still_available = 0;
		move16();

		IF( st_ivas->hDecoderConfig->Opt_tsm )
		{
		/* save samples of the TC buffer from the previous frame */
		num_tc_buffer_mem = s_min( hTcBuffer->nchan_transport_internal, nchan_transport_internal );
		n_samples_still_available = sub( hTcBuffer->n_samples_buffered, hTcBuffer->n_samples_rendered );

		/* what is remaining from last frame needs always be smaller than the new granularity */
		assert( n_samples_still_available < n_samples_granularity );

		FOR( ch_idx = 0; ch_idx < num_tc_buffer_mem; ch_idx++ )
		{
		Copy32( hTcBuffer->tc_buffer_old_fx[ch_idx] + hTcBuffer->n_samples_flushed, tc_buffer_mem[ch_idx], n_samples_still_available );
		}
		}

		#endif
		/* if granularity changes, adapt subframe_nb_slots */
		IF( NE_16( n_samples_granularity, hTcBuffer->n_samples_granularity ) )
		{
		@@ -3759,6 +3785,14 @@ ivas_error ivas_jbm_dec_tc_buffer_reconfigure_fx(
		}
		#endif

		#ifdef NONBE_1324_TC_BUFFER_MEMOERY_KEEP
		/* propagate samples of the TC buffer from the previous frame */
		FOR( ch_idx = 0; ch_idx < num_tc_buffer_mem; ch_idx++ )
		{
		Copy32( tc_buffer_mem[ch_idx], hTcBuffer->tc_buffer_old_fx[ch_idx], n_samples_still_available );
		}

		#endif
		return IVAS_ERR_OK;
		}

lib_dec/ivas_omasa_dec_fx.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -46,12 +46,18 @@
		* Local constants
		------------------------------------------------------------------------/


		#ifdef FIX_2082_FP_LEFTOVERS_OMASA_DEC
		#define MULT_17_DIV_20_Q15 27853 /* (Word16) ( ( 17.0/20.0 ) * 2^15 + 0.5 ) */
		#define MULT_1_DIV_CLDFB_NO_COL_MAX_Q15 2048 /* (Word16) ( ( 1.0 / CLDFB_NO_COL_MAX ) * 2^15 + 0.5 ) */
		#define ONEMINUX_EXT_RENDER_IIR_FAC_Q31 107374182 /* (Word32) ( ( 1.0 - 0.95 ) * 2^31 + 0.5f ); 0.95 is EXT_RENDER_IIR_FAC */
		#define EXT_RENDER_IIR_FAC_Q31 2040109465 /* (Word32) ( 0.95 * 2^31 + 0.5 ) */
		#else
		#define EXT_RENDER_IIR_FAC 0.95f
		#define MULT_17_DIV_20_Q15 ( Word16 )( ( 17.0 / 20.0f ) * pow( 2, 15 ) + 0.5f )
		#define MULT_1_DIV_CLDFB_NO_COL_MAX_Q15 ( Word16 )( ( 1.0 / CLDFB_NO_COL_MAX ) * pow( 2, 15 ) + 0.5f )
		#define ONEMINUX_EXT_RENDER_IIR_FAC_Q31 ( Word32 )( ( 1.0f - EXT_RENDER_IIR_FAC ) * pow( 2, 31 ) + 0.5f )
		#define EXT_RENDER_IIR_FAC_Q31 ( Word32 )( EXT_RENDER_IIR_FAC * pow( 2, 31 ) + 0.5f )
		#endif

		// Calculated as (Word16)(((1.0f / (50 * MAX_PARAM_SPATIAL_SUBFRAMES)) * pow(2, 15)) + 0.5f)
		#define OMASA_DELAYFRAMES_PER_SEC_Q15 (Word16) 164 // Q15

lib_rend/ivas_omasa_ana_fx.c

+105 −1

Original line number	Diff line number	Diff line
		@@ -668,10 +668,80 @@ static void ivas_omasa_dmx_fx(
		}
		set16_fx( data_e, 0, 4 );
		set16_fx( in_e, 0, 960 );
		#ifdef NONBE_1362_FIX_OMASA_TO_MASA1_RENDERING
		max_e = 0;
		#endif

		FOR( i = 0; i < nchan_ism; i++ )
		{
		#ifdef NONBE_1362_FIX_OMASA_TO_MASA1_RENDERING
		IF( EQ_16( nchan_transport, 1 ) )
		{
		FOR( j = 0; j < input_frame; j++ )
		{
		data_out_f_fx[0][j] = L_add_sat( data_out_f_fx[0][j], data_in_f_fx[i][j] );
		move32();
		}
		}
		ELSE
		{
		azimuth_fx = extract_l( L_shr( ism_azimuth_fx[i], Q22 ) ); // Q0
		elevation_fx = extract_l( L_shr( ism_elevation_fx[i], Q22 ) ); // Q0

		ivas_ism_get_stereo_gains_fx( azimuth_fx, elevation_fx, &gains_fx[0], &gains_fx[1] );

		/* Downmix using the panning gains */
		FOR( j = 0; j < nchan_transport; j++ )
		{
		test();
		IF( abs_s( gains_fx[j] ) > 0 \|\| L_abs( prev_gains_fx[i][j] ) > 0 )
		{
		FOR( k = 0; k < input_frame; k++ )
		{
		g1_fx = interpolator_fx[k]; // Q15
		move16();
		scale = BASOP_Util_Add_MantExp( 16384, 1, negate( g1_fx ), 0, &g2_fx );

		tmp1 = mult( g1_fx, gains_fx[j] );
		tmp2 = mult( g2_fx, (Word16) L_shr( prev_gains_fx[i][j], 16 ) ); // Q: ( ( ( 15 - scale ) + ( Q31 - Q16 ) ) - Q15 ) -> ( 15 - scale )
		scale = BASOP_Util_Add_MantExp( tmp1, 0, tmp2, scale, &tmp1 );

		L_tmp = data_in_f_fx[i][k]; // data_in_q
		move32();
		tmp_e = sub( 31, *data_in_q );
		move16();

		L_tmp = Mpy_32_16_1( L_tmp, tmp1 );
		scale = add( scale, tmp_e );

		data_out_f_fx[j][k] = BASOP_Util_Add_Mant32Exp( data_out_f_fx[j][k], data_e[j], L_tmp, scale, &in_e[k] );
		move32();
		}
		max_e = in_e[0];
		move16();
		FOR( l = 1; l < L_FRAME48k; l++ )
		{
		IF( LT_16( max_e, in_e[l] ) )
		{
		max_e = in_e[l];
		move16();
		}
		}

		FOR( l = 0; l < L_FRAME48k; l++ )
		{
		data_out_f_fx[j][l] = L_shr( data_out_f_fx[j][l], sub( max_e, in_e[l] ) ); // exponent: max_e, Q: ( 15 - max_e )
		move32();
		}
		data_e[j] = max_e;
		move16();
		}

		prev_gains_fx[i][j] = L_deposit_h( gains_fx[j] ); // Q31
		move32();
		}
		}
		#else
		azimuth_fx = extract_l( L_shr( ism_azimuth_fx[i], Q22 ) ); // Q0
		elevation_fx = extract_l( L_shr( ism_elevation_fx[i], Q22 ) ); // Q0

		@@ -727,13 +797,17 @@ static void ivas_omasa_dmx_fx(
		prev_gains_fx[i][j] = L_deposit_h( gains_fx[j] ); // Q31
		move32();
		}
		#endif
		}

		#ifdef NONBE_1362_FIX_OMASA_TO_MASA1_RENDERING
		IF( NE_16( nchan_transport, 1 ) )
		{
		max_e = data_e[0];
		move16();
		FOR( i = 1; i < nchan_transport; i++ )
		{
		if ( LT_16( max_e, data_e[i] ) )
		IF( LT_16( max_e, data_e[i] ) )
		{
		max_e = data_e[i];
		move16();
		@@ -748,12 +822,42 @@ static void ivas_omasa_dmx_fx(
		move32();
		}
		}
		}
		#else
		max_e = data_e[0];
		move16();
		FOR( i = 1; i < nchan_transport; i++ )
		{
		IF( LT_16( max_e, data_e[i] ) )
		{
		max_e = data_e[i];
		move16();
		}
		}

		FOR( i = 0; i < nchan_transport; i++ )
		{
		FOR( j = 0; j < input_frame; j++ )
		{
		data_out_f_fx[i][j] = L_shr( data_out_f_fx[i][j], sub( max_e, data_e[i] ) ); // exponent: max_e, Q: ( 15 - max_e )
		move32();
		}
		}
		#endif

		FOR( i = 0; i < nchan_transport; i++ )
		{
		Copy32( data_out_f_fx[i], data_in_f_fx[i], input_frame );
		#ifdef NONBE_1362_FIX_OMASA_TO_MASA1_RENDERING
		IF( NE_16( nchan_transport, 1 ) )
		{
		*data_in_q = sub( 31, max_e );
		move16();
		}
		#else
		*data_in_q = sub( 31, max_e );
		move16();
		#endif
		}

		return;

Admin message