[cleanup] accept OBJ_EDITING_PARAMISM_BIN (df7adc45) · Commits · SA4 / Audio / IVAS BASOP

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -202,7 +202,6 @@
		#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
		#define OBJ_EDITING_COMMANDLINE /* obj editing command-line option */
		#define OBJ_EDITING_PARAMISM_BIN /* Nokia: object editing for ParamISM to binaural */
		#define FIX_BRATE_SWITCHING /* VA: fix bitrate switching cases in OMASA and OSBA */
		#define NONBE_1217_INIT_OBJ_EDIT /* VA: issue 1217: do object editing only when objects metadata is available */
		#define FIX_1217_OBJECT_EDIT_FILE_INTERFACE /* Nokia: issue #1217: add decoder functionality to read object edit instructions from a file */

lib_dec/ivas_init_dec.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -1490,7 +1490,6 @@ ivas_error ivas_init_decoder(
		{
		st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->seed2 = st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->seed3;

		#ifdef OBJ_EDITING_PARAMISM_BIN
		if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC \|\| st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM )
		{
		/* reusing OMASA function for allocating and initializing MASA_ISM rendering handle (even though not in OMASA) */
		@@ -1499,7 +1498,6 @@ ivas_error ivas_init_decoder(
		return error;
		}
		}
		#endif
		}
		else if ( st_ivas->ism_mode == ISM_MODE_DISC )
		{

lib_dec/ivas_ism_dec.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -170,10 +170,8 @@ static ivas_error ivas_ism_bitrate_switching_dec(
		/* close the parametric binaural renderer */
		ivas_dirac_dec_close_binaural_data( st_ivas->hDiracDecBin );

		#ifdef OBJ_EDITING_PARAMISM_BIN
		/* Close omasa data struct (used for object editing) */
		ivas_omasa_data_close( &st_ivas->hMasaIsmData );
		#endif

		/* Open the TD Binaural renderer */
		if ( st_ivas->hHrtfTD == NULL \|\| st_ivas->hBinRendererTd == NULL )
		@@ -208,10 +206,8 @@ static ivas_error ivas_ism_bitrate_switching_dec(
		/* close the parametric binaural renderer */
		ivas_dirac_dec_close_binaural_data( st_ivas->hDiracDecBin );

		#ifdef OBJ_EDITING_PARAMISM_BIN
		/* Close omasa data struct (used for object editing) */
		ivas_omasa_data_close( &st_ivas->hMasaIsmData );
		#endif

		/* Open Crend Binaural renderer */
		if ( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ), st_ivas->intern_config, st_ivas->hOutSetup.output_config, st_ivas->hRenderConfig, st_ivas->hHrtfCrend, st_ivas->hHrtfStatistics, st_ivas->hDecoderConfig->output_Fs, 0, ( st_ivas->hSplitBinRend == NULL ) ? 1 : st_ivas->hSplitBinRend->splitrend.multiBinPoseData.num_poses ) ) != IVAS_ERR_OK )
		@@ -245,13 +241,11 @@ static ivas_error ivas_ism_bitrate_switching_dec(
		return error;
		}

		#ifdef OBJ_EDITING_PARAMISM_BIN
		/* Open omasa data struct (used for object editing) */
		if ( ( error = ivas_omasa_data_open( st_ivas ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		#endif

		/* Close the TD Binaural renderer */
		ivas_td_binaural_close( &st_ivas->hBinRendererTd );
		@@ -280,13 +274,11 @@ static ivas_error ivas_ism_bitrate_switching_dec(
		return error;
		}

		#ifdef OBJ_EDITING_PARAMISM_BIN
		/* Open omasa data struct (used for object editing) */
		if ( ( error = ivas_omasa_data_open( st_ivas ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		#endif

		/* close the crend binaural renderer */
		ivas_rend_closeCrend( &( st_ivas->hCrendWrapper ) );

lib_dec/ivas_ism_param_dec.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -1289,17 +1289,13 @@ void ivas_param_ism_params_to_masa_param_mapping(
		int16_t azimuth[2];
		int16_t elevation[2];
		float power_ratio[2];
		#ifdef OBJ_EDITING_PARAMISM_BIN
		MASA_ISM_DATA_HANDLE hMasaIsmData;
		int16_t obj;
		int16_t obj_idx;
		#endif

		hParamIsmDec = st_ivas->hParamIsmDec;
		hSpatParamRendCom = st_ivas->hSpatParamRendCom;
		#ifdef OBJ_EDITING_PARAMISM_BIN
		hMasaIsmData = st_ivas->hMasaIsmData;
		#endif
		nBins = hSpatParamRendCom->num_freq_bands;


		@@ -1365,7 +1361,6 @@ void ivas_param_ism_params_to_masa_param_mapping(
		hSpatParamRendCom->surroundingCoherence[sf_idx][bin_idx] = 0.0;
		}
		}
		#ifdef OBJ_EDITING_PARAMISM_BIN
		for ( obj = 0; obj < st_ivas->nchan_ism; obj++ )
		{
		for ( sf_idx = 0; sf_idx < MAX_PARAM_SPATIAL_SUBFRAMES; sf_idx++ )
		@@ -1402,7 +1397,6 @@ void ivas_param_ism_params_to_masa_param_mapping(
		}
		}
		}
		#endif
		}

		return;

lib_dec/lib_dec.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -1684,7 +1684,6 @@ ivas_error IVAS_DEC_SetEditableParameters(
		#endif
		for ( obj = 0; obj < hIvasEditableParameters.num_obj; obj++ )
		{
		#ifdef OBJ_EDITING_PARAMISM_BIN
		st_ivas->hParamIsmDec->edited_azimuth_values[obj] = hIvasEditableParameters.ism_metadata[obj].azimuth;
		st_ivas->hParamIsmDec->edited_elevation_values[obj] = hIvasEditableParameters.ism_metadata[obj].elevation;

		@@ -1716,11 +1715,9 @@ ivas_error IVAS_DEC_SetEditableParameters(
		}
		#ifdef NONBE_1217_OBJ_EDIT_FOA
		}
		#endif
		#endif
		}

		#ifdef OBJ_EDITING_PARAMISM_BIN
		#ifdef NONBE_1217_OBJ_EDIT_FOA
		if ( st_ivas->hMasaIsmData != NULL )
		{
		@@ -1731,7 +1728,6 @@ ivas_error IVAS_DEC_SetEditableParameters(
		}
		#endif

		#endif
		}
		else if ( ism_mode == ISM_MODE_NONE )
		{