Merge branch 'main' into 1224-float-split-rendering-command-line-issues (509103bf) · Commits · SA4 / Audio / IVAS BASOP

Workspace_msvc/lib_dec.vcxproj

+2 −1

Original line number	Diff line number	Diff line
		@@ -213,6 +213,8 @@
		<ClCompile Include="..\lib_dec\ivas_core_dec_fx.c" />
		<ClCompile Include="..\lib_dec\ivas_cpe_dec_fx.c" />
		<ClCompile Include="..\lib_dec\ivas_decision_matrix_dec_fx.c" />
		<ClCompile Include="..\lib_dec\ivas_dec_fx.c" />
		<ClCompile Include="..\lib_dec\ivas_dec_render_fx.c" />
		<ClCompile Include="..\lib_dec\ivas_dirac_dec_fx.c" />
		<ClCompile Include="..\lib_dec\ivas_dirac_output_synthesis_cov_fx.c" />
		<ClCompile Include="..\lib_dec\ivas_entropy_decoder_fx.c" />
		@@ -222,7 +224,6 @@
		<ClCompile Include="..\lib_dec\ivas_ism_metadata_dec_fx.c" />
		<ClCompile Include="..\lib_dec\ivas_ism_param_dec_fx.c" />
		<ClCompile Include="..\lib_dec\ivas_ism_renderer_fx.c" />
		<ClCompile Include="..\lib_dec\ivas_jbm_dec_fx.c" />
		<ClCompile Include="..\lib_dec\ivas_lfe_dec_fx.c" />
		<ClCompile Include="..\lib_dec\ivas_lfe_plc_fx.c" />
		<ClCompile Include="..\lib_dec\ivas_ls_custom_dec_fx.c" />

Workspace_msvc/lib_dec.vcxproj.filters

+6 −6

Original line number	Diff line number	Diff line
		@@ -326,9 +326,6 @@
		<ClCompile Include="..\lib_dec\vlpc_2st_dec_fx.c">
		<Filter>decoder_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_dec\ivas_binRenderer_internal_fx.c">
		<Filter>decoder_ivas_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_dec\ivas_core_dec_fx.c">
		<Filter>decoder_ivas_c</Filter>
		</ClCompile>
		@@ -362,9 +359,6 @@
		<ClCompile Include="..\lib_dec\ivas_ism_renderer_fx.c">
		<Filter>decoder_ivas_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_dec\ivas_jbm_dec_fx.c">
		<Filter>decoder_ivas_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_dec\ivas_ls_custom_dec_fx.c">
		<Filter>decoder_ivas_c</Filter>
		</ClCompile>
		@@ -509,6 +503,12 @@
		<ClCompile Include="..\lib_dec\rom_dec_fx.c">
		<Filter>decoder_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_dec\ivas_dec_fx.c">
		<Filter>decoder_ivas_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_dec\ivas_dec_render_fx.c">
		<Filter>decoder_ivas_c</Filter>
		</ClCompile>
		</ItemGroup>
		<ItemGroup>
		<ClInclude Include="..\lib_dec\lib_dec.h" />

apps/decoder.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -436,12 +436,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
		@@ -900,6 +899,7 @@ static bool parseCmdlIVAS_dec(
		arg->inputFormat = IVAS_DEC_INPUT_FORMAT_G192;
		arg->non_diegetic_pan_enabled = false;
		arg->non_diegetic_pan_gain = 0.f;
		arg->non_diegetic_pan_gain_fx = 0;
		arg->tsmEnabled = false;
		arg->render_num_subframes = IVAS_RENDER_NUM_SUBFR_20MS;
		arg->aeSequence.count = 0;

apps/renderer.c

+0 −37

Original line number	Diff line number	Diff line
		@@ -167,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];
		@@ -220,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,
		@@ -293,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",
		@@ -793,9 +778,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;
		@@ -925,13 +907,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 ) )
		{
		if ( RotationFileReader_open( args.externalOrientationFilePath, &externalOrientationFileReader ) != IVAS_ERR_OK )
		@@ -2213,9 +2188,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 )
		{
		@@ -2780,9 +2752,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 );
		@@ -2889,12 +2858,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/cldfb_evs_fx.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -996,6 +996,11 @@ ivas_error openCldfb(
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for CLDFB" );
		}

		#ifdef FIX_2319_CLDFB_INIT_FLAGS
		hs->flags = 0;
		move16();
		#endif

		hs->type = type;
		move16();