Align macros with float (9ae4502d) · Commits · SA4 / Audio / IVAS BASOP

lib_com/ivas_cnst.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -203,10 +203,10 @@ typedef enum
		#define MAX_CLDFB_DIGEST_CHANNELS 3 /* == maximum of ParamISM TCs and ParamMC TCs */

		#ifdef FIX_GAIN_EDIT_LIMITS
		#define OBJ_EDIT_GAIN_MIN_Q29 33874260 /* Minimum allowed object gain edit with parametric modes in Q29: 0.0630957f, -24 dB */
		#define OBJ_EDIT_GAIN_MAX_Q29 2137321728 /* Maximum allowed object gain edit in Q29: 3.9810719f, +12 dB */
		#define OBJ_EDIT_GAIN_MIN_Q12 258 /* Minimum allowed object gain edit with parametric modes in Q12: 0.0630957f, -24 dB */
		#define OBJ_EDIT_GAIN_MAX_Q12 16306 /* Maximum allowed object gain edit in Q12: 3.9810719f, +12 dB */
		#define EDIT_GAIN_MIN_Q29 33874260 /* Minimum allowed object gain edit with parametric modes in Q29: 0.0630957f, -24 dB */
		#define EDIT_GAIN_MAX_Q29 2137321728 /* Maximum allowed object gain edit in Q29: 3.9810719f, +12 dB */
		#define EDIT_GAIN_MIN_Q12 258 /* Minimum allowed object gain edit with parametric modes in Q12: 0.0630957f, -24 dB */
		#define EDIT_GAIN_MAX_Q12 16306 /* Maximum allowed object gain edit in Q12: 3.9810719f, +12 dB */
		#endif

lib_dec/lib_dec_fx.c

+20 −20

Original line number	Diff line number	Diff line
		@@ -4323,9 +4323,9 @@ ivas_error IVAS_DEC_SetEditableParameters(
		st_ivas->hIsmMetaData[obj]->edited_pitch_fx = hIvasEditableParameters.ism_metadata[obj].pitch_fx;
		move32();
		#ifdef FIX_GAIN_EDIT_LIMITS
		IF( GT_32( hIvasEditableParameters.ism_metadata[obj].gain_fx, OBJ_EDIT_GAIN_MAX_Q29 ) )
		IF( GT_32( hIvasEditableParameters.ism_metadata[obj].gain_fx, EDIT_GAIN_MAX_Q29 ) )
		{
		st_ivas->hIsmMetaData[obj]->edited_gain_fx = OBJ_EDIT_GAIN_MAX_Q29;
		st_ivas->hIsmMetaData[obj]->edited_gain_fx = EDIT_GAIN_MAX_Q29;
		move32();
		}
		ELSE
		@@ -4344,9 +4344,9 @@ ivas_error IVAS_DEC_SetEditableParameters(
		IF( EQ_32( ism_mode, ISM_SBA_MODE_DISC ) )
		{
		#ifdef FIX_GAIN_EDIT_LIMITS
		IF( GT_32( hIvasEditableParameters.gain_bed_fx, OBJ_EDIT_GAIN_MAX_Q29 ) )
		IF( GT_32( hIvasEditableParameters.gain_bed_fx, EDIT_GAIN_MAX_Q29 ) )
		{
		st_ivas->hSbaIsmData->gain_bed_fx = OBJ_EDIT_GAIN_MAX_Q29;
		st_ivas->hSbaIsmData->gain_bed_fx = EDIT_GAIN_MAX_Q29;
		move32();
		}
		ELSE
		@@ -4375,14 +4375,14 @@ ivas_error IVAS_DEC_SetEditableParameters(
		{
		#ifdef FIX_GAIN_EDIT_LIMITS
		/* Limit gain edit to a range of +12dB to -24dB with parametric ISM mode */
		IF( GT_32( hIvasEditableParameters.gain_bed_fx, OBJ_EDIT_GAIN_MAX_Q29 ) )
		IF( GT_32( hIvasEditableParameters.gain_bed_fx, EDIT_GAIN_MAX_Q29 ) )
		{
		st_ivas->hMasaIsmData->gain_ism_edited_fx[obj] = OBJ_EDIT_GAIN_MAX_Q12; // Q12
		st_ivas->hMasaIsmData->gain_ism_edited_fx[obj] = EDIT_GAIN_MAX_Q12; // Q12
		move16();
		}
		ELSE IF( LT_32( hIvasEditableParameters.gain_bed_fx, OBJ_EDIT_GAIN_MIN_Q29 ) )
		ELSE IF( LT_32( hIvasEditableParameters.gain_bed_fx, EDIT_GAIN_MIN_Q29 ) )
		{
		st_ivas->hMasaIsmData->gain_ism_edited_fx[obj] = OBJ_EDIT_GAIN_MIN_Q12; // Q12
		st_ivas->hMasaIsmData->gain_ism_edited_fx[obj] = EDIT_GAIN_MIN_Q12; // Q12
		move16();
		}
		ELSE
		@@ -4537,14 +4537,14 @@ ivas_error IVAS_DEC_SetEditableParameters(
		#ifdef FIX_GAIN_EDIT_LIMITS
		/* Limit gain edit to a range of +12dB to -24dB with parametric OMASA mode */
		test();
		IF( GT_32( hIvasEditableParameters.ism_metadata[obj].gain_fx, OBJ_EDIT_GAIN_MAX_Q29 ) )
		IF( GT_32( hIvasEditableParameters.ism_metadata[obj].gain_fx, EDIT_GAIN_MAX_Q29 ) )
		{
		st_ivas->hMasaIsmData->gain_ism_edited_fx[obj] = OBJ_EDIT_GAIN_MAX_Q12;
		st_ivas->hMasaIsmData->gain_ism_edited_fx[obj] = EDIT_GAIN_MAX_Q12;
		move16();
		}
		ELSE IF( EQ_16( ism_mode, ISM_MASA_MODE_PARAM_ONE_OBJ ) && LT_32( hIvasEditableParameters.ism_metadata[obj].gain_fx, OBJ_EDIT_GAIN_MIN_Q29 ) )
		ELSE IF( EQ_16( ism_mode, ISM_MASA_MODE_PARAM_ONE_OBJ ) && LT_32( hIvasEditableParameters.ism_metadata[obj].gain_fx, EDIT_GAIN_MIN_Q29 ) )
		{
		st_ivas->hMasaIsmData->gain_ism_edited_fx[obj] = OBJ_EDIT_GAIN_MIN_Q12;
		st_ivas->hMasaIsmData->gain_ism_edited_fx[obj] = EDIT_GAIN_MIN_Q12;
		move16();
		}
		ELSE
		@@ -4591,13 +4591,13 @@ ivas_error IVAS_DEC_SetEditableParameters(
		#endif
		#ifdef FIX_GAIN_EDIT_LIMITS
		test();
		IF( GT_32( hIvasEditableParameters.ism_metadata[obj].gain_fx, OBJ_EDIT_GAIN_MAX_Q29 ) )
		IF( GT_32( hIvasEditableParameters.ism_metadata[obj].gain_fx, EDIT_GAIN_MAX_Q29 ) )
		{
		st_ivas->hIsmMetaData[obj]->edited_gain_fx = OBJ_EDIT_GAIN_MAX_Q29;
		st_ivas->hIsmMetaData[obj]->edited_gain_fx = EDIT_GAIN_MAX_Q29;
		}
		ELSE IF( EQ_16( ism_mode, ISM_MASA_MODE_PARAM_ONE_OBJ ) && LT_32( hIvasEditableParameters.ism_metadata[obj].gain_fx, OBJ_EDIT_GAIN_MIN_Q29 ) )
		ELSE IF( EQ_16( ism_mode, ISM_MASA_MODE_PARAM_ONE_OBJ ) && LT_32( hIvasEditableParameters.ism_metadata[obj].gain_fx, EDIT_GAIN_MIN_Q29 ) )
		{
		st_ivas->hIsmMetaData[obj]->edited_gain_fx = OBJ_EDIT_GAIN_MIN_Q29;
		st_ivas->hIsmMetaData[obj]->edited_gain_fx = EDIT_GAIN_MIN_Q29;
		}
		ELSE
		{
		@@ -4617,14 +4617,14 @@ ivas_error IVAS_DEC_SetEditableParameters(
		#ifdef FIX_GAIN_EDIT_LIMITS
		/* Limit gain edit to a range of +12dB to -24dB with parametric OMASA mode */
		test();
		IF( GT_32( hIvasEditableParameters.gain_bed_fx, OBJ_EDIT_GAIN_MAX_Q29 ) )
		IF( GT_32( hIvasEditableParameters.gain_bed_fx, EDIT_GAIN_MAX_Q29 ) )
		{
		st_ivas->hMasaIsmData->gain_masa_edited_fx = OBJ_EDIT_GAIN_MAX_Q12;
		st_ivas->hMasaIsmData->gain_masa_edited_fx = EDIT_GAIN_MAX_Q12;
		move16();
		}
		ELSE IF( EQ_16( ism_mode, ISM_MASA_MODE_PARAM_ONE_OBJ ) && LT_32( hIvasEditableParameters.gain_bed_fx, OBJ_EDIT_GAIN_MIN_Q29 ) )
		ELSE IF( EQ_16( ism_mode, ISM_MASA_MODE_PARAM_ONE_OBJ ) && LT_32( hIvasEditableParameters.gain_bed_fx, EDIT_GAIN_MIN_Q29 ) )
		{
		st_ivas->hMasaIsmData->gain_masa_edited_fx = OBJ_EDIT_GAIN_MIN_Q12;
		st_ivas->hMasaIsmData->gain_masa_edited_fx = EDIT_GAIN_MIN_Q12;
		move16();
		}
		ELSE