Change macro names to not overlap (46ea01d5) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_cnst.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -178,8 +178,8 @@ 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 0.0630957f /* Minimum allowed gain edit with parametric modes: -24 dB */
		#define OBJ_EDIT_GAIN_MAX 3.9810719f /* Maximum allowed gain edit: +12 dB */
		#define EDIT_GAIN_MIN 0.0630957f /* Minimum allowed gain edit with parametric modes: -24 dB */
		#define EDIT_GAIN_MAX 3.9810719f /* Maximum allowed gain edit: +12 dB */
		#endif

lib_dec/lib_dec.c

+20 −20

Original line number	Diff line number	Diff line
		@@ -1516,9 +1516,9 @@ ivas_error IVAS_DEC_SetEditableParameters(
		st_ivas->hIsmMetaData[obj]->edited_yaw = hIvasEditableParameters.ism_metadata[obj].yaw;
		st_ivas->hIsmMetaData[obj]->edited_pitch = hIvasEditableParameters.ism_metadata[obj].pitch;
		#ifdef FIX_GAIN_EDIT_LIMITS
		if ( hIvasEditableParameters.ism_metadata[obj].gain > OBJ_EDIT_GAIN_MAX )
		if ( hIvasEditableParameters.ism_metadata[obj].gain > EDIT_GAIN_MAX )
		{
		st_ivas->hIsmMetaData[obj]->edited_gain = OBJ_EDIT_GAIN_MAX;
		st_ivas->hIsmMetaData[obj]->edited_gain = EDIT_GAIN_MAX;
		}
		else
		{
		@@ -1533,9 +1533,9 @@ ivas_error IVAS_DEC_SetEditableParameters(
		if ( ism_mode == ISM_SBA_MODE_DISC )
		{
		#ifdef FIX_GAIN_EDIT_LIMITS
		if ( hIvasEditableParameters.gain_bed > OBJ_EDIT_GAIN_MAX )
		if ( hIvasEditableParameters.gain_bed > EDIT_GAIN_MAX )
		{
		st_ivas->hSbaIsmData->gain_bed = OBJ_EDIT_GAIN_MAX;
		st_ivas->hSbaIsmData->gain_bed = EDIT_GAIN_MAX;
		}
		else
		{
		@@ -1560,13 +1560,13 @@ 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 ( hIvasEditableParameters.ism_metadata[obj].gain > OBJ_EDIT_GAIN_MAX )
		if ( hIvasEditableParameters.ism_metadata[obj].gain > EDIT_GAIN_MAX )
		{
		st_ivas->hMasaIsmData->gain_ism_edited[obj] = OBJ_EDIT_GAIN_MAX;
		st_ivas->hMasaIsmData->gain_ism_edited[obj] = EDIT_GAIN_MAX;
		}
		else if ( hIvasEditableParameters.ism_metadata[obj].gain < OBJ_EDIT_GAIN_MIN )
		else if ( hIvasEditableParameters.ism_metadata[obj].gain < EDIT_GAIN_MIN )
		{
		st_ivas->hMasaIsmData->gain_ism_edited[obj] = OBJ_EDIT_GAIN_MIN;
		st_ivas->hMasaIsmData->gain_ism_edited[obj] = EDIT_GAIN_MIN;
		}
		else
		{
		@@ -1710,13 +1710,13 @@ ivas_error IVAS_DEC_SetEditableParameters(
		st_ivas->hMasaIsmData->ism_gain_is_edited[obj] = 1u;
		#ifdef FIX_GAIN_EDIT_LIMITS
		/* Limit masa gain edit to a range of +12dB to -infdB with discrete OMASA mode and +12dB to -24dB with parametric OMASA mode */
		if ( hIvasEditableParameters.ism_metadata[obj].gain > OBJ_EDIT_GAIN_MAX )
		if ( hIvasEditableParameters.ism_metadata[obj].gain > EDIT_GAIN_MAX )
		{
		st_ivas->hMasaIsmData->gain_ism_edited[obj] = OBJ_EDIT_GAIN_MAX;
		st_ivas->hMasaIsmData->gain_ism_edited[obj] = EDIT_GAIN_MAX;
		}
		else if ( ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ && hIvasEditableParameters.ism_metadata[obj].gain < OBJ_EDIT_GAIN_MIN )
		else if ( ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ && hIvasEditableParameters.ism_metadata[obj].gain < EDIT_GAIN_MIN )
		{
		st_ivas->hMasaIsmData->gain_ism_edited[obj] = OBJ_EDIT_GAIN_MIN;
		st_ivas->hMasaIsmData->gain_ism_edited[obj] = EDIT_GAIN_MIN;
		}
		else
		{
		@@ -1741,13 +1741,13 @@ ivas_error IVAS_DEC_SetEditableParameters(
		st_ivas->hIsmMetaData[obj]->edited_pitch = hIvasEditableParameters.ism_metadata[obj].pitch;
		st_ivas->hIsmMetaData[obj]->edited_radius = hIvasEditableParameters.ism_metadata[obj].radius;
		#ifdef FIX_GAIN_EDIT_LIMITS
		if ( hIvasEditableParameters.ism_metadata[obj].gain > OBJ_EDIT_GAIN_MAX )
		if ( hIvasEditableParameters.ism_metadata[obj].gain > EDIT_GAIN_MAX )
		{
		st_ivas->hIsmMetaData[obj]->edited_gain = OBJ_EDIT_GAIN_MAX;
		st_ivas->hIsmMetaData[obj]->edited_gain = EDIT_GAIN_MAX;
		}
		else if ( ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ && hIvasEditableParameters.ism_metadata[obj].gain < OBJ_EDIT_GAIN_MIN )
		else if ( ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ && hIvasEditableParameters.ism_metadata[obj].gain < EDIT_GAIN_MIN )
		{
		st_ivas->hIsmMetaData[obj]->edited_gain = OBJ_EDIT_GAIN_MIN;
		st_ivas->hIsmMetaData[obj]->edited_gain = EDIT_GAIN_MIN;
		}
		else
		{
		@@ -1764,13 +1764,13 @@ ivas_error IVAS_DEC_SetEditableParameters(
		{
		#ifdef FIX_GAIN_EDIT_LIMITS
		/* Limit masa gain edit to a range of +12dB to -infdB with discrete OMASA mode and +12dB to -24dB with parametric OMASA mode */
		if ( hIvasEditableParameters.gain_bed > OBJ_EDIT_GAIN_MAX )
		if ( hIvasEditableParameters.gain_bed > EDIT_GAIN_MAX )
		{
		st_ivas->hMasaIsmData->gain_masa_edited = OBJ_EDIT_GAIN_MAX;
		st_ivas->hMasaIsmData->gain_masa_edited = EDIT_GAIN_MAX;
		}
		else if ( ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ && hIvasEditableParameters.gain_bed < OBJ_EDIT_GAIN_MIN )
		else if ( ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ && hIvasEditableParameters.gain_bed < EDIT_GAIN_MIN )
		{
		st_ivas->hMasaIsmData->gain_masa_edited = OBJ_EDIT_GAIN_MIN;
		st_ivas->hMasaIsmData->gain_masa_edited = EDIT_GAIN_MIN;
		}
		else
		{