Merge remote-tracking branch 'remotes/origin/main' into 1161-unused-heap-in-omasa (bb447bb7) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+149 −7

Original line number	Diff line number	Diff line
		@@ -54,6 +54,11 @@
		#include "debug.h"
		#endif
		#include "wmc_auto.h"
		#ifdef OBJ_EDITING_API
		#ifdef OBJ_EDITING_EXAMPLE
		#include <math.h>
		#endif
		#endif


		#define WMC_TOOL_SKIP
		@@ -150,6 +155,9 @@ typedef struct
		AcousticEnvironmentSequence aeSequence;
		bool dpidEnabled;
		uint16_t directivityPatternId[IVAS_MAX_NUM_OBJECTS];
		#ifdef OBJ_EDITING_EXAMPLE
		bool objEditEnabled;
		#endif

		} DecArguments;

		@@ -400,6 +408,7 @@ int main(
		}
		}

		#ifndef FIX_1158_FASTCONV_REVERB_HRTF
		/------------------------------------------------------------------------------------------
		* Open renderer configuration reader file
		------------------------------------------------------------------------------------------/
		@@ -419,6 +428,7 @@ int main(
		goto cleanup;
		}
		}
		#endif

		/------------------------------------------------------------------------------------------
		* Configure the decoder
		@@ -606,6 +616,14 @@ int main(
		goto cleanup;
		}

		#ifdef FIX_1158_FASTCONV_REVERB_HRTF
		if ( ( error = RenderConfigReader_open( arg.renderConfigFilename, &renderConfigReader ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError: Can't open Renderer configuration file %s \n\n", arg.renderConfigFilename );
		goto cleanup;
		}
		#endif

		if ( RenderConfigReader_read( renderConfigReader, arg.renderConfigFilename, &renderConfig ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Failed to read renderer configuration from file %s\n\n", arg.renderConfigFilename );
		@@ -1091,6 +1109,12 @@ static bool parseCmdlIVAS_dec(
		arg->directivityPatternId[i] = 65535;
		}

		#ifdef OBJ_EDITING_EXAMPLE
		arg->objEditEnabled = false;
		#endif
		#


		/-----------------------------------------------------------------
		* Initialization
		-----------------------------------------------------------------/
		@@ -1544,6 +1568,14 @@ static bool parseCmdlIVAS_dec(
		i += tmp;
		}

		#ifdef OBJ_EDITING_EXAMPLE
		else if ( strcmp( argv_to_upper, "-OBJ_EDIT" ) == 0 )
		{
		arg->objEditEnabled = true;
		i++;
		}
		#endif

		/-----------------------------------------------------------------
		* Option not recognized
		-----------------------------------------------------------------/
		@@ -1748,6 +1780,9 @@ static void usage_dec( void )
		fprintf( stdout, " Currently, all values default to level 3 (full functionality).\n" );
		fprintf( stdout, "-q : Quiet mode, no frame counter\n" );
		fprintf( stdout, " default is deactivated\n" );
		#ifdef OMASA_OBJECT_EDITING
		fprintf( stdout, "-obj_edit : enable object editing\n" );
		#endif
		#ifdef DEBUG_MODE_INFO
		#ifdef DEBUG_MODE_INFO_TWEAK
		fprintf( stdout, "-info <folder> : specify subfolder name for debug output\n" );
		@@ -2115,6 +2150,10 @@ static ivas_error decodeG192(
		return error;
		}

		#ifdef OBJ_EDITING_API
		IVAS_EDITABLE_PARAMETERS editableParameters;
		#endif

		IVAS_RENDER_CONFIG_DATA renderConfig;
		RenderConfigReader *renderConfigReader = NULL;

		@@ -2416,11 +2455,84 @@ static ivas_error decodeG192(
		}
		#endif
		/* Feed into decoder */
		if ( ( error = IVAS_DEC_FeedFrame_Serial( hIvasDec, bit_stream, num_bits, bfi ) ) != IVAS_ERR_OK )
		if ( ( error = IVAS_DEC_FeedFrame_Serial( hIvasDec, bit_stream, num_bits, bfi
		#ifdef OBJ_EDITING_API
		,
		isSplitRend,
		splitRendBits
		#endif
		) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError: could not feed frame to decoder: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}
		#ifdef OBJ_EDITING_API
		#ifdef OBJ_EDITING_EXAMPLE
		if ( arg.objEditEnabled )
		{

		/* Do object info editing here */
		/* get object parameters */
		if ( ( error = IVAS_DEC_GetEditableParameters( hIvasDec, &editableParameters ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError: could not get the editable parameters: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		/* edit object parameters...*/

		/* put the objects equally spaced at the horizontal plane */
		/* and play a little bit with the gains... */
		int16_t obj_idx, non_diegetic_obj_idx;
		int16_t num_nondiegetic_objects;

		num_nondiegetic_objects = 0;
		for ( obj_idx = 0; obj_idx < editableParameters.num_obj; obj_idx++ )
		{
		if ( !editableParameters.ism_metadata[obj_idx].non_diegetic_flag )
		{
		num_nondiegetic_objects++;
		}
		}
		if ( num_nondiegetic_objects )
		{
		float start_angle, angle_inc;
		angle_inc = 360.0f / (float) num_nondiegetic_objects;
		start_angle = angle_inc / 2.0f;
		for ( obj_idx = 0, non_diegetic_obj_idx = 0; obj_idx < editableParameters.num_obj; obj_idx++ )
		{
		if ( !editableParameters.ism_metadata[obj_idx].non_diegetic_flag )
		{
		editableParameters.ism_metadata[obj_idx].elevation = 0.0f;
		editableParameters.ism_metadata[obj_idx].azimuth = start_angle + (float) non_diegetic_obj_idx * angle_inc;
		non_diegetic_obj_idx++;
		}
		}
		}

		/* breakover object gains */
		for ( obj_idx = 0; obj_idx < editableParameters.num_obj; obj_idx++ )
		{
		editableParameters.ism_metadata[obj_idx].gain = 0.5f + (float) ( ( frame + obj_idx * 50 ) % 250 ) / 250.0f;
		}

		editableParameters.gain_bed = 0.5f;

		/* set new object parameters*/
		if ( ( error = IVAS_DEC_SetEditableParameters( hIvasDec, editableParameters ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError: could not set the editable parameters: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}
		}
		#endif
		/* Do the final preparations needed for rendering */
		if ( ( error = IVAS_DEC_PrepareRenderer( hIvasDec ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError: could not prepare the renderer: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}
		#endif
		}

		if ( isSplitRend )
		@@ -2970,6 +3082,11 @@ static ivas_error decodeVoIP(
		int16_t vec_pos_update, vec_pos_len;
		int16_t nOutSamples = 0;

		#ifdef OBJ_EDITING_API
		bool parameterAvailableForEditing = false;
		uint16_t nSamplesRendered = 0;
		#endif

		vec_pos_update = 0;
		if ( ( error = IVAS_DEC_GetRenderFramesizeMs( hIvasDec, &systemTimeInc_ms ) ) != IVAS_ERR_OK )
		{
		@@ -3086,6 +3203,9 @@ static ivas_error decodeVoIP(

		while ( 1 )
		{
		#ifdef OBJ_EDITING_API
		nSamplesRendered = 0;
		#endif

		/* reference vector */
		if ( arg.enableReferenceVectorTracking && vec_pos_update == 0 )
		@@ -3248,15 +3368,37 @@ static ivas_error decodeVoIP(


		/* decode and get samples */
		#ifdef OBJ_EDITING_API
		while ( nSamplesRendered < nOutSamples )
		{
		#endif

		#ifdef SUPPORT_JBM_TRACEFILE
		if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, systemTime_ms, writeJbmTraceFileFrameWrapper, jbmTraceWriter ) ) != IVAS_ERR_OK )
		if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, systemTime_ms, writeJbmTraceFileFrameWrapper, jbmTraceWriter
		#ifdef OBJ_EDITING_API
		,
		&nSamplesRendered, &parameterAvailableForEditing
		#endif
		) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, systemTime_ms ) ) != IVAS_ERR_OK )
		if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, systemTime_ms, &nSamplesRendered, &parameterAvailableForEditing
		#ifdef OBJ_EDITING_API
		& nSamplesRendered,
		&parameterAvailableForEditing
		#endif
		) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nError in IVAS_DEC_VoIP_GetSamples: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}
		#ifdef OBJ_EDITING_API
		if ( parameterAvailableForEditing == true )
		{
		/* do the object editing here */
		}
		} /* while ( nSamplesRendered < nOutSamples ) */
		#endif

		/* write JBM Offset file entry */
		if ( jbmOffsetWriter != NULL )

lib_com/common_api_types.h

+12 −0

Original line number	Diff line number	Diff line
		@@ -128,9 +128,21 @@ typedef struct _IVAS_ISM_METADATA
		float yaw;
		float pitch;
		int16_t non_diegetic_flag;
		#ifdef OBJ_EDITING_API
		float gain;
		#endif

		} IVAS_ISM_METADATA;

		#ifdef OBJ_EDITING_API
		typedef struct _IVAS_EDITABLE_PARAMETERS
		{
		int16_t num_obj;
		IVAS_ISM_METADATA ism_metadata[IVAS_MAX_NUM_OBJECTS];
		float gain_bed;
		} IVAS_EDITABLE_PARAMETERS;
		#endif

		typedef struct
		{
		float w, x, y, z;

lib_com/ivas_cnst.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -1215,6 +1215,11 @@ enum
		#define MASA_MAXIMUM_TWO_DIR_BANDS 24
		#define NBITS_HR_COH 4
		#define OMASA_TDREND_MATCHING_GAIN 0.7943f
		#ifdef OMASA_OBJECT_EDITING
		#define OMASA_GAIN_EDIT_THR 0.06f /* OMASA gain change threshold */
		#define OMASA_AZI_EDIT_THR 1.0f /* OMASA-DISC azimuth change threshold */
		#define OMASA_ELE_EDIT_THR 2.0f /* OMASA-DISC elevation change threshold */
		#endif

		#define MASA_JBM_RINGBUFFER_FRAMES 3

lib_com/ivas_ism_com.c

+11 −0

Original line number	Diff line number	Diff line
		@@ -418,6 +418,17 @@ void ivas_ism_reset_metadata(
		hIsmMeta->ism_metadata_flag = 0;
		hIsmMeta->non_diegetic_flag = 0;

		#ifdef OBJ_EDITING_API
		hIsmMeta->edited_gain = 1.0f;
		hIsmMeta->edited_azimuth = 0.0f;
		hIsmMeta->edited_elevation = 0.0f;
		hIsmMeta->edited_pitch = 0.0f;
		hIsmMeta->edited_yaw = 0.0f;
		hIsmMeta->edited_radius = 1.0f;
		hIsmMeta->gain = 1.0f;
		hIsmMeta->non_diegetic_flag = 0;
		#endif

		return;
		}

lib_com/ivas_prot.h

+33 −0

Original line number	Diff line number	Diff line
		@@ -809,6 +809,12 @@ void ivas_jbm_dec_feed_tc_to_renderer(
		float data / i/o: transport channels/output synthesis signal */
		);

		#ifdef OBJ_EDITING_API
		void ivas_jbm_dec_prepare_renderer(
		Decoder_Struct st_ivas / i/o: IVAS decoder structure */
		);
		#endif

		ivas_error ivas_jbm_dec_set_discard_samples(
		Decoder_Struct st_ivas / i/o: main IVAS decoder structre */
		);
		@@ -1018,6 +1024,11 @@ ivas_error ivas_ism_metadata_dec(
		DEC_CORE_HANDLE st0 /* i : core-coder handle */
		);

		#ifdef OBJ_EDITING_API
		void ivas_ism_renderer_update_md(
		Decoder_Struct st_ivas / i/o: main IVAS decoder handle */
		);
		#endif

		/----------------------------------------------------------------------------------
		* Parametric ISM prototypes
		@@ -1092,6 +1103,17 @@ void ivas_param_ism_dec_digest_tc(
		float transport_channels_f[] / i : synthesized core-coder transport channels/DirAC output */
		);

		#ifdef OBJ_EDITING_API
		void ivas_param_ism_dec_dequant_md(
		Decoder_Struct *st_ivas
		);

		void ivas_param_ism_dec_prepare_renderer(
		Decoder_Struct st_ivas, / i/o: IVAS decoder handle */
		const uint16_t nCldfbSlots /* i : number of CLFBS slots in the transport channels */
		);
		#endif

		void ivas_ism_param_dec_tc_gain_ajust(
		Decoder_Struct st_ivas, / i/o: IVAS decoder handle */
		const uint16_t nSamples, /* i : number of samples to be compensate */
		@@ -3845,6 +3867,13 @@ void ivas_param_mc_dec_digest_tc(
		float transport_channels_f[] / i : synthesized core-coder transport channels/DirAC output*/
		);

		#ifdef OBJ_EDITING_API
		void ivas_param_mc_dec_prepare_renderer(
		Decoder_Struct st_ivas, / i/o: IVAS decoder handle */
		const uint8_t nCldfbSlots /* i : number of CLFBS slots in the transport channels */
		);
		#endif

		void ivas_param_mc_dec_render(
		Decoder_Struct st_ivas, / i/o: IVAS decoder handle */
		const uint16_t nSamplesAsked, /* i : number of CLDFB slots requested */
		@@ -5779,7 +5808,11 @@ void ivas_omasa_dirac_rend_jbm(
		float output_f[] / o : rendered time signal */
		);

		#ifdef OMASA_OBJECT_EDITING
		void ivas_omasa_preProcessStereoTransportsForEditedObjects(
		#else
		void ivas_omasa_preProcessStereoTransportsForMovedObjects(
		#endif
		Decoder_Struct *st_ivas,
		float inRe[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX],
		float inIm[][CLDFB_SLOTS_PER_SUBFRAME][CLDFB_NO_CHANNELS_MAX],