[cleanup] accept NONBE_FIX_ISM_XOVER_BR (e400e6cd) · Commits · SA4 / Audio / IVAS BASOP

lib_com/ivas_prot_fx.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -3923,12 +3923,10 @@ void ivas_osba_data_close_fx(
		SBA_ISM_DATA_HANDLE hSbaIsmData / i/o: OSBA rendering handle */
		);

		#ifdef NONBE_FIX_ISM_XOVER_BR
		ISM_MODE ivas_osba_ism_mode_select(
		const Word32 ivas_total_brate, /* i : IVAS total bitrate */
		const Word16 nchan_ism /* i : number of input ISM's */
		);
		#endif

		void ivas_set_ism_importance_interformat_fx(
		const Word32 ism_total_brate, /* i/o: ISms total bitrate */

+0 −1

Original line number	Diff line number	Diff line
		@@ -86,7 +86,6 @@

		/* #################### Start BASOP porting switches ############################ */

		#define NONBE_FIX_ISM_XOVER_BR /* FhG: issue 1072: select OSBA coding method depending on number of object and bitrate */
		#define FIX_1053_REVERB_RECONFIGURATION /* Philips: issue 1053: fix for dynamic switching of acoustic environment */
		#define CONF_DISTATT /* Eri: Make distance attenuation configurable */
		#define FIX_1068_ASAN_IN_MC_2_BINAURAL_ROOM_IR /* issue 1068 : Memory leak in MC to BINAURAL_ROOM decoding with bitrate switching*/

+0 −8

Original line number	Diff line number	Diff line
		@@ -342,11 +342,7 @@ ivas_error ivas_corecoder_dec_reconfig_fx(
		}
		ELSE IF( st_ivas->hMCT != NULL && GT_16( st_ivas->nCPE, 1 ) )
		{
		#ifdef NONBE_FIX_ISM_XOVER_BR
		IF( NE_32( ( error = mct_dec_reconfigure_fx( st_ivas, (UWord16) NE_16( nchan_transport_real, nchan_transport_old ) ) ), IVAS_ERR_OK ) )
		#else
		IF( NE_32( ( error = mct_dec_reconfigure_fx( st_ivas, (UWord16) NE_16( st_ivas->nchan_transport, nchan_transport_old ) ) ), IVAS_ERR_OK ) )
		#endif
		{
		return error;
		}
		@@ -448,13 +444,9 @@ ivas_error ivas_corecoder_dec_reconfig_fx(
		-----------------------------------------------------------------/

		test();
		#ifdef NONBE_FIX_ISM_XOVER_BR
		test();
		test();
		IF( EQ_16( st_ivas->ivas_format, SBA_FORMAT ) \|\| EQ_16( st_ivas->ivas_format, MASA_FORMAT ) \|\| EQ_16( st_ivas->ivas_format, SBA_ISM_FORMAT ) )
		#else
		if ( st_ivas->ivas_format == SBA_FORMAT \|\| st_ivas->ivas_format == MASA_FORMAT )
		#endif
		{
		ivas_sba_set_cna_cng_flag( st_ivas );
		}

+0 −16

Original line number	Diff line number	Diff line
		@@ -834,26 +834,15 @@ ivas_error ivas_dec_setup(
		/correct number of CPEs for discrete ISM coding/
		test();
		IF( st_ivas->ini_frame > 0 && EQ_32( st_ivas->ism_mode, ISM_SBA_MODE_DISC ) )
		#ifdef NONBE_FIX_ISM_XOVER_BR
		{
		Word16 n;

		n = add( st_ivas->nchan_transport, st_ivas->nchan_ism );
		st_ivas->nCPE = shr_r( n, 1 );
		}
		#else
		{
		st_ivas->nCPE = add( st_ivas->nCPE, shr( add( st_ivas->nchan_ism, 1 ), 1 ) );
		move16();
		}
		#endif
		}

		#ifdef NONBE_FIX_ISM_XOVER_BR
		IF( EQ_16( ivas_osba_ism_mode_select( ivas_total_brate, st_ivas->nchan_ism ), ISM_SBA_MODE_DISC ) )
		#else
		IF( GE_32( ivas_total_brate, IVAS_256k ) )
		#endif
		{
		st_ivas->ism_mode = ISM_SBA_MODE_DISC;
		move32();
		@@ -2197,17 +2186,12 @@ ivas_error ivas_init_decoder_fx(
		{
		st_ivas->nCPE_old = st_ivas->nCPE;
		move16();
		#ifdef NONBE_FIX_ISM_XOVER_BR
		{
		Word16 n_all;

		n_all = add( st_ivas->nchan_transport, st_ivas->nchan_ism );
		st_ivas->nCPE = shr( add( n_all, 1 ), 1 );
		}
		#else
		st_ivas->nCPE = add( st_ivas->nCPE, shr( add( st_ivas->nchan_ism, 1 ), 1 ) );
		move16();
		#endif
		st_ivas->element_mode_init = IVAS_CPE_MDCT;
		move16();
		}

+0 −2

Original line number	Diff line number	Diff line
		@@ -160,9 +160,7 @@ ivas_error ivas_osba_dirac_td_binaural_jbm_fx(
		return error;
		}

		#ifdef NONBE_FIX_ISM_XOVER_BR
		ivas_combined_orientation_set_to_start_index( st_ivas->hCombinedOrientationData );
		#endif
		IF( EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) \|\| EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )
		{
		Word16 slot_idx, num_cldfb_bands, b, nchan_transport_orig;