Merge branch 'main' into kiene/first-frame-is-sid-test (03a72c02) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ variables:
		SANITIZER_TESTS: "CLANG1 CLANG2"
		OUT_FORMATS_CHANNEL_BASED: "stereo mono 5_1 5_1_2 5_1_4 7_1 7_1_4"
		OUT_FORMATS_SCENE_BASED: "FOA HOA2 HOA3"
		OUT_FORMATS_BINAURAL: "BINAURAL BINAURAL_ROOM"
		OUT_FORMATS_BINAURAL: "BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB"
		EXIT_CODE_NON_BE: 123
		EXIT_CODE_FAIL: 1

Workspace_msvc/lib_rend.vcxproj

+4 −0

Original line number	Diff line number	Diff line
		@@ -202,14 +202,18 @@
		<ClCompile Include="..\lib_rend\ivas_sba_rendering.c" />
		<ClCompile Include="..\lib_rend\ivas_allrad_dec.c" />
		<ClCompile Include="..\lib_rend\ivas_crend.c" />
		<ClCompile Include="..\lib_rend\ivas_dirac_ana.c" />
		<ClCompile Include="..\lib_rend\ivas_efap.c" />
		<ClCompile Include="..\lib_rend\ivas_limiter.c" />
		<ClCompile Include="..\lib_rend\ivas_masa_merge.c" />
		<ClCompile Include="..\lib_rend\ivas_mcmasa_ana.c" />
		<ClCompile Include="..\lib_rend\ivas_objectRenderer.c" />
		<ClCompile Include="..\lib_rend\ivas_objectRenderer_hrFilt.c" />
		<ClCompile Include="..\lib_rend\ivas_objectRenderer_mix.c" />
		<ClCompile Include="..\lib_rend\ivas_objectRenderer_sfx.c" />
		<ClCompile Include="..\lib_rend\ivas_objectRenderer_sources.c" />
		<ClCompile Include="..\lib_rend\ivas_objectRenderer_vec.c" />
		<ClCompile Include="..\lib_rend\ivas_omasa_ana.c" />
		<ClCompile Include="..\lib_rend\ivas_orient_trk.c" />
		<ClCompile Include="..\lib_rend\ivas_output_init.c" />
		<ClCompile Include="..\lib_rend\ivas_render_config.c" />

Workspace_msvc/lib_util.vcxproj

+2 −0

Original line number	Diff line number	Diff line
		@@ -157,6 +157,7 @@
		<ClCompile Include="..\lib_util\masa_file_writer.c" />
		<ClCompile Include="..\lib_util\mime_io.c" />
		<ClCompile Include="..\lib_util\render_config_reader.c" />
		<ClCompile Include="..\lib_util\rotation_file_reader.c" />
		<ClCompile Include="..\lib_util\rtpdump.c" />
		<ClCompile Include="..\lib_util\tsm_scale_file_reader.c" />
		</ItemGroup>
		@@ -181,6 +182,7 @@
		<ClInclude Include="..\lib_util\masa_file_reader.h" />
		<ClInclude Include="..\lib_util\masa_file_writer.h" />
		<ClInclude Include="..\lib_util\render_config_reader.h" />
		<ClInclude Include="..\lib_util\rotation_file_reader.h" />
		<ClInclude Include="..\lib_util\rtpdump.h" />
		<ClInclude Include="..\lib_util\tinywavein_c.h" />
		<ClInclude Include="..\lib_util\tinywaveout_c.h" />

apps/decoder.c

+168 −126

File changed.

Preview size limit exceeded, changes collapsed.

apps/encoder.c

+6 −29

Original line number	Diff line number	Diff line
		@@ -98,9 +98,7 @@ typedef struct
		char *outputBitstreamFilename;
		int32_t inputFs;
		IVAS_ENC_INPUT_FORMAT inputFormat;
		#ifdef BINAURAL_AUDIO_CMDLINE
		bool is_binaural;
		#endif
		EncInputFormatConfig inputFormatConfig;
		bool max_bwidth_user;
		IVAS_ENC_BANDWIDTH maxBandwidth;
		@@ -365,29 +363,17 @@ int main(
		switch ( arg.inputFormat )
		{
		case IVAS_ENC_INPUT_MONO:
		#ifdef BINAURAL_AUDIO_CMDLINE
		if ( ( error = IVAS_ENC_ConfigureForMono( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, caConfig, arg.inputFormatConfig.stereoToMonoDownmix, arg.is_binaural ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_ENC_ConfigureForMono( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, caConfig, arg.inputFormatConfig.stereoToMonoDownmix ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nIVAS_ENC_ConfigureForMono failed: %s\n\n", IVAS_ENC_GetErrorMessage( error ) );
		goto cleanup;
		}
		break;
		case IVAS_ENC_INPUT_STEREO:
		#ifdef BINAURAL_AUDIO_CMDLINE
		#ifdef DEBUGGING
		if ( ( error = IVAS_ENC_ConfigureForStereo( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, arg.is_binaural, arg.inputFormatConfig.stereoMode ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_ENC_ConfigureForStereo( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, arg.is_binaural ) ) != IVAS_ERR_OK )
		#endif
		#else
		#ifdef DEBUGGING
		if ( ( error = IVAS_ENC_ConfigureForStereo( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, arg.inputFormatConfig.stereoMode ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_ENC_ConfigureForStereo( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig ) ) != IVAS_ERR_OK )
		#endif
		#endif
		{
		fprintf( stderr, "\nIVAS_ENC_ConfigureForStereo failed: %s\n\n", IVAS_ENC_GetErrorMessage( error ) );
		@@ -880,9 +866,7 @@ static void initArgStruct( EncArguments *arg )
		arg->outputBitstreamFilename = NULL;
		arg->inputFs = 0;
		arg->inputFormat = IVAS_ENC_INPUT_MONO;
		#ifdef BINAURAL_AUDIO_CMDLINE
		arg->is_binaural = false;
		#endif
		arg->inputFormatConfig.stereoToMonoDownmix = false;
		arg->max_bwidth_user = false;
		arg->maxBandwidth = IVAS_ENC_BANDWIDTH_UNDEFINED;
		@@ -1225,16 +1209,6 @@ static bool parseCmdlIVAS_enc(
		* IVAS Formats
		-----------------------------------------------------------------/

		#ifdef BINAURAL_AUDIO_CMDLINE
		else if ( strcmp( argv_to_upper, "-BINAURAL" ) == 0 )
		{
		i++;
		if ( strcmp( argv_to_upper, "-BINAURAL" ) == 0 )
		{
		arg->is_binaural = true;
		}
		}
		#endif
		else if ( strcmp( argv_to_upper, "-STEREO" ) == 0 )
		{
		i++;
		@@ -1312,6 +1286,11 @@ static bool parseCmdlIVAS_enc(
		}
		#endif /* DEBUGGING */
		}
		else if ( strcmp( argv_to_upper, "-BINAURAL" ) == 0 )
		{
		arg->is_binaural = true;
		i++;
		}
		else if ( strcmp( argv_to_upper, "-ISM" ) == 0 )
		{
		arg->inputFormat = IVAS_ENC_INPUT_ISM;
		@@ -1703,9 +1682,6 @@ static void usage_enc( void )
		fprintf( stdout, "Options:\n" );
		fprintf( stdout, "--------\n" );
		fprintf( stdout, "EVS mono is default, for IVAS choose one of the following: -stereo, -ism, -sba, -masa, -mc\n" );
		#ifdef BINAURAL_AUDIO_CMDLINE
		fprintf( stdout, "-binaural : Optional indication that input is binaural audio (to be used with -stereo or -stereo_dmx_evs)\n" );
		#endif
		fprintf( stdout, "-stereo : Stereo format \n" );
		fprintf( stdout, "-ism (+)Ch Files : ISM format \n" );
		fprintf( stdout, " where Ch specifies the number of ISMs (1-4)\n" );
		@@ -1737,6 +1713,7 @@ static void usage_enc( void )
		fprintf( stdout, " alternatively, B can be a text file where each line contains \"nb_frames B\"\n" );
		fprintf( stdout, "-no_delay_cmp : Turn off delay compensation\n" );
		fprintf( stdout, "-stereo_dmx_evs : Activate stereo downmix function for EVS.\n" );
		fprintf( stdout, "-binaural : Optional indication that input is binaural audio (to be used with -stereo or -stereo_dmx_evs)\n" );
		fprintf( stdout, "-mime : Mime output bitstream file format\n" );
		fprintf( stdout, " The encoder produces TS26.445 Annex.2.6 Mime Storage Format, (not RFC4867 Mime Format).\n" );
		fprintf( stdout, " default output bitstream file format is G.192\n" );