combine the net changes under the new define NONBE_1894_OSBA_SCALING (3b2d9de2) · Commits · SA4 / Audio / IVAS BASOP

lib_com/ivas_prot.h

+1 −4

Original line number	Diff line number	Diff line
		@@ -5617,16 +5617,13 @@ ivas_error ivas_osba_render_sf(
		float output_f[] / o : rendered time signal */
		);

		#ifdef FIX_1849_OBJ_EDITING_API
		#ifdef NONBE_1494_OSBA_SCALING
		void ivas_osba_stereo_add_channels(
		float tc_f[], / i : transport channels */
		float output_f[], / i/o: output channels */
		const float gain, /* i : gain bed value */
		const int16_t nchan_out, /* i : number of output channels */
		const int16_t nchan_ism, /* i : number of ISM channels */
		#ifndef NONBE_FIX_1262_OSBA_STEREO
		const int16_t ism_mode, /* i : ISM mode */
		#endif
		const int16_t n_samples_to_render /* i : output frame length per channel */
		);
		#endif

lib_com/options.h

+1 −5

Original line number	Diff line number	Diff line
		@@ -206,11 +206,7 @@
		#define NONBE_FIX_1174_MCMASA_LBR_LOOP_ERROR /* Nokia: Fix issue 1174 by removing the unnecessary inner loop causing problems. */
		#define NONBE_FIX_1052_SBA_EXT_FIX /* VA: SBA external output support fix - do not overwrite "output_config" parameter */

		#define FIX_1849_OBJ_EDITING_API
		#define NONBE_FIX_1262_OSBA_STEREO
		#define NONBE_1339_FIXOSBA_EXT_LOUDNESS
		#define NONBE_1352_HARMONIZE_OSBA_LOUDNESS /* FhG: do not scale OSBA inputs by 0.5 any more */

		#define NONBE_1894_OSBA_SCALING /* FhG: port OSBA scaling MRs (298,355,360) jointly */

		/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_jbm_dec.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -1238,9 +1238,9 @@ ivas_error ivas_jbm_dec_render(
		ivas_ism_render_sf( st_ivas, st_ivas->renderer_type, p_output, *nSamplesRendered );

		/* add already rendered SBA part */
		#ifdef FIX_1849_OBJ_EDITING_API
		#ifdef NONBE_1494_OSBA_SCALING

		#ifdef NONBE_FIX_1262_OSBA_STEREO
		#ifdef NONBE_1494_OSBA_SCALING
		ivas_osba_stereo_add_channels( p_tc, p_output, 1.0f, nchan_out, st_ivas->nchan_ism, *nSamplesRendered );
		#else
		ivas_osba_stereo_add_channels( p_tc, p_output, 1.0f, nchan_out, st_ivas->nchan_ism, st_ivas->ism_mode, *nSamplesRendered );
		@@ -1283,7 +1283,7 @@ ivas_error ivas_jbm_dec_render(
		else if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC \|\| st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM )
		{
		ivas_dirac_dec_binaural_render( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, nchan_remapped, p_output );
		#ifdef NONBE_1352_HARMONIZE_OSBA_LOUDNESS
		#ifdef NONBE_1494_OSBA_SCALING
		for ( n = 0; n < st_ivas->hDecoderConfig->nchan_out; n++ )
		{
		v_multc( p_output[n], 2.0f, p_output[n], *nSamplesRendered );
		@@ -1311,14 +1311,14 @@ ivas_error ivas_jbm_dec_render(
		set_zero( p_output[n], *nSamplesRendered );
		}

		#if defined( NONBE_1339_FIXOSBA_EXT_LOUDNESS ) && !defined (NONBE_1352_HARMONIZE_OSBA_LOUDNESS )
		#if defined( NONBE_1494_OSBA_SCALING ) && !defined (NONBE_1494_OSBA_SCALING )
		for ( n = 0; n < st_ivas->hDecoderConfig->nchan_out; n++ )
		{
		v_multc( p_output[n], 0.5f, p_output[n], *nSamplesRendered );
		}
		#endif
		}
		#ifdef NONBE_1352_HARMONIZE_OSBA_LOUDNESS
		#ifdef NONBE_1494_OSBA_SCALING
		for ( n = 0; n < st_ivas->hDecoderConfig->nchan_out; n++ )
		{
		v_multc( p_output[n], 2.0f, p_output[n], *nSamplesRendered );

lib_dec/ivas_osba_dec.c

+7 −10

Original line number	Diff line number	Diff line
		@@ -184,7 +184,7 @@ ivas_error ivas_osba_dirac_td_binaural_jbm(
		for ( b = 0; b < num_cldfb_bands; b++ )
		{
		st_ivas->hSplitBinRend->hMultiBinCldfbData->Cldfb_RealBuffer_Binaural[n][slot_idx_start + slot_idx][b] =
		#ifndef NONBE_1352_HARMONIZE_OSBA_LOUDNESS
		#ifndef NONBE_1494_OSBA_SCALING
		( 0.5f * st_ivas->hSplitBinRend->hMultiBinCldfbData->Cldfb_RealBuffer_Binaural[n][slot_idx_start + slot_idx][b] ) +
		( 0.5f * Cldfb_RealBuffer[b] );
		#else
		@@ -192,7 +192,7 @@ ivas_error ivas_osba_dirac_td_binaural_jbm(
		#endif

		st_ivas->hSplitBinRend->hMultiBinCldfbData->Cldfb_ImagBuffer_Binaural[n][slot_idx_start + slot_idx][b] =
		#ifndef NONBE_1352_HARMONIZE_OSBA_LOUDNESS
		#ifndef NONBE_1494_OSBA_SCALING
		( 0.5f * st_ivas->hSplitBinRend->hMultiBinCldfbData->Cldfb_ImagBuffer_Binaural[n][slot_idx_start + slot_idx][b] ) +
		( 0.5f * Cldfb_ImagBuffer[b] )
		#else
		@@ -214,7 +214,7 @@ ivas_error ivas_osba_dirac_td_binaural_jbm(
		int16_t i;
		for ( i = 0; i < nSamplesAsked; i++ )
		{
		#ifndef NONBE_1352_HARMONIZE_OSBA_LOUDNESS
		#ifndef NONBE_1494_OSBA_SCALING
		output_f[n][i] = 0.5f * output_f[channel_offset + n][i] + 0.5f * p_sepobj[n][i];
		#else
		output_f[n][i] = output_f[channel_offset + n][i] + p_sepobj[n][i];
		@@ -308,7 +308,7 @@ ivas_error ivas_osba_render_sf(
		{
		v_add( p_output[n], p_output_ism[n], p_output[n], *nSamplesRendered );
		}
		#ifndef NONBE_1352_HARMONIZE_OSBA_LOUDNESS
		#ifndef NONBE_1494_OSBA_SCALING
		v_multc( p_output[n], 0.5f, p_output[n], *nSamplesRendered );
		#endif
		}
		@@ -316,7 +316,7 @@ ivas_error ivas_osba_render_sf(
		return IVAS_ERR_OK;
		}

		#ifdef FIX_1849_OBJ_EDITING_API
		#ifdef NONBE_1494_OSBA_SCALING
		/-------------------------------------------------------------------------
		* ivas_osba_stereo_add_channels()
		*
		@@ -329,15 +329,12 @@ void ivas_osba_stereo_add_channels(
		const float gain, /* i : gain bed value */
		const int16_t nchan_out, /* i : number of output channels */
		const int16_t nchan_ism, /* i : number of ISM channels */
		#ifndef NONBE_FIX_1262_OSBA_STEREO
		const int16_t ism_mode, /* i : ISM mode */
		#endif
		const int16_t n_samples_to_render /* i : output frame length per channel */
		)
		{
		int16_t n;

		#ifndef NONBE_FIX_1262_OSBA_STEREO
		#ifndef NONBE_1494_OSBA_SCALING
		if ( ism_mode == ISM_SBA_MODE_DISC )
		{
		#endif
		@@ -352,7 +349,7 @@ void ivas_osba_stereo_add_channels(
		v_add( output_f[n], tc_f[n + nchan_ism], output_f[n], n_samples_to_render );
		}
		}
		#ifndef NONBE_FIX_1262_OSBA_STEREO
		#ifndef NONBE_1494_OSBA_SCALING
		}
		else
		{