Merge branch 'main' into 1224-float-split-rendering-command-line-issues (2fa6b204) · Commits · IVAS Codec Public Collaboration / IVAS Codec

Workspace_msvc/lib_dec.vcxproj

+1 −1

Original line number	Diff line number	Diff line
		@@ -210,6 +210,7 @@
		<ClCompile Include="..\lib_dec\ivas_cpe_dec.c" />
		<ClCompile Include="..\lib_dec\ivas_dec.c" />
		<ClCompile Include="..\lib_dec\ivas_decision_matrix_dec.c" />
		<ClCompile Include="..\lib_dec\ivas_dec_render.c" />
		<ClCompile Include="..\lib_dec\ivas_dirac_dec.c" />
		<ClCompile Include="..\lib_dec\ivas_dirac_output_synthesis_cov.c" />
		<ClCompile Include="..\lib_dec\ivas_entropy_decoder.c" />
		@@ -219,7 +220,6 @@
		<ClCompile Include="..\lib_dec\ivas_ism_metadata_dec.c" />
		<ClCompile Include="..\lib_dec\ivas_ism_param_dec.c" />
		<ClCompile Include="..\lib_dec\ivas_ism_renderer.c" />
		<ClCompile Include="..\lib_dec\ivas_jbm_dec.c" />
		<ClCompile Include="..\lib_dec\ivas_lfe_dec.c" />
		<ClCompile Include="..\lib_dec\ivas_lfe_plc.c" />
		<ClCompile Include="..\lib_dec\ivas_ls_custom_dec.c" />

Workspace_msvc/lib_dec.vcxproj.filters

+3 −6

Original line number	Diff line number	Diff line
		@@ -4,9 +4,6 @@
		<ClCompile Include="..\lib_dec\ivas_agc_dec.c">
		<Filter>decoder_ivas_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_dec\ivas_binRenderer_internal.c">
		<Filter>decoder_ivas_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_dec\ivas_core_dec.c">
		<Filter>decoder_ivas_c</Filter>
		</ClCompile>
		@@ -49,9 +46,6 @@
		<ClCompile Include="..\lib_dec\ivas_ism_renderer.c">
		<Filter>decoder_ivas_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_dec\ivas_jbm_dec.c">
		<Filter>decoder_ivas_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_dec\ivas_lfe_dec.c">
		<Filter>decoder_ivas_c</Filter>
		</ClCompile>
		@@ -515,6 +509,9 @@
		<Filter>decoder_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_dec\lib_dec.c" />
		<ClCompile Include="..\lib_dec\ivas_dec_render.c">
		<Filter>decoder_ivas_c</Filter>
		</ClCompile>
		</ItemGroup>
		<ItemGroup>
		<ClInclude Include="..\lib_dec\ivas_stat_dec.h">

apps/decoder.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -470,12 +470,11 @@ int main(
		goto cleanup;
		}

		#ifdef FIX_1449_RENDERER_FRAME_SIZE_UNCLEAR_IN_ISAR
		if ( !arg.renderConfigEnabled && ( arg.render_num_subframes != asked_num_subframes ) )
		{
		fprintf( stderr, "\nChanged render framesize, only 20ms allowed!\n" );
		}
		#endif
		}

		/------------------------------------------------------------------------------------------
		* Configure VoIP mode

apps/renderer.c

+0 −40

Original line number	Diff line number	Diff line
		@@ -48,9 +48,6 @@
		#include "rotation_file_reader.h"
		#include "aeid_file_reader.h"
		#include "split_render_file_read_write.h"
		#ifndef FIX_1494_SET_SPLITBFI_UNUSED
		#include "split_rend_bfi_file_reader.h"
		#endif
		#include "vector3_pair_file_reader.h"
		#ifdef DEBUGGING
		#include "debug.h"
		@@ -170,9 +167,6 @@ typedef struct
		int16_t numInMetadataFiles;
		char outMetadataFilePath[RENDERER_MAX_CLI_ARG_LENGTH];
		char headRotationFilePath[RENDERER_MAX_CLI_ARG_LENGTH];
		#ifndef FIX_1494_SET_SPLITBFI_UNUSED
		char splitRendBFIFilePath[RENDERER_MAX_CLI_ARG_LENGTH];
		#endif
		char referenceVectorFilePath[RENDERER_MAX_CLI_ARG_LENGTH];
		char referenceRotationFilePath[RENDERER_MAX_CLI_ARG_LENGTH];
		char externalOrientationFilePath[RENDERER_MAX_CLI_ARG_LENGTH];
		@@ -223,9 +217,6 @@ typedef enum
		CmdLnOptionId_listFormats,
		CmdLnOptionId_inputGain,
		CmdLnOptionId_outputMetadata,
		#ifndef FIX_1494_SET_SPLITBFI_UNUSED
		CmdLnOptionId_SplitRendBFIFile,
		#endif
		CmdLnOptionId_referenceVectorFile,
		CmdLnOptionId_exteriorOrientationFile,
		CmdLnOptionId_framing,
		@@ -296,15 +287,6 @@ static const CmdLnParser_Option cliOptions[] = {
		.placeholder = "<path>",
		.description = "coded metadata file for BINAURAL_SPLIT_PCM output mode",
		},
		#ifndef FIX_1494_SET_SPLITBFI_UNUSED
		{
		.id = CmdLnOptionId_SplitRendBFIFile,
		.match = "post_rend_bfi_file",
		.matchShort = "prbfi",
		.placeholder = "<path>",
		.description = "Split rendering option: bfi file",
		},
		#endif
		{
		.id = CmdLnOptionId_refRotFile,
		.match = "reference_rotation_file",
		@@ -725,9 +707,6 @@ int main(
		IVAS_CLDFB_FILTER_BANK_HANDLE cldfbAna[RENDERER_MAX_INPUT_CHANNELS];
		IVAS_CLDFB_FILTER_BANK_HANDLE cldfbSyn[RENDERER_MAX_INPUT_CHANNELS];
		int16_t cldfb_in_flag, CLDFBframeSize_smpls;
		#ifndef FIX_1494_SET_SPLITBFI_UNUSED
		SplitRendBFIFileReader *splitRendBFIReader = NULL;
		#endif
		Vector3PairFileReader *referenceVectorReader = NULL;
		hrtfFileReader *hrtfFileReader = NULL;
		IVAS_DEC_HRTF_CREND_HANDLE *hHrtfCrend = NULL;
		@@ -858,13 +837,6 @@ int main(
		}
		}

		#ifndef FIX_1494_SET_SPLITBFI_UNUSED
		if ( !isEmptyString( args.splitRendBFIFilePath ) )
		{
		convert_backslash( args.splitRendBFIFilePath );
		SplitRendBFIFileReader_open( args.splitRendBFIFilePath, &splitRendBFIReader );
		}
		#endif

		if ( !isEmptyString( args.externalOrientationFilePath ) )
		{
		@@ -2109,9 +2081,6 @@ cleanup:
		}

		split_rend_reader_writer_close( &hSplitRendFileReadWrite );
		#ifndef FIX_1494_SET_SPLITBFI_UNUSED
		SplitRendBFIFileReader_close( &splitRendBFIReader );
		#endif

		for ( i = 0; i < RENDERER_MAX_MC_INPUTS; ++i )
		{
		@@ -2681,9 +2650,6 @@ static CmdlnArgs defaultArgs(

		clearString( args.headRotationFilePath );
		clearString( args.outMetadataFilePath );
		#ifndef FIX_1494_SET_SPLITBFI_UNUSED
		clearString( args.splitRendBFIFilePath );
		#endif
		clearString( args.referenceVectorFilePath );
		clearString( args.referenceRotationFilePath );
		clearString( args.customHrtfFilePath );
		@@ -2790,12 +2756,6 @@ static int16_t parseOption(
		assert( numOptionValues == 1 );
		strncpy( args->outMetadataFilePath, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 );
		break;
		#ifndef FIX_1494_SET_SPLITBFI_UNUSED
		case CmdLnOptionId_SplitRendBFIFile:
		assert( numOptionValues == 1 );
		strncpy( args->splitRendBFIFilePath, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 );
		break;
		#endif
		case CmdLnOptionId_referenceVectorFile:
		assert( numOptionValues == 1 );
		strncpy( args->referenceVectorFilePath, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 );

lib_com/ivas_prot.h

+0 −16

Original line number	Diff line number	Diff line
		@@ -160,11 +160,7 @@ ivas_error ivas_mct_enc(
		const int16_t nb_bits_metadata /* i : number of metadata bits */
		);

		#ifdef FIX_2344_ALIGN_PREPROC
		void pre_proc_front_ivas(
		#else
		ivas_error pre_proc_front_ivas(
		#endif
		SCE_ENC_HANDLE hSCE, /* i/o: SCE encoder structure */
		CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */
		const int32_t element_brate, /* i : SCE/CPE element bitrate */
		@@ -211,11 +207,7 @@ ivas_error pre_proc_front_ivas(
		const int32_t ivas_total_brate /* i : IVAS total bitrate */
		);

		#ifdef FIX_2344_ALIGN_PREPROC
		void pre_proc_ivas(
		#else
		ivas_error pre_proc_ivas(
		#endif
		Encoder_State st, / i/o: encoder state structure */
		const int16_t last_element_mode, /* i : last element mode */
		const int32_t element_brate, /* i : element bitrate */
		@@ -243,11 +235,7 @@ ivas_error pre_proc_ivas(
		const int16_t flag_16k_smc /* i : flag to indicate if the OL SMC is run at 16 kHz */
		);

		#ifdef FIX_2344_ALIGN_PREPROC
		void ivas_compute_core_buffers(
		#else
		ivas_error ivas_compute_core_buffers(
		#endif
		Encoder_State st, / i/o: encoder state structure */
		float *inp16k_out, / o : ptr. to inp. signal in the current frame*/
		float old_inp_16k, / i/o: buffer of old input signal @ 16kHz */
		@@ -3580,10 +3568,6 @@ void ivas_sba_dirac_stereo_dec(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		float output[CPE_CHANNELS], / o : output synthesis signal */
		const int16_t output_frame /* i : output frame length per channel */
		#ifndef REMOVE_UNUSED_CODE_IVAS_DEC
		,
		const int16_t mcmasa /* i : McMASA flag */
		#endif
		);

		void ivas_sba_dirac_stereo_config(