Merge branch '20240911_cleanup' into 'main' (999a0bab) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -1112,7 +1112,6 @@ static bool parseCmdlIVAS_dec(
		#ifdef OBJ_EDITING_EXAMPLE
		arg->objEditEnabled = false;
		#endif
		#


		/-----------------------------------------------------------------

apps/renderer.c

+0 −14

Original line number	Diff line number	Diff line
		@@ -169,10 +169,8 @@ typedef struct
		char customHrtfFilePath[RENDERER_MAX_CLI_ARG_LENGTH];
		char renderConfigFilePath[RENDERER_MAX_CLI_ARG_LENGTH];
		int8_t orientation_tracking;
		#ifdef FIX_1135_EXT_RENDERER_HANDLES
		int16_t Opt_Headrotation;
		int16_t Opt_ExternalOrientation;
		#endif
		int16_t nonDiegeticPan;
		float nonDiegeticPanGain;
		IVAS_REND_COMPLEXITY_LEVEL complexityLevel;
		@@ -886,11 +884,7 @@ int main(

		const int16_t frameSize_smpls = (int16_t) ( ( args.render_framesize ) * args.sampleRate * 5 / ( 1000 ) );

		#ifdef FIX_1135_EXT_RENDERER_HANDLES
		if ( ( error = IVAS_REND_Open( &hIvasRend, args.sampleRate, args.outConfig.audioConfig, !isEmptyString( args.customHrtfFilePath ), args.nonDiegeticPan, args.nonDiegeticPanGain, args.Opt_Headrotation, args.Opt_ExternalOrientation, (int16_t) args.render_framesize ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_REND_Open( &hIvasRend, args.sampleRate, args.outConfig.audioConfig, !isEmptyString( args.customHrtfFilePath ), args.nonDiegeticPan, args.nonDiegeticPanGain, (int16_t) args.render_framesize ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "Error opening renderer handle: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		@@ -2518,10 +2512,8 @@ static CmdlnArgs defaultArgs(
		clearString( args.renderConfigFilePath );
		clearString( args.externalOrientationFilePath );

		#ifdef FIX_1135_EXT_RENDERER_HANDLES
		args.Opt_Headrotation = 0;
		args.Opt_ExternalOrientation = 0;
		#endif
		args.orientation_tracking = IVAS_HEAD_ORIENT_TRK_NONE;

		args.nonDiegeticPan = 0;
		@@ -2611,9 +2603,7 @@ static void parseOption(
		break;
		case CmdLnOptionId_trajFile:
		assert( numOptionValues == 1 );
		#ifdef FIX_1135_EXT_RENDERER_HANDLES
		args->Opt_Headrotation = 1;
		#endif
		strncpy( args->headRotationFilePath, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 );
		break;
		case CmdLnOptionId_outputMetadata:
		@@ -2634,9 +2624,7 @@ static void parseOption(
		break;
		case CmdLnOptionId_exteriorOrientationFile:
		assert( numOptionValues == 1 );
		#ifdef FIX_1135_EXT_RENDERER_HANDLES
		args->Opt_ExternalOrientation = 1;
		#endif
		strncpy( args->externalOrientationFilePath, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 );
		break;
		case CmdLnOptionId_customHrtfFile:
		@@ -2761,12 +2749,10 @@ static CmdlnArgs parseCmdlnArgs(
		exit( -1 ); /* Error printout handled by failing function */
		}

		#ifdef FIX_1135_EXT_RENDERER_HANDLES
		if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
		{
		args.Opt_Headrotation = 1;
		}
		#endif

		return args;
		}

lib_com/cnst.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -563,9 +563,7 @@ enum

		#define INT_FS_12k8 12800 /* internal sampling frequency */
		#define M 16 /* order of the LP filter @ 12.8kHz */
		#ifdef NONE_BE_FIX_816_LFE_PLC_FLOAT
		#define MAX_LP_FILTER_ORDER 20 /* Max order of an LP filter */
		#endif

		#define L_FRAME 256 /* frame size at 12.8kHz */
		#define NB_SUBFR 4 /* number of subframes per frame */

lib_com/ivas_cnst.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -1449,11 +1449,7 @@ typedef enum
		/* LFE PLC */
		#define LFE_PLC_BUFLEN 240
		#define LFE_PLC_FS 1600
		#ifdef NONE_BE_FIX_816_LFE_PLC_FLOAT
		#define L_FRAME_1k6 ( LFE_PLC_FS / FRAMES_PER_SEC )
		#else
		#define L_FRAME_1k6 ( 20 * LFE_PLC_FS / 1000 )
		#endif
		#define LFE_PLC_LENANA LFE_PLC_BUFLEN
		#define LFE_PLC_FDEL 300

lib_com/ivas_prot.h

+0 −17

Original line number	Diff line number	Diff line
		@@ -4024,7 +4024,6 @@ void ivas_dirac_dec_output_synthesis_cov_close(
		);

		void ivas_dirac_dec_output_synthesis_cov_param_mc_collect_slot(
		#ifdef FIX_835_PARAMMC_BUFFER_VALUES
		float RealBuffer, / i : input channel filter bank samples (real part) */
		float ImagBuffer, / i : input channel filter bank samples (imaginary part */
		float cx[PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS], /* o : accumulated input covariance (real part) */
		@@ -4032,14 +4031,6 @@ void ivas_dirac_dec_output_synthesis_cov_param_mc_collect_slot(
		const int16_t param_band, /* i : parameter band */
		PARAM_MC_DEC_HANDLE hParamMC, /* i : handle to Parametric MC state */
		const int16_t nchan_in /* i : number of input channels */
		#else
		float RealBuffer, / i : input channel filter bank samples (real part) */
		float ImagBuffer, / i : input channel filter bank samples (imaginary part) */
		float cx[PARAM_MC_MAX_PARAMETER_BANDS][PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS], /* o : accumulated input covariance (real part) */
		float cx_imag[PARAM_MC_MAX_PARAMETER_BANDS][PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS], /* o : accumulated input covariance (imaginary part) */
		PARAM_MC_DEC_HANDLE hParamMC, /* i : handle to Parametric MC state */
		const int16_t nchan_in /* i : number of input channels */
		#endif
		);

		void ivas_dirac_dec_output_synthesis_cov_param_mc_synthesise_slot(
		@@ -5532,11 +5523,7 @@ void ivas_lfe_dec(

		void ivas_lfe_tdplc(
		LFE_DEC_HANDLE hLFE, /* i/o: LFE decoder handle */
		#ifdef NONE_BE_FIX_816_LFE_PLC_FLOAT
		float prevsynth, / i : previous frame synthesis */
		#else
		double prevsynth, / i : previous frame synthesis */
		#endif
		float ytda, / o : output time-domain buffer */
		const int16_t output_frame /* i : output frame length */
		);
		@@ -5784,11 +5771,7 @@ void ivas_omasa_combine_separate_ism_with_masa(
		const int16_t output_frame /* i : output frame length per channel */
		);

		#ifdef FIX_1161_REDUCE_OMASA_HEAP
		ivas_error ivas_omasa_objects_delay_open(
		#else
		ivas_error ivas_omasa_render_objects_from_mix_open(
		#endif
		Decoder_Struct st_ivas / i/o: IVAS decoder structure */
		);