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

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -124,7 +124,6 @@
		#define TMP_FIX_OMASA_SR_BE // temporary fix to keep OMASA split-rendering BE
		#define OBJ_EDITING_COMMANDLINE /* obj editing command-line option */
		#define NONBE_1399_1400_FIX_OBJ_EDIT_ISSUES // Nokia: Fix 1399_1400 issue in float, this is essential for the BASOP porting
		#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 OBJ_EDIT_BASOP
		#define NONBE_1217_INIT_OBJ_EDIT /* VA: issue 1217: do object editing only when objects metadata is available */

lib_dec/ivas_init_dec_fx.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -1786,7 +1786,6 @@ ivas_error ivas_init_decoder_fx(
		{
		st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->seed2 = st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->seed3;
		move16();
		#ifdef OBJ_EDITING_PARAMISM_BIN
		IF( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC ) \|\| EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC_ROOM ) )
		{
		/* reusing OMASA function for allocating and initializing MASA_ISM rendering handle (even though not in OMASA) */
		@@ -1795,7 +1794,6 @@ ivas_error ivas_init_decoder_fx(
		return error;
		}
		}
		#endif
		}
		ELSE IF( EQ_32( st_ivas->ism_mode, ISM_MODE_DISC ) )
		{

lib_dec/ivas_ism_dec_fx.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -189,10 +189,8 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx(
		{
		/* close the parametric binaural renderer */
		ivas_dirac_dec_close_binaural_data_fx( st_ivas->hDiracDecBin );
		#ifdef OBJ_EDITING_PARAMISM_BIN
		/* Close omasa data struct (used for object editing) */
		ivas_omasa_data_close_fx( &st_ivas->hMasaIsmData );
		#endif

		/* Open the TD Binaural renderer */
		test();
		@@ -229,10 +227,8 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx(
		ivas_dirac_dec_close_binaural_data_fx( st_ivas->hDiracDecBin );


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

		/* Open Crend Binaural renderer */
		IF( NE_32( ( error = ivas_rend_openCrend_fx( &( 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 ) )
		@@ -265,13 +261,11 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx(
		{
		return error;
		}
		#ifdef OBJ_EDITING_PARAMISM_BIN
		/* Open omasa data struct (used for object editing) */
		IF( ( error = ivas_omasa_data_open_fx( st_ivas ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		#endif

		/* Close the TD Binaural renderer */
		ivas_td_binaural_close_fx( &st_ivas->hBinRendererTd );
		@@ -300,13 +294,11 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx(
		return error;
		}

		#ifdef OBJ_EDITING_PARAMISM_BIN
		/* Open omasa data struct (used for object editing) */
		IF( ( error = ivas_omasa_data_open_fx( st_ivas ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		#endif
		/* close the crend binaural renderer */
		ivas_rend_closeCrend_fx( &( st_ivas->hCrendWrapper ) );
		}

lib_dec/ivas_ism_param_dec_fx.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -1824,19 +1824,15 @@ void ivas_param_ism_params_to_masa_param_mapping_fx(
		Word16 azimuth[2];
		Word16 elevation[2];
		Word16 power_ratio_fx[2]; /* Q15 */
		#ifdef OBJ_EDITING_PARAMISM_BIN
		MASA_ISM_DATA_HANDLE hMasaIsmData;
		Word16 obj;
		Word16 obj_idx;
		#endif

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

		@@ -1928,7 +1924,6 @@ void ivas_param_ism_params_to_masa_param_mapping_fx(
		}
		}

		#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++ )
		@@ -1965,7 +1960,6 @@ void ivas_param_ism_params_to_masa_param_mapping_fx(
		}
		}
		}
		#endif
		}

		return;

lib_dec/lib_dec_fx.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -4410,7 +4410,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_fx[obj] = hIvasEditableParameters.ism_metadata[obj].azimuth_fx;
		move32();
		st_ivas->hParamIsmDec->edited_elevation_values_fx[obj] = hIvasEditableParameters.ism_metadata[obj].elevation_fx;
		@@ -4446,11 +4445,9 @@ ivas_error IVAS_DEC_SetEditableParameters(
		move16();
		#ifdef NONBE_1217_OBJ_EDIT_FOA
		}
		#endif
		#endif
		}

		#ifdef OBJ_EDITING_PARAMISM_BIN
		#ifdef NONBE_1217_OBJ_EDIT_FOA
		IF( st_ivas->hMasaIsmData != NULL )
		{
		@@ -4460,7 +4457,6 @@ ivas_error IVAS_DEC_SetEditableParameters(
		move16();
		#ifdef NONBE_1217_OBJ_EDIT_FOA
		}
		#endif
		#endif
		}
		ELSE IF( EQ_32( ism_mode, ISM_MODE_NONE ) )