[cleanup] accept FIX_993_REMOVE_SBA_GET_ORDER (23f60a96) · Commits · SA4 / Audio / IVAS BASOP

lib_com/ivas_prot_fx.h

+0 −7

Original line number	Diff line number	Diff line
		@@ -4921,13 +4921,6 @@ ivas_error ivas_cldfb_dec_reconfig_fx(
		ivas_error ivas_sba_enc_reconfigure_fx(
		Encoder_Struct st_ivas / i/o: IVAS encoder structure */
		);
		#ifndef FIX_993_REMOVE_SBA_GET_ORDER
		Word16 ivas_sba_get_order_fx(
		const Word16 nb_channels, /* i : Number of ambisonic channels */
		const Word16 sba_planar /* i : SBA planar flag */
		);

		#endif
		/! r: Ambisonic (SBA) order used for analysis and coding /
		Word16 ivas_sba_get_analysis_order(
		const Word32 ivas_total_brate, /* i : IVAS total bitrate */

lib_com/ivas_sba_config_fx.c

+0 −68

Original line number	Diff line number	Diff line
		@@ -60,24 +60,7 @@ void ivas_sba_config_fx(
		Word16 element_mode / o : element mode of the core coder */
		)
		{
		#ifndef FIX_993_REMOVE_SBA_GET_ORDER
		test();
		IF( sba_order < 0 && nb_channels < 0 )
		{
		assert( 0 && "Either order or number of channels must be positive" );
		}
		ELSE IF( sba_order < 0 )
		{
		sba_order = ivas_sba_get_order_fx( nb_channels, sba_planar );
		}
		ELSE IF( nb_channels < 0 )
		{
		nb_channels = ivas_sba_get_nchan_fx( sba_order, sba_planar );
		}
		ELSE
		#else
		IF( nb_channels > 0 )
		#endif
		{
		IF( sba_planar )
		{
		@@ -128,57 +111,6 @@ void ivas_sba_config_fx(
		return;
		}

		#ifndef FIX_993_REMOVE_SBA_GET_ORDER
		/-------------------------------------------------------------------
		* ivas_sba_get_order()
		*
		* Get Ambisonic order from number of ambisonic channels
		-------------------------------------------------------------------/

		/! r: Ambisonic (SBA) order /
		Word16 ivas_sba_get_order_fx(
		const Word16 nb_channels, /* i : Number of ambisonic channels */
		const Word16 sba_planar /* i : SBA Planar flag */
		)
		{
		Word16 sba_order;

		/* sba_order = (int16_t) sqrtf( (float) nb_channels ) - 1 */
		Word16 sba_order_non_sba_planar[MAX_INPUT_CHANNELS] = { 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 3 };
		move16();
		move16();
		move16();
		move16();
		move16();
		move16();
		move16();
		move16();
		move16();
		move16();
		move16();
		move16();
		move16();
		move16();
		move16();
		move16();

		IF( sba_planar )
		{
		sba_order = shr( sub( nb_channels, 1 ), 1 );
		assert( ( EQ_16( add( shl( sba_order, 1 ), 1 ), nb_channels ) ) && "Number of channels not supported in Planar SBA!" );
		}
		ELSE
		{
		sba_order = sba_order_non_sba_planar[nb_channels - 1];
		move16();
		assert( ( EQ_16( mult( add( sba_order, 1 ), add( sba_order, 1 ) ), nb_channels ) ) && "Number of channels not supported in SBA!" );
		}

		assert( ( sba_order <= 3 ) && "Error: SBA order must be <= 3!" );

		return ( sba_order );
		}
		#endif

		/-------------------------------------------------------------------
		* ivas_sba_get_analysis_order()

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -119,7 +119,6 @@
		#define FIX_INV_DIFFUSE_WEIGHT /* Orange : Fix error in energy compensation in late binaural */


		#define FIX_993_REMOVE_SBA_GET_ORDER /* VA: issue 993: remove unused function ivas_sba_get_order() */

		//#define FIX_777_COMBI_RENDER_CONFIG_FILE /* Philips: Fix for combined renderer config file support */
		#define NONBE_FIX_1004_USAN_DTX_MASA_NO_DIRS /* Nokia: fix USAN error caused by non-setting of correctly the number of MASA directions in DTX */