Merge branch 'main' into 2122_basop_delay_alignment_split_rendering_and_external_rend_crashes_omasa (86ec6667) · Commits · SA4 / Audio / IVAS BASOP

.gitignore

0 → 100644

+86 −0

Original line number	Diff line number	Diff line
		# .gitignore for IVAS public collaboration Git repository

		# Compiler output Unix
		IVAS_cod
		IVAS_dec
		IVAS_rend
		ISAR_post_rend
		ambi_converter
		obj/
		*.a
		*.o
		*.P

		# default CMake
		build//

		# Compiler output VS2017
		IVAS_cod.exe
		IVAS_dec.exe
		IVAS_rend.exe
		ISAR_post_rend.exe
		ambi_converter.exe
		*.user
		.vs/
		Debug_*/
		Release_*/
		*.obj
		*.pdb

		# Standalone TD object renderer
		scripts/td_object_renderer/object_renderer_standalone/renderer_standalone
		scripts/td_object_renderer/object_renderer_standalone/renderer_standalone.exe

		# General/scripts
		.DS_Store
		.vscode
		.cache
		.idea
		*.log
		*.bak
		.\#*
		scripts/c-code_instrument/
		scripts/ifdef_instrument.list
		scripts/ref/
		scripts/test/
		scripts/out/
		scripts/self_test_summary.txt
		scripts/cppp/
		binary/
		tests/**/[c\|d]ut
		tests/**/ref
		tests/*/testv
		tests/hrtf_binary_loading/bitstream/*
		tests/hrtf_binary_loading/dec_out_/
		scripts/testv/_cut.pcm
		scripts/testv/_cut.wav
		scripts/testv/stvOMASA_*.met
		scripts/testv/stvOMASA_*.csv
		scripts/testv/stvOMASA_2ISM_1MASA1TC48c.wav
		scripts/testv/stvOMASA_3ISM_1MASA1TC48c.wav
		scripts/testv/stvO*
		# default reference binary name
		IVAS_cod_ref*
		IVAS_dec_ref*
		IVAS_rend_ref*
		ISAR_post_rend_ref*

		# Python files that pop up when running scripts
		__pycache__/
		*.py[cod]
		*$py.class

		# history
		.history/

		#externals
		Externals/

		# coan output files that are created when cleaning out switches
		coan_out_*

		# Additional ignored locations for the BASOP repo
		/ci
		/scripts
		/tests
		/pytest.ini

apps/decoder.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -605,7 +605,7 @@ int main(
		fprintf( stderr, "\nError in reading Custom loudspeaker file %s: %s\n\n", arg.customLsSetupFilename, CustomLoudspeakerLayout_getError( lsCustomError ) );
		goto cleanup;
		}
		for ( int i = 0; i < IVAS_MAX_OUTPUT_CHANNELS; i++ )
		for ( int16_t i = 0; i < IVAS_MAX_LS_CHANNELS; i++ )
		{
		hLsCustomData.azimuth_fx[i] = (Word32) ( hLsCustomData.azimuth[i] * ( 1u << 22 ) );
		hLsCustomData.elevation_fx[i] = (Word32) ( hLsCustomData.elevation[i] * ( 1u << 22 ) );
		@@ -3487,7 +3487,11 @@ static void do_object_editing_fx(
		if ( readInfo->obj_gain_relative[obj_idx] )
		{
		/* gain: apply relative edit + saturation */
		#ifdef FIX_2140_OBJECT_EDITING_SANITIZER_ISSUES
		editableParameters->ism_metadata[obj_idx].gain_fx = L_max( L_min( L_shl_sat( Mpy_32_32( editableParameters->ism_metadata[obj_idx].gain_fx, (Word32) readInfo->obj_gain[obj_idx] * 536870912 ), 2 ), OBJ_EDIT_GAIN_MAX_FX ), OBJ_EDIT_GAIN_MIN_FX ); /* Q29Q29 -> Q27 shift back to Q29 /
		#else
		editableParameters->ism_metadata[obj_idx].gain_fx = L_max( L_min( editableParameters->ism_metadata[obj_idx].gain_fx * (Word32) readInfo->obj_gain[obj_idx] * 536870912, OBJ_EDIT_GAIN_MAX_FX ), OBJ_EDIT_GAIN_MIN_FX ); /* Q29 */
		#endif
		}
		else
		{

apps/renderer.c

+68 −20

Original line number	Diff line number	Diff line
		@@ -761,8 +761,8 @@ int main(
		RotFileReader *headRotReader = NULL;
		RotFileReader *externalOrientationFileReader = NULL;
		RotFileReader *referenceRotReader = NULL;
		IVAS_CLDFB_FILTER_BANK_HANDLE cldfbAna[IVAS_MAX_INPUT_CHANNELS];
		IVAS_CLDFB_FILTER_BANK_HANDLE cldfbSyn[IVAS_MAX_INPUT_CHANNELS];
		IVAS_CLDFB_FILTER_BANK_HANDLE cldfbAna[RENDERER_MAX_INPUT_CHANNELS];
		IVAS_CLDFB_FILTER_BANK_HANDLE cldfbSyn[RENDERER_MAX_INPUT_CHANNELS];
		int16_t cldfb_in_flag, CLDFBframeSize_smpls;
		SplitRendBFIFileReader *splitRendBFIReader = NULL;
		Vector3PairFileReader *referenceVectorReader = NULL;
		@@ -1250,8 +1250,8 @@ int main(
		/* Set up output custom layout configuration */
		if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_LS_CUSTOM )
		{
		floatToFixed_arrL_app( args.outConfig.outSetupCustom.azimuth, args.outConfig.outSetupCustom.azimuth_fx, Q22, IVAS_MAX_OUTPUT_CHANNELS );
		floatToFixed_arrL_app( args.outConfig.outSetupCustom.elevation, args.outConfig.outSetupCustom.elevation_fx, Q22, IVAS_MAX_OUTPUT_CHANNELS );
		floatToFixed_arrL_app( args.outConfig.outSetupCustom.azimuth, args.outConfig.outSetupCustom.azimuth_fx, Q22, RENDERER_MAX_OUTPUT_CHANNELS );
		floatToFixed_arrL_app( args.outConfig.outSetupCustom.elevation, args.outConfig.outSetupCustom.elevation_fx, Q22, RENDERER_MAX_OUTPUT_CHANNELS );
		if ( ( error = IVAS_REND_ConfigureCustomOutputLoudspeakerLayout( hIvasRend, args.outConfig.outSetupCustom ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_REND_ConfigureCustomOutputLoudspeakerLayout(): %s\n", ivas_error_to_string( error ) );
		@@ -1349,8 +1349,8 @@ int main(

		if ( args.inConfig.multiChannelBuses[i].audioConfig == IVAS_AUDIO_CONFIG_LS_CUSTOM )
		{
		floatToFixed_arrL_app( args.inConfig.inSetupCustom.azimuth, args.inConfig.inSetupCustom.azimuth_fx, Q22, IVAS_MAX_OUTPUT_CHANNELS );
		floatToFixed_arrL_app( args.inConfig.inSetupCustom.elevation, args.inConfig.inSetupCustom.elevation_fx, Q22, IVAS_MAX_OUTPUT_CHANNELS );
		floatToFixed_arrL_app( args.inConfig.inSetupCustom.azimuth, args.inConfig.inSetupCustom.azimuth_fx, Q22, RENDERER_MAX_OUTPUT_CHANNELS );
		floatToFixed_arrL_app( args.inConfig.inSetupCustom.elevation, args.inConfig.inSetupCustom.elevation_fx, Q22, RENDERER_MAX_OUTPUT_CHANNELS );
		if ( ( error = IVAS_REND_ConfigureCustomInputLoudspeakerLayout( hIvasRend, mcIds[i], args.inConfig.inSetupCustom ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_REND_ConfigureCustomInputLoudspeakerLayout(): %s\n", ivas_error_to_string( error ) );
		@@ -1367,7 +1367,7 @@ int main(
		args.lfePanningEnabled = false;
		}

		FOR( Word16 k = 0; k < IVAS_MAX_OUTPUT_CHANNELS; k++ )
		FOR( Word16 k = 0; k < RENDERER_MAX_OUTPUT_CHANNELS; k++ )
		{
		( lfePanMatrix_fx )[k] = (Word32) ( ( lfePanMatrix )[k] * ( 1u << 31 ) );
		}
		@@ -1402,7 +1402,7 @@ int main(
		goto cleanup;
		}

		FOR( Word16 k = 0; k < IVAS_MAX_OUTPUT_CHANNELS; k++ )
		FOR( Word16 k = 0; k < RENDERER_MAX_OUTPUT_CHANNELS; k++ )
		{
		( lfePanMatrix_fx )[k] = (Word32) ( ( lfePanMatrix )[k] * ( 1u << 31 ) );
		}
		@@ -3119,6 +3119,13 @@ void getMetadataFromFileReader(
		fprintf( stderr, "\nError (%s) while reading ISM metadata from: %s\n\n", ivas_error_to_string( error ), IsmFileReader_getFilePath( ismReader ) );
		exit( -1 );
		}
		#ifdef FIX_2084_FLOATING_POINT_LEFTOVERS
		objectMetadataBuffer->positions[objIdx].azimuth_fx = ismMetadata.azimuth_fx;
		objectMetadataBuffer->positions[objIdx].elevation_fx = ismMetadata.elevation_fx;
		objectMetadataBuffer->positions[objIdx].radius_fx = ismMetadata.radius_fx;
		objectMetadataBuffer->positions[objIdx].yaw_fx = ismMetadata.yaw_fx;
		objectMetadataBuffer->positions[objIdx].pitch_fx = ismMetadata.pitch_fx;
		#else
		objectMetadataBuffer->positions[objIdx].azimuth_fx = (Word32) ( ismMetadata.azimuth * ( 1 << 22 ) );
		objectMetadataBuffer->positions[objIdx].elevation_fx = (Word32) ( ismMetadata.elevation * ( 1 << 22 ) );
		objectMetadataBuffer->positions[objIdx].radius_fx = (Word16) ( ismMetadata.radius * ( 1 << 9 ) );
		@@ -3130,6 +3137,7 @@ void getMetadataFromFileReader(
		objectMetadataBuffer->positions[objIdx].radius = ismMetadata.radius;
		objectMetadataBuffer->positions[objIdx].yaw = ismMetadata.yaw;
		objectMetadataBuffer->positions[objIdx].pitch = ismMetadata.pitch;
		#endif
		objectMetadataBuffer->positions[objIdx].non_diegetic_flag = ismMetadata.non_diegetic_flag;

		return;
		@@ -3183,20 +3191,50 @@ static void IsmPositionProvider_getNextFrame(
		/* Otherwise fall back to default position */
		else
		{
		#ifdef FIX_2084_FLOATING_POINT_LEFTOVERS
		objectMetadataBuffer->positions[objIdx].azimuth_fx = 0;
		objectMetadataBuffer->positions[objIdx].elevation_fx = 0;
		objectMetadataBuffer->positions[objIdx].radius_fx = 512; // 1.f in Q9
		objectMetadataBuffer->positions[objIdx].yaw_fx = 0;
		objectMetadataBuffer->positions[objIdx].pitch_fx = 0;
		objectMetadataBuffer->positions[objIdx].non_diegetic_flag = 0;
		#else
		objectMetadataBuffer->positions[objIdx].azimuth = 0.0f;
		objectMetadataBuffer->positions[objIdx].elevation = 0.0f;
		objectMetadataBuffer->positions[objIdx].radius = 1.0f;
		objectMetadataBuffer->positions[objIdx].yaw = 0.0f;
		objectMetadataBuffer->positions[objIdx].pitch = 0.0f;
		objectMetadataBuffer->positions[objIdx].azimuth_fx = 0;
		objectMetadataBuffer->positions[objIdx].elevation_fx = 0;
		objectMetadataBuffer->positions[objIdx].radius_fx = 512;
		objectMetadataBuffer->positions[objIdx].yaw_fx = 0;
		objectMetadataBuffer->positions[objIdx].pitch_fx = 0;
		objectMetadataBuffer->positions[objIdx].non_diegetic_flag = 0;
		#endif
		}

		/* Wrap azimuth to lie within (-180, 180] range */
		#ifdef FIX_2084_FLOATING_POINT_LEFTOVERS
		while ( LT_32( objectMetadataBuffer->positions[objIdx].azimuth_fx, 0 ) )
		{
		objectMetadataBuffer->positions[objIdx].azimuth_fx = L_add( objectMetadataBuffer->positions[objIdx].azimuth_fx, DEG_360_IN_Q22 );
		}
		while ( GE_32( objectMetadataBuffer->positions[objIdx].azimuth_fx, DEG_360_IN_Q22 ) )
		{
		objectMetadataBuffer->positions[objIdx].azimuth_fx = L_sub( objectMetadataBuffer->positions[objIdx].azimuth_fx, DEG_360_IN_Q22 );
		}

		/* Clamp elevation to lie within [-90, 90] range (can't be wrapped easily) */
		objectMetadataBuffer->positions[objIdx].elevation_fx = L_min( L_max( objectMetadataBuffer->positions[objIdx].elevation_fx, -DEG_90_IN_Q22 ), DEG_90_IN_Q22 );

		/* Wrap yaw to lie within (-180, 180] range */
		while ( LT_32( objectMetadataBuffer->positions[objIdx].yaw_fx, 0 ) )
		{
		objectMetadataBuffer->positions[objIdx].yaw_fx = L_add( objectMetadataBuffer->positions[objIdx].yaw_fx, DEG_360_IN_Q22 );
		}
		while ( GE_32( objectMetadataBuffer->positions[objIdx].yaw_fx, DEG_360_IN_Q22 ) )
		{
		objectMetadataBuffer->positions[objIdx].yaw_fx = L_sub( objectMetadataBuffer->positions[objIdx].yaw_fx, DEG_360_IN_Q22 );
		}

		/* Clamp pitch to lie within [-90, 90] range (can't be wrapped easily) */
		objectMetadataBuffer->positions[objIdx].pitch_fx = L_min( L_max( objectMetadataBuffer->positions[objIdx].pitch_fx, -DEG_90_IN_Q22 ), DEG_90_IN_Q22 );
		#else
		while ( objectMetadataBuffer->positions[objIdx].azimuth < 0.0f )
		{
		objectMetadataBuffer->positions[objIdx].azimuth += 360.0f;
		@@ -3224,6 +3262,7 @@ static void IsmPositionProvider_getNextFrame(
		objectMetadataBuffer->positions[objIdx].pitch = min( max( objectMetadataBuffer->positions[objIdx].pitch, -90 ), 90 );
		objectMetadataBuffer->positions[objIdx].yaw_fx = (Word32) ( ( objectMetadataBuffer->positions[objIdx].yaw ) * ( 1 << Q22 ) );
		objectMetadataBuffer->positions[objIdx].pitch_fx = (Word32) ( ( objectMetadataBuffer->positions[objIdx].pitch ) * ( 1 << Q22 ) );
		#endif
		}

		++positionProvider->frameCounter;
		@@ -3529,6 +3568,14 @@ static void parseObjectPosition(
		exit( -1 );
		}

		#ifdef FIX_2084_FLOATING_POINT_LEFTOVERS
		position->azimuth_fx = (Word32) ( meta_prm[0] * ( 1 << Q22 ) ); /* Q22 */
		position->elevation_fx = (Word32) ( meta_prm[1] * ( 1 << Q22 ) ); /* Q22 */
		position->radius_fx = (Word16) ( meta_prm[2] * ( 1 << Q9 ) ); /* Q9 */
		position->yaw_fx = (Word32) ( meta_prm[5] * ( 1 << Q22 ) ); /* Q22 */
		position->pitch_fx = (Word32) ( meta_prm[6] * ( 1 << Q22 ) ); /* Q22 */
		position->non_diegetic_flag = (Word16) meta_prm[7];
		#else
		position->azimuth = meta_prm[0];
		position->elevation = meta_prm[1];
		position->azimuth_fx = (Word32) ( meta_prm[0] * ( 1 << 22 ) );
		@@ -3537,6 +3584,7 @@ static void parseObjectPosition(
		position->yaw = meta_prm[5];
		position->pitch = meta_prm[6];
		position->non_diegetic_flag = (int16_t) meta_prm[7];
		#endif

		return;
		}
		@@ -4022,7 +4070,7 @@ static ivas_error parseLfePanMtxFile(
		any subsequent issue in file reading will gracefully exit the function */
		for ( lfe_in = 0; lfe_in < RENDERER_MAX_INPUT_LFE_CHANNELS; lfe_in++ )
		{
		for ( i = 0; i < IVAS_MAX_OUTPUT_CHANNELS; i++ )
		for ( i = 0; i < RENDERER_MAX_OUTPUT_CHANNELS; i++ )
		{
		( *lfePanMtx )[lfe_in][i] = 0.0f;
		}
		@@ -4050,7 +4098,7 @@ static ivas_error parseLfePanMtxFile(
		{
		continue;
		}
		if ( ch_out > IVAS_MAX_OUTPUT_CHANNELS )
		if ( ch_out > RENDERER_MAX_OUTPUT_CHANNELS )
		{
		break;
		}
		@@ -4092,13 +4140,13 @@ static void convertInputBuffer_fx(
		IF( cldfb_in_flag )
		{
		Word16 slotIdx, numCldfbBands, numFloatPcmSamples;
		Word32 fIn[IVAS_MAX_OUTPUT_CHANNELS][IVAS_MAX_FRAME_SIZE];
		Word32 fIn[RENDERER_MAX_OUTPUT_CHANNELS][IVAS_MAX_FRAME_SIZE];

		numFloatPcmSamples = numFloatSamplesPerChannel >> 1;
		numCldfbBands = numFloatPcmSamples / IVAS_CLDFB_NO_COL_MAX;

		/* CLDFB Analysis*/
		assert( numIntSamplesPerChannel <= IVAS_MAX_OUTPUT_CHANNELS * IVAS_MAX_FRAME_SIZE );
		assert( numIntSamplesPerChannel <= RENDERER_MAX_OUTPUT_CHANNELS * IVAS_MAX_FRAME_SIZE );
		FOR( smpl = 0; smpl < numFloatPcmSamples; ++smpl )
		{
		FOR( chnl = 0; chnl < numChannels; ++chnl )
		@@ -4176,9 +4224,9 @@ static void convertOutputBuffer_fx(
		IF( cldfb_in_flag )
		{
		Word16 slotIdx, numCldfbBands, numPcmSamples, b, temp_out_q = 0;
		Word32 fIn[IVAS_MAX_OUTPUT_CHANNELS][IVAS_MAX_FRAME_SIZE];
		Word32 re[IVAS_MAX_OUTPUT_CHANNELS][IVAS_CLDFB_NO_COL_MAX][IVAS_CLDFB_NO_CHANNELS_MAX];
		Word32 im[IVAS_MAX_OUTPUT_CHANNELS][IVAS_CLDFB_NO_COL_MAX][IVAS_CLDFB_NO_CHANNELS_MAX];
		Word32 fIn[RENDERER_MAX_OUTPUT_CHANNELS][IVAS_MAX_FRAME_SIZE];
		Word32 re[RENDERER_MAX_OUTPUT_CHANNELS][IVAS_CLDFB_NO_COL_MAX][IVAS_CLDFB_NO_CHANNELS_MAX];
		Word32 im[RENDERER_MAX_OUTPUT_CHANNELS][IVAS_CLDFB_NO_COL_MAX][IVAS_CLDFB_NO_CHANNELS_MAX];

		numPcmSamples = numSamplesPerChannel >> 1;
		numCldfbBands = numPcmSamples / IVAS_CLDFB_NO_COL_MAX;

lib_com/common_api_types.h

+8 −7

Original line number	Diff line number	Diff line
		@@ -52,8 +52,7 @@
		#define IVAS_MAX_BITS_PER_FRAME ( 512000 / IVAS_NUM_FRAMES_PER_SEC ) /* maximum bits per frame; corresponds to maximum bitrate of 512 kbps */

		#define IVAS_MAX_NUM_OBJECTS 4
		#define IVAS_MAX_INPUT_CHANNELS 16
		#define IVAS_MAX_OUTPUT_CHANNELS 16 /* Note: there is an exception for OSBA and EXT otuput where it can be 20 (HOA3 + 4 ISM channels) */
		#define IVAS_MAX_LS_CHANNELS 16
		#define IVAS_CLDFB_NO_COL_MAX 16
		#define IVAS_CLDFB_NO_CHANNELS_MAX 60

		@@ -133,6 +132,7 @@ typedef struct _IVAS_ISM_METADATA
		Word32 gainFactor_fx; /* Q29 */
		Word32 yaw_fx; /* Q22 */
		Word32 pitch_fx; /* Q22 */
		#ifndef FIX_2084_FLOATING_POINT_LEFTOVERS
		float azimuth;
		float elevation;
		float radius;
		@@ -140,6 +140,7 @@ typedef struct _IVAS_ISM_METADATA
		float gainFactor;
		float yaw;
		float pitch;
		#endif
		Word16 non_diegetic_flag;
		Word32 gain_fx; /* Q29 */

		@@ -204,12 +205,12 @@ typedef struct ivas_LS_setup_custom IVAS_LSSETUP_CUSTOM_STRUCT;
		typedef struct _IVAS_LS_CUSTOM_LAYOUT
		{
		Word16 num_spk;
		float azimuth[IVAS_MAX_OUTPUT_CHANNELS];
		float elevation[IVAS_MAX_OUTPUT_CHANNELS];
		Word32 azimuth_fx[IVAS_MAX_OUTPUT_CHANNELS]; // Q22
		Word32 elevation_fx[IVAS_MAX_OUTPUT_CHANNELS]; // Q22
		float azimuth[IVAS_MAX_LS_CHANNELS];
		float elevation[IVAS_MAX_LS_CHANNELS];
		Word32 azimuth_fx[IVAS_MAX_LS_CHANNELS]; // Q22
		Word32 elevation_fx[IVAS_MAX_LS_CHANNELS]; // Q22
		Word16 num_lfe;
		Word16 lfe_idx[IVAS_MAX_OUTPUT_CHANNELS];
		Word16 lfe_idx[IVAS_MAX_LS_CHANNELS];

		} IVAS_CUSTOM_LS_DATA;

lib_com/ivas_cnst.h

+5 −5

Original line number	Diff line number	Diff line
		@@ -146,12 +146,12 @@ typedef enum
		* IVAS general constants
		----------------------------------------------------------------------------------/

		#define MAX_INPUT_CHANNELS 16 /* Maximum number of input channels (HOA 3rd order), == IVAS_MAX_INPUT_CHANNELS */
		#define MAX_INPUT_CHANNELS 16 /* Maximum number of input channels (HOA 3rd order or IVAS_MAX_LS_CHANNELS) without separate objects in combined formats */
		#define MAX_TRANSPORT_CHANNELS 12 /* Maximum number of transport channels */
		#define MAX_INTERN_CHANNELS 16 /* Maximum number of intern channels (HOA 3rd order) */
		#define HEAD_ROTATION_HOA_ORDER 3 /* HOA 3rd order */
		#define MAX_CICP_CHANNELS 16 /* max channels for loudspeaker layouts (16 for custom layouts)*/
		#define MAX_OUTPUT_CHANNELS 16 /* Maximum number of output channels (HOA 3rd order) without separate objects in combined formats */
		#define MAX_LS_CHANNELS 16 /* max channels for loudspeaker layouts (16 for custom layouts), == IVAS_MAX_LS_CHANNELS */
		#define MAX_OUTPUT_CHANNELS 16 /* Maximum number of output channels (HOA 3rd order or IVAS_MAX_LS_CHANNELS) without separate objects in combined formats */
		#define MAX_OUTPUT_CHANNELS_IN_DIEGETIC_PAN 2 /* Maximum number of output channels with non diegetic panning */

		#define BINAURAL_CHANNELS 2 /* number of channels for binaural output configuration */
		@@ -1563,7 +1563,7 @@ typedef enum
		* TD Binaural Object renderer
		----------------------------------------------------------------------------------/

		#define MAX_NUM_TDREND_CHANNELS MAX_CICP_CHANNELS /* max. number of channels in TD renderer (objects or loudspeaker channels) */
		#define MAX_NUM_TDREND_CHANNELS MAX_LS_CHANNELS /* max. number of channels in TD renderer (objects or loudspeaker channels) */

		#define SFX_SPAT_BIN_MAX_NO_OF_OUTPUT_SAMPLES 288 /* 288 = 6 msec @ 48 kHz. */
		#define HRTF_MODEL_N_SECTIONS 3 /* No. sections used in approximate evaluation of model */
		@@ -1672,7 +1672,7 @@ typedef enum

		#define IVAS_MAX_FB_MIXER_OUT_CH IVAS_SPAR_MAX_CH
		#define IVAS_MAX_SPAR_FB_MIXER_IN_CH IVAS_SPAR_MAX_CH
		#define IVAS_MAX_FB_MIXER_IN_CH MAX_CICP_CHANNELS
		#define IVAS_MAX_FB_MIXER_IN_CH MAX_LS_CHANNELS

		#define MAX_NUM_BANDS_DIFF_NON48K 3