formatting, comments,error returns (22e41ec6) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -1727,10 +1727,11 @@ static ivas_error initOnFirstGoodFrame(
		MasaFileWriter *ppMasaWriter, / o : */
		IsmFileWriter ismWriters[IVAS_MAX_NUM_OBJECTS], / o : */
		int16_t pNumOutChannels, / o : */
		uint16_t pNumObj / o : */
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		,
		uint16_t pNumObj, / o : */
		SplitFileReadWrite **splitRendWriter
		#else
		uint16_t pNumObj / o : */
		#endif
		)
		{

apps/renderer.c

+13 −9

Original line number	Diff line number	Diff line
		@@ -482,10 +482,11 @@ static int16_t getTotalNumInChannels(
		IVAS_REND_InputId mcIds[RENDERER_MAX_MC_INPUTS],
		IVAS_REND_InputId ismIds[RENDERER_MAX_ISM_INPUTS],
		IVAS_REND_InputId sbaIds[RENDERER_MAX_SBA_INPUTS],
		IVAS_REND_InputId masaIds[RENDERER_MAX_MASA_INPUTS]
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		,
		IVAS_REND_InputId masaIds[RENDERER_MAX_MASA_INPUTS],
		IVAS_REND_InputId splitBinIds[RENDERER_MAX_BIN_INPUTS]
		#else
		IVAS_REND_InputId masaIds[RENDERER_MAX_MASA_INPUTS]
		#endif
		)
		{
		@@ -590,10 +591,11 @@ static void setupWithSingleFormatInput(
		CmdlnArgs args,
		char *audioFilePath,
		IsmPositionProvider *positionProvider,
		MasaFileReader **masaReaders
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		,
		MasaFileReader **masaReaders,
		SplitFileReadWrite **hhSplitRendFileReadWrite
		#else
		MasaFileReader **masaReaders
		#endif
		)
		{
		@@ -609,7 +611,7 @@ static void setupWithSingleFormatInput(
		exit( -1 );
		}

		for ( int32_t i = 0; i < args.numInMetadataFiles; ++i )
		for ( int16_t i = 0; i < args.numInMetadataFiles; ++i )
		{
		masaReaders[i] = MasaFileReader_open( args.inMetadataFilePaths[i] );
		if ( masaReaders[i] == NULL )
		@@ -3816,11 +3818,12 @@ static void convertInputBuffer(
		const int16_t numIntSamplesPerChannel,
		const int16_t numFloatSamplesPerChannel,
		const int16_t numChannels,
		float *floatBuffer
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		,
		float *floatBuffer,
		const int16_t cldfb_in_flag,
		IVAS_CLDFB_FILTER_BANK_HANDLE *cldfbAna
		#else
		float *floatBuffer
		#endif
		)
		{
		@@ -3904,11 +3907,12 @@ static void convertOutputBuffer(
		const float *floatBuffer,
		const int16_t numSamplesPerChannel,
		const int16_t numChannels,
		int16_t *intBuffer
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		,
		int16_t *intBuffer,
		const int16_t cldfb_in_flag,
		IVAS_CLDFB_FILTER_BANK_HANDLE *cldfbSyn
		#else
		int16_t *intBuffer
		#endif
		)
		{

lib_com/delay_comp.c

+6 −5

Original line number	Diff line number	Diff line
		@@ -54,10 +54,11 @@ int32_t get_delay(
		const int16_t enc_dec, /* i : encoder/decoder flag */
		const int32_t io_fs, /* i : input/output sampling frequency */
		const IVAS_FORMAT ivas_format, /* i : IVAS format */
		HANDLE_CLDFB_FILTER_BANK hCldfb /* i : Handle of Cldfb analysis */
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		,
		HANDLE_CLDFB_FILTER_BANK hCldfb, /* i : Handle of Cldfb analysis */
		const AUDIO_CONFIG output_config /* i : decoder output config */
		#else
		HANDLE_CLDFB_FILTER_BANK hCldfb /* i : Handle of Cldfb analysis */
		#endif
		)
		{

lib_com/ivas_cnst.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -1081,10 +1081,10 @@ enum
		#define IVAS_PCA_N1 91
		#define IVAS_PCA_N1_EQ ( (IVAS_PCA_N1-1)/2 )
		#define IVAS_PCA_BIT_LEN ( 1 + ( IVAS_PCA_QBITS - 1 + IVAS_PCA_QBITS ) )
		#define IVAS_PCA_INTERP 4 /* 4D (Quaternion) dimension */
		#define IVAS_PCA_N_SLOTS 40 //20
		#define IVAS_PCA_INTERP 4
		#define IVAS_PCA_N_SLOTS 40
		#define IVAS_PCA_LEN_INTERP_Q ( IVAS_PCA_INTERP * IVAS_PCA_N_SLOTS )
		#define IVAS_PCA_DELAY_CMP 24 // 12
		#define IVAS_PCA_DELAY_CMP 24
		#define IVAS_PCA_LEN_INTERP_EIG_DEC ( (IVAS_PCA_N_SLOTS+IVAS_PCA_DELAY_CMP)*16)
		#define IVAS_PCA_THRES_MIN_DOT 0.8f
		#define IVAS_PCA_THRES_MIN_DOT2 0.0f

lib_com/ivas_prot.h

+6 −6

Original line number	Diff line number	Diff line
		@@ -1172,8 +1172,8 @@ void ivas_ism_metadata_sid_enc(
		);

		void ivas_ism_metadata_sid_dec(
		SCE_DEC_HANDLE hSCE[MAX_SCE], /* i/o: SCE encoder structure */
		const int32_t ism_total_brate, /* i : ISms total bitrate */
		SCE_DEC_HANDLE hSCE[MAX_SCE], /* i/o: SCE decoder structure */
		const int32_t ism_total_brate, /* i : ISM total bitrate */
		const int16_t bfi, /* i : bfi flag */
		const int16_t nchan_ism, /* i : number of objects */
		const int16_t nchan_transport, /* i : number of transport channels */
		@@ -1219,7 +1219,7 @@ void ivas_get_ism_sid_quan_bitbudget(
		);

		void ivas_ism_dtx_limit_noise_energy_for_near_silence(
		SCE_DEC_HANDLE hSCE[], /* i/o: SCE encoder structures */
		SCE_DEC_HANDLE hSCE[], /* i/o: SCE decoder structures */
		const int16_t sce_id_dtx, /* i : SCE DTX ID */
		const int16_t nchan_transport /* i : number of transport channels */
		);
		@@ -4161,7 +4161,7 @@ ivas_error ivas_sba_linear_renderer(
		float output_f[], / i/o: synthesized core-coder transport channels/DirAC output */
		const int16_t output_frame, /* i : output frame length per channel */
		const int16_t nchan_in, /* i : number of input ambisonics channels */
		const int16_t nchan_ism,
		const int16_t nchan_ism, /* i : number of objects */
		const AUDIO_CONFIG output_config, /* i : output audio configuration */
		const IVAS_OUTPUT_SETUP output_setup /* i : output format setup */
		#ifndef REMOVE_UNUSED_FUNCTION
		@@ -4182,9 +4182,9 @@ void ivas_sba_mix_matrix_determiner(
		/! r: AGC enable flag /
		int16_t ivas_agc_enc_get_flag(
		#ifdef DEBUG_AGC_ENCODER_CMD_OPTION
		int16_t agc_configuration, /* i : AGC configuration from command-line */
		const int16_t agc_configuration, /* i : AGC configuration from command-line */
		#endif
		int16_t nchan_transport /* i : number of transport channels */
		const int16_t nchan_transport /* i : number of transport channels */
		);

		ivas_error ivas_spar_agc_enc_open(