Merge remote-tracking branch 'origin/main' into 1139-fix-param-rev-coloration-short-t60 (29d68f51) · Commits · IVAS Codec Public Collaboration / IVAS Codec

Workspace_msvc/lib_com.vcxproj.filters

+7 −2

Original line number	Diff line number	Diff line
		@@ -472,7 +472,12 @@
		<ClCompile Include="..\lib_com\ivas_osba_com.c">
		<Filter>common_ivas_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_com\ivas_rotation_com.c" />
		<ClCompile Include="..\lib_com\ivas_rotation_com.c">
		<Filter>common_ivas_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_com\ivas_limiter.c">
		<Filter>common_ivas_c</Filter>
		</ClCompile>
		</ItemGroup>
		<ItemGroup>
		<ClInclude Include="..\lib_com\basop_proto_func.h">

Workspace_msvc/lib_isar.vcxproj.filters

0 → 100644

+109 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
		<ItemGroup>
		<ClCompile Include="..\lib_isar\lib_isar_post_rend.c" />
		<ClCompile Include="..\lib_isar\lib_isar_pre_rend.c" />
		<ClCompile Include="..\lib_isar\isar_lc3plus_common.c">
		<Filter>isar_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_isar\isar_lc3plus_dec.c">
		<Filter>isar_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_isar\isar_lc3plus_enc.c">
		<Filter>isar_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_isar\isar_lc3plus_payload.c">
		<Filter>isar_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_isar\isar_lcld_decoder.c">
		<Filter>isar_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_isar\isar_lcld_encoder.c">
		<Filter>isar_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_isar\isar_MSPred.c">
		<Filter>isar_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_isar\isar_NoiseGen.c">
		<Filter>isar_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_isar\isar_PerceptualModel.c">
		<Filter>isar_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_isar\isar_PredDecoder.c">
		<Filter>isar_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_isar\isar_PredEncoder.c">
		<Filter>isar_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_isar\isar_RMSEnvGrouping.c">
		<Filter>isar_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_isar\isar_rom_lcld_tables.c">
		<Filter>isar_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_isar\isar_rom_post_rend.c">
		<Filter>isar_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_isar\isar_splitRend_lcld_dec.c">
		<Filter>isar_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_isar\isar_splitRend_lcld_enc.c">
		<Filter>isar_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_isar\isar_splitRenderer_utils.c">
		<Filter>isar_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_isar\isar_splitRendererPLC.c">
		<Filter>isar_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_isar\isar_splitRendererPost.c">
		<Filter>isar_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_isar\isar_splitRendererPre.c">
		<Filter>isar_c</Filter>
		</ClCompile>
		</ItemGroup>
		<ItemGroup>
		<ClInclude Include="..\lib_isar\lib_isar_post_rend.h" />
		<ClInclude Include="..\lib_isar\lib_isar_pre_rend.h" />
		<ClInclude Include="..\lib_isar\isar_cnst.h">
		<Filter>isar_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_isar\isar_lc3plus_common.h">
		<Filter>isar_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_isar\isar_lc3plus_dec.h">
		<Filter>isar_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_isar\isar_lc3plus_enc.h">
		<Filter>isar_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_isar\isar_lc3plus_payload.h">
		<Filter>isar_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_isar\isar_lcld_prot.h">
		<Filter>isar_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_isar\isar_rom_lcld_tables.h">
		<Filter>isar_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_isar\isar_prot.h">
		<Filter>isar_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_isar\isar_rom_post_rend.h">
		<Filter>isar_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_isar\isar_stat.h">
		<Filter>isar_h</Filter>
		</ClInclude>
		</ItemGroup>
		<ItemGroup>
		<Filter Include="isar_c">
		<UniqueIdentifier>{afca9c26-7922-4c24-aa3a-cbf00aa2b6d1}</UniqueIdentifier>
		</Filter>
		<Filter Include="isar_h">
		<UniqueIdentifier>{1ce7afb2-7474-42f5-b477-2d854c093429}</UniqueIdentifier>
		</Filter>
		</ItemGroup>
		</Project>
		No newline at end of file

Workspace_msvc/lib_util.vcxproj.filters

0 → 100644

+177 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
		<ItemGroup>
		<ClCompile Include="..\lib_util\aeid_file_reader.c">
		<Filter>util_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_util\ambi_convert.c">
		<Filter>util_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_util\audio_file_reader.c">
		<Filter>util_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_util\audio_file_writer.c">
		<Filter>util_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_util\bitstream_reader.c">
		<Filter>util_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_util\bitstream_writer.c">
		<Filter>util_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_util\cmdl_tools.c">
		<Filter>util_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_util\cmdln_parser.c">
		<Filter>util_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_util\evs_rtp_payload.c">
		<Filter>util_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_util\g192.c">
		<Filter>util_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_util\hrtf_file_reader.c">
		<Filter>util_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_util\ism_file_reader.c">
		<Filter>util_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_util\ism_file_writer.c">
		<Filter>util_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_util\jbm_file_reader.c">
		<Filter>util_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_util\jbm_file_writer.c">
		<Filter>util_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_util\ls_custom_file_reader.c">
		<Filter>util_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_util\masa_file_reader.c">
		<Filter>util_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_util\masa_file_writer.c">
		<Filter>util_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_util\mime_io.c">
		<Filter>util_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_util\render_config_reader.c">
		<Filter>util_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_util\rotation_file_reader.c">
		<Filter>util_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_util\rtpdump.c">
		<Filter>util_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_util\split_rend_bfi_file_reader.c">
		<Filter>util_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_util\split_render_file_read_write.c">
		<Filter>util_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_util\tsm_scale_file_reader.c">
		<Filter>util_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_util\vector3_pair_file_reader.c">
		<Filter>util_c</Filter>
		</ClCompile>
		</ItemGroup>
		<ItemGroup>
		<ClInclude Include="..\lib_util\aeid_file_reader.h">
		<Filter>util_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_util\ambi_convert.h">
		<Filter>util_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_util\audio_file_reader.h">
		<Filter>util_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_util\audio_file_writer.h">
		<Filter>util_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_util\bitstream_reader.h">
		<Filter>util_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_util\bitstream_writer.h">
		<Filter>util_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_util\cmdl_tools.h">
		<Filter>util_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_util\cmdln_parser.h">
		<Filter>util_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_util\evs_rtp_payload.h">
		<Filter>util_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_util\g192.h">
		<Filter>util_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_util\hrtf_file_reader.h">
		<Filter>util_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_util\ism_file_reader.h">
		<Filter>util_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_util\ism_file_writer.h">
		<Filter>util_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_util\jbm_file_reader.h">
		<Filter>util_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_util\jbm_file_writer.h">
		<Filter>util_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_util\ls_custom_file_reader.h">
		<Filter>util_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_util\masa_file_reader.h">
		<Filter>util_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_util\masa_file_writer.h">
		<Filter>util_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_util\mime_io.h">
		<Filter>util_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_util\render_config_reader.h">
		<Filter>util_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_util\rotation_file_reader.h">
		<Filter>util_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_util\rtpdump.h">
		<Filter>util_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_util\split_rend_bfi_file_reader.h">
		<Filter>util_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_util\split_render_file_read_write.h">
		<Filter>util_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_util\tinywavein_c.h">
		<Filter>util_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_util\tinywaveout_c.h">
		<Filter>util_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_util\tsm_scale_file_reader.h">
		<Filter>util_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_util\vector3_pair_file_reader.h">
		<Filter>util_h</Filter>
		</ClInclude>
		</ItemGroup>
		<ItemGroup>
		<Filter Include="util_c">
		<UniqueIdentifier>{214bf366-8f03-4160-9ebe-daa6844c3754}</UniqueIdentifier>
		</Filter>
		<Filter Include="util_h">
		<UniqueIdentifier>{65ae801b-f259-4632-b413-22996b07a7bf}</UniqueIdentifier>
		</Filter>
		</ItemGroup>
		</Project>
		No newline at end of file

apps/decoder.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -590,8 +590,16 @@ int main(
		fprintf( stdout, "FEC: %.2f %%\n", arg.FER );
		}
		}
		#else
		#ifdef FIX_VOIP_FUNCTIONS
		if ( ( error = IVAS_DEC_PrintConfig( hIvasDec, 1, arg.voipMode ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_PrintConfig failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}
		#else
		IVAS_DEC_PrintConfig( hIvasDec, 1, arg.voipMode );
		#endif
		#endif

		/-------------------------------------------------------------------
		@@ -679,7 +687,9 @@ int main(
		fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", aeID );
		goto cleanup;
		}
		#ifndef FIX_587_DEFAULT_REVERB
		renderConfig.roomAcoustics.override = true;
		#endif
		}

		/* ISAR frame size is set from command line, not renderer config file.

apps/renderer.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1044,7 +1044,9 @@ int main(
		fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", aeID );
		exit( -1 );
		}
		#ifndef FIX_587_DEFAULT_REVERB
		renderConfig.roomAcoustics.override = 1;
		#endif
		}

		/* ISAR frame size is set from command line, not renderer config file.