Merge remote-tracking branch 'remotes/origin/1954-ref-PortFlpMr2069' into... (b7d9cc05) · Commits · SA4 / Audio / IVAS BASOP

apps/decoder.c

+85 −1

Original line number	Diff line number	Diff line
		@@ -56,7 +56,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

		@@ -141,6 +145,9 @@ typedef struct
		AcousticEnvironmentSequence aeSequence;
		bool dpidEnabled;
		uint16_t directivityPatternId[IVAS_MAX_NUM_OBJECTS];
		#ifdef OBJ_EDITING_EXAMPLE
		bool objEditEnabled;
		#endif

		} DecArguments;

		@@ -1010,6 +1017,9 @@ static bool parseCmdlIVAS_dec(
		{
		arg->directivityPatternId[i] = 65535;
		}
		#ifdef OBJ_EDITING_EXAMPLE
		arg->objEditEnabled = false;
		#endif

		/-----------------------------------------------------------------
		* Initialization
		@@ -1539,6 +1549,13 @@ 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
		@@ -1750,6 +1767,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" );
		@@ -2142,6 +2162,11 @@ static ivas_error decodeG192(
		int16_t isSplitRend, isSplitCoded;
		IVAS_RENDER_CONFIG_DATA renderConfig;
		RenderConfigReader *renderConfigReader = NULL;
		#ifdef OBJ_EDITING_API
		#ifdef OBJ_EDITING_EXAMPLE
		IVAS_EDITABLE_PARAMETERS editableParameters;
		#endif
		#endif

		#ifdef VARIABLE_SPEED_DECODING
		#ifdef LIB_DEC_REVISION
		@@ -2499,6 +2524,65 @@ static ivas_error decodeG192(
		}

		#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 )
		{

lib_com/ivas_cnst.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -1221,6 +1221,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_prot.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -5827,7 +5827,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],

lib_com/options.h

+15 −0

Original line number	Diff line number	Diff line
		@@ -186,6 +186,7 @@
		#define FIX_1385_INIT_IGF_STOP_FREQ /* FhG: Initialize infoIGFStopFreq in init_igf_dec() */
		#define FIX_1387_INIT_PRM_SQQ /* FhG: initialize pointer prm_sqQ, which might be uninitialized in case of bfi == 1 */
		#define FIX_1349_TNS_CRASH /* FhG: Fix crash in TNS entropy coding, in case order of joint TNS coding is reduced to 0 */
		#define NONBE_1300_TDREND_LARGE_ITD /* Eri: issue 1300: There was a bug feeding 1.25 ms frames to the TD renderer, causing out-of-buffer access. This was resolved. However, it is still possible that modeled HRTF with large ITDs could trigger out-of-buffer access. This adds a check to prevent this.*/
		#define NONBE_1199_OMASA_JBM_BRATE_SW_FLUSH /* VA: issue 1199: fix bug in renderer flush in OMASA JBM bitrate switching */
		#define NONBE_1200_ISM_JBM_BRATE_SW_FLUSH /* VA: issue 1200: fix bug in renderer flush in ISM JBM bitrate switching */
		#define NONBE_1293_CRASH_FIRST_FRAME_LOST /* VA: issue 1293: fix G.192 decoder crash when first frame is lost */
		@@ -203,6 +204,20 @@
		#define TMP_FIX_OMASA_SR_BE // temporary fix to keep OMASA split-rendering BE
		#endif

		// objject-editing feature porting
		#define OBJ_EDITING_INTERFACE /* Interface for object editing */
		#ifdef OBJ_EDITING_INTERFACE
		#define OBJ_EDITING_API /* object editing changes related to the API */
		#ifdef OBJ_EDITING_API
		#define FIX_HRTF_LOAD_API // solves API conflicts between HRTF and object-editing features
		#define TMP_FIX_SPLIT_REND // temporary fix to split-rendering (it follows the later state of the framework but it is needed now because of current test-conditions)
		#define TMP_FIX_OMASA_SR_BE // temporary fix to keep OMASA split-rendering BE
		#endif
		#define OBJ_EDITING_EXAMPLE /* obj editing example code in decoder.c */
		#endif
		#define OMASA_OBJECT_EDITING /* Nokia: object editing interface for OMASA */
		#define OBJ_EDITING_PARAMISM_BIN /* Nokia: object editing for ParamISM to binaural */

		/* #################### End BASOP porting switches ############################ */

		/* clang-format on */

lib_dec/ivas_dirac_dec.c

+11 −0

Original line number	Diff line number	Diff line
		@@ -1934,6 +1934,16 @@ void ivas_dirac_dec_render_sf(
		}
		}

		#ifdef OMASA_OBJECT_EDITING
		if ( st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ )
		{
		#ifdef FIX_1319_STACK_SBA_DECODER
		ivas_omasa_preProcessStereoTransportsForEditedObjects( st_ivas, Cldfb_RealBuffer_Binaural[0], Cldfb_ImagBuffer_Binaural[0], hSpatParamRendCom->num_freq_bands, subframe_idx );
		#else
		ivas_omasa_preProcessStereoTransportsForEditedObjects( st_ivas, Cldfb_RealBuffer_Temp, Cldfb_ImagBuffer_Temp, hSpatParamRendCom->num_freq_bands, subframe_idx );
		#endif
		}
		#else
		if ( st_ivas->ism_mode != ISM_MASA_MODE_DISC && st_ivas->ism_mode != ISM_MASA_MODE_MASA_ONE_OBJ )
		{
		#ifdef FIX_1319_STACK_SBA_DECODER
		@@ -1942,6 +1952,7 @@ void ivas_dirac_dec_render_sf(
		ivas_omasa_preProcessStereoTransportsForMovedObjects( st_ivas, Cldfb_RealBuffer_Temp, Cldfb_ImagBuffer_Temp, hSpatParamRendCom->num_freq_bands, subframe_idx );
		#endif
		}
		#endif
		}

		for ( slot_idx = 0; slot_idx < hSpatParamRendCom->subframe_nbslots[subframe_idx]; slot_idx++ )

Admin message