Merge branch 'main' into kiene/move-remaining-ci-code-to-ci-repo (a3cf4b9b) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitignore

+2 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@ IVAS_cod
		IVAS_dec
		IVAS_rend
		ISAR_post_rend
		ambi_converter
		obj/
		*.a
		*.o
		@@ -18,6 +19,7 @@ IVAS_cod.exe
		IVAS_dec.exe
		IVAS_rend.exe
		ISAR_post_rend.exe
		ambi_converter.exe
		*.user
		.vs/
		Debug_*/

CMakeLists.txt

+8 −1

Original line number	Diff line number	Diff line
		@@ -165,7 +165,7 @@ file(GLOB libDecSrcs "lib_dec/*.c")
		file(GLOB libDecHeaders "lib_dec/*.h")
		add_library(lib_dec ${libDecSrcs} ${libDecHeaders})
		target_link_libraries(lib_dec lib_com lib_rend lib_debug lib_isar)
		target_include_directories(lib_dec PUBLIC lib_dec lib_rend PRIVATE lib_enc lib_isar)
		target_include_directories(lib_dec PUBLIC lib_dec lib_rend PRIVATE lib_enc lib_isar lib_util)

		file(GLOB libUtilSrcs "lib_util/*.c")
		file(GLOB libUtilHeaders "lib_util/*.h")
		@@ -192,6 +192,12 @@ if(WIN32)
		target_link_libraries(IVAS_cod Ws2_32)
		endif()

		add_executable(IVAS_cod_fmtsw apps/encoder_fmtsw.c)
		target_link_libraries(IVAS_cod_fmtsw lib_enc lib_util)
		if(WIN32)
		target_link_libraries(IVAS_cod_fmtsw Ws2_32)
		endif()

		add_executable(IVAS_dec apps/decoder.c)
		target_link_libraries(IVAS_dec lib_dec lib_util)
		if(WIN32)
		@@ -216,6 +222,7 @@ target_include_directories(ambi_converter PRIVATE lib_util)
		if(COPY_EXECUTABLES_FROM_BUILD_DIR)
		# Optionally copy executables to the same place where Make puts them (useful for tests that expect executables in specific places)
		add_custom_command(TARGET IVAS_cod POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:IVAS_cod>" "${CMAKE_CURRENT_SOURCE_DIR}/")
		add_custom_command(TARGET IVAS_cod_fmtsw POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:IVAS_cod_fmtsw>" "${CMAKE_CURRENT_SOURCE_DIR}/")
		add_custom_command(TARGET IVAS_dec POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:IVAS_dec>" "${CMAKE_CURRENT_SOURCE_DIR}/")
		add_custom_command(TARGET IVAS_rend POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:IVAS_rend>" "${CMAKE_CURRENT_SOURCE_DIR}/")
		add_custom_command(TARGET ISAR_post_rend POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:ISAR_post_rend>" "${CMAKE_CURRENT_SOURCE_DIR}/")

Makefile

+10 −2

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ SRC_DIRS = $(sort -u $(SRC_LIBCOM) $(SRC_LIBDEBUG) $(SRC_LIBDEC) $(SRC_LIBENC)
		# Name of CLI binaries
		CLI_APIDEC ?= IVAS_dec
		CLI_APIENC ?= IVAS_cod
		CLI_APIENC_FMTSW ?= IVAS_cod_fmtsw
		CLI_APIREND ?= IVAS_rend
		CLI_APIPOSTREND ?= ISAR_post_rend
		CLI_AMBICONVERT ?= ambi_converter
		@@ -71,6 +72,9 @@ LDLIBS += -lm

		# Clang sanitizer compiler options
		CCCLANG = clang
		ifeq "$(CLANG)" "0"
		CC = $(CCCLANG)
		endif
		ifeq "$(CLANG)" "1"
		CC = $(CCCLANG)
		CFLAGS += -fsanitize=memory
		@@ -154,6 +158,7 @@ OBJS_LIBUTIL = $(addprefix $(OBJDIR)/,$(SRCS_LIBUTIL:.c=.o))
		OBJS_AMBICONVERT = $(OBJDIR)/ambi_convert.o
		OBJS_CLI_APIDEC = $(OBJDIR)/decoder.o
		OBJS_CLI_APIENC = $(OBJDIR)/encoder.o
		OBJS_CLI_APIENC_FMTSW = $(OBJDIR)/encoder_fmtsw.o
		OBJS_CLI_APPREND = $(OBJDIR)/renderer.o
		OBJS_CLI_APPPOSTREND = $(OBJDIR)/isar_post_rend.o
		OBJS_CLI_AMBICONVERT = $(OBJDIR)/ambi_converter.o
		@@ -166,7 +171,7 @@ DEPS = $(addprefix $(OBJDIR)/,$(SRCS_LIBCOM:.c=.P) $(SRCS_LIBDEBUG:.c=.P) $(SRCS

		.PHONY: all clean

		all: $(CLI_APIENC) $(CLI_APIDEC) $(CLI_APIREND) $(CLI_APIPOSTREND)
		all: $(CLI_APIENC) $(CLI_APIENC_FMTSW) $(CLI_APIDEC) $(CLI_APIREND) $(CLI_APIPOSTREND) $(CLI_AMBICONVERT)

		$(OBJDIR):
		$(QUIET)mkdir -p $(OBJDIR)
		@@ -198,6 +203,9 @@ $(LIB_LIBUTIL): $(OBJS_LIBUTIL)
		$(CLI_APIENC): $(OBJS_CLI_APIENC) $(LIB_LIBENC) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LC3PLUS)
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIENC) -L. -livasenc -livascom -livasutil -livasdebug $(LDLIBS) -o $(CLI_APIENC)

		$(CLI_APIENC_FMTSW): $(OBJS_CLI_APIENC_FMTSW) $(LIB_LIBENC) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LC3PLUS)
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIENC_FMTSW) -L. -livasenc -livascom -livasutil -livasdebug $(LDLIBS) -o $(CLI_APIENC_FMTSW)

		$(CLI_APIDEC): $(OBJS_CLI_APIDEC) $(LIB_LIBDEC) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LC3PLUS) $(LIB_LIBISAR)
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIDEC) -L. -livasdec -livascom -livasutil -livasdebug -llc3plus $(LDLIBS) -o $(CLI_APIDEC)

		@@ -216,7 +224,7 @@ clean:
		$(QUIET)$(RM) $(OBJS_LIBENC) $(OBJS_LIBDEC) $(DEPS)
		$(QUIET)$(RM) $(DEPS:.P=.d)
		$(QUIET)test ! -d $(OBJDIR) \|\| rm -rf $(OBJDIR)
		$(QUIET)$(RM) $(CLI_APIENC) $(CLI_APIDEC) $(CLI_APIREND) $(CLI_APIPOSTREND) $(CLI_AMBICONVERT) $(LIB_LIBENC) $(LIB_LIBDEBUG) $(LIB_LIBCOM) $(LIB_LIBDEC) $(LIB_LIBUTIL) $(LIB_LIBREND) $(LIB_LIBISAR) $(LIB_LC3PLUS)
		$(QUIET)$(RM) $(CLI_APIENC) $(CLI_APIENC_FMTSW) $(CLI_APIDEC) $(CLI_APIREND) $(CLI_APIPOSTREND) $(CLI_AMBICONVERT) $(LIB_LIBENC) $(LIB_LIBDEBUG) $(LIB_LIBCOM) $(LIB_LIBDEC) $(LIB_LIBUTIL) $(LIB_LIBREND) $(LIB_LIBISAR) $(LIB_LC3PLUS)

		$(OBJDIR)/%.o : %.c \| $(OBJDIR)
		$(QUIET_CC)$(CC) $(CFLAGS) -c -MD -o $@ $<

Workspace_msvc/Workspace_msvc.sln

+8 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "decoder", "decoder.vcxproj"
		EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "encoder", "encoder.vcxproj", "{B3FC9DFC-7268-8660-7C0D-B60BAF02C554}"
		EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "encoder_fmtsw", "encoder_fmtsw.vcxproj", "{CA7EA15E-09A4-4196-A8EA-2A5F6F84862B}"
		EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "renderer", "renderer.vcxproj", "{12B4C8A5-1E06-4E30-B443-D1F916F52B47}"
		EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_lc3plus", "lib_lc3plus.vcxproj", "{95030B82-70CD-4C6B-84D4-61096035BEA2}"
		@@ -89,6 +91,12 @@ Global
		{B3FC9DFC-7268-8660-7C0D-B60BAF02C554}.Release\|Win32.ActiveCfg = Release\|Win32
		{B3FC9DFC-7268-8660-7C0D-B60BAF02C554}.Release\|Win32.Build.0 = Release\|Win32
		{B3FC9DFC-7268-8660-7C0D-B60BAF02C554}.Release\|x64.ActiveCfg = Release\|Win32
		{CA7EA15E-09A4-4196-A8EA-2A5F6F84862B}.Debug\|Win32.ActiveCfg = Debug\|Win32
		{CA7EA15E-09A4-4196-A8EA-2A5F6F84862B}.Debug\|Win32.Build.0 = Debug\|Win32
		{CA7EA15E-09A4-4196-A8EA-2A5F6F84862B}.Debug\|x64.ActiveCfg = Debug\|Win32
		{CA7EA15E-09A4-4196-A8EA-2A5F6F84862B}.Release\|Win32.ActiveCfg = Release\|Win32
		{CA7EA15E-09A4-4196-A8EA-2A5F6F84862B}.Release\|Win32.Build.0 = Release\|Win32
		{CA7EA15E-09A4-4196-A8EA-2A5F6F84862B}.Release\|x64.ActiveCfg = Release\|Win32
		{12B4C8A5-1E06-4E30-B443-D1F916F52B47}.Debug\|Win32.ActiveCfg = Debug\|Win32
		{12B4C8A5-1E06-4E30-B443-D1F916F52B47}.Debug\|Win32.Build.0 = Debug\|Win32
		{12B4C8A5-1E06-4E30-B443-D1F916F52B47}.Debug\|x64.ActiveCfg = Debug\|Win32

Workspace_msvc/encoder_fmtsw.vcxproj

0 → 100644

+180 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
		<ItemGroup Label="ProjectConfigurations">
		<ProjectConfiguration Include="Debug\|Win32">
		<Configuration>Debug</Configuration>
		<Platform>Win32</Platform>
		</ProjectConfiguration>
		<ProjectConfiguration Include="Release\|Win32">
		<Configuration>Release</Configuration>
		<Platform>Win32</Platform>
		</ProjectConfiguration>
		</ItemGroup>
		<PropertyGroup Label="Globals">
		<ProjectName>encoder_fmtsw</ProjectName>
		<ProjectGuid>{CA7EA15E-09A4-4196-A8EA-2A5F6F84862B}</ProjectGuid>
		<RootNamespace>encoder_fmtsw</RootNamespace>
		<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
		</PropertyGroup>
		<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
		<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Debug\|Win32'" Label="Configuration">
		<ConfigurationType>Application</ConfigurationType>
		<PlatformToolset>v141</PlatformToolset>
		<UseOfMfc>false</UseOfMfc>
		<CharacterSet>MultiByte</CharacterSet>
		</PropertyGroup>
		<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Release\|Win32'" Label="Configuration">
		<ConfigurationType>Application</ConfigurationType>
		<PlatformToolset>v141</PlatformToolset>
		<UseOfMfc>false</UseOfMfc>
		<CharacterSet>MultiByte</CharacterSet>
		</PropertyGroup>
		<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
		<ImportGroup Label="ExtensionSettings">
		</ImportGroup>
		<ImportGroup Condition="'$(Configuration)\|$(Platform)'=='Debug\|Win32'" Label="PropertySheets">
		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
		<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
		</ImportGroup>
		<ImportGroup Condition="'$(Configuration)\|$(Platform)'=='Release\|Win32'" Label="PropertySheets">
		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
		<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
		</ImportGroup>
		<PropertyGroup Label="UserMacros" />
		<PropertyGroup>
		<_ProjectFileVersion>15.0.27428.2015</_ProjectFileVersion>
		</PropertyGroup>
		<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Debug\|Win32'">
		<OutDir>..\</OutDir>
		<IntDir>.\Debug_$(ProjectName)\</IntDir>
		<LinkIncremental>false</LinkIncremental>
		<GenerateManifest>false</GenerateManifest>
		<TargetName>IVAS_cod_fmtsw</TargetName>
		</PropertyGroup>
		<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Release\|Win32'">
		<OutDir>..\</OutDir>
		<IntDir>.\Release_$(ProjectName)\</IntDir>
		<LinkIncremental>false</LinkIncremental>
		<GenerateManifest>false</GenerateManifest>
		<TargetName>IVAS_cod_fmtsw</TargetName>
		</PropertyGroup>
		<ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='Debug\|Win32'">
		<CustomBuildStep>
		<Message />
		</CustomBuildStep>
		<Midl>
		<TypeLibraryName>$(IntDir)$(ProjectName).tlb</TypeLibraryName>
		<HeaderFileName />
		</Midl>
		<ClCompile>
		<Optimization>Disabled</Optimization>
		<AdditionalIncludeDirectories>..\lib_enc;..\lib_com;..\lib_util;..\lib_debug;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;$(Macros);%(PreprocessorDefinitions)</PreprocessorDefinitions>
		<ExceptionHandling />
		<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
		<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
		<RuntimeTypeInfo>false</RuntimeTypeInfo>
		<PrecompiledHeader />
		<PrecompiledHeaderOutputFile />
		<ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
		<WarningLevel>Level4</WarningLevel>
		<SuppressStartupBanner>true</SuppressStartupBanner>
		<DebugInformationFormat>OldStyle</DebugInformationFormat>
		<CompileAs>Default</CompileAs>
		<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
		<TreatWarningAsError>false</TreatWarningAsError>
		</ClCompile>
		<ResourceCompile>
		<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
		<Culture>0x0c0c</Culture>
		</ResourceCompile>
		<Link>
		<AdditionalDependencies />
		<OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
		<SuppressStartupBanner>true</SuppressStartupBanner>
		<ManifestFile />
		<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
		<GenerateDebugInformation>true</GenerateDebugInformation>
		<ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
		<SubSystem>Console</SubSystem>
		<OptimizeReferences />
		<RandomizedBaseAddress>false</RandomizedBaseAddress>
		<DataExecutionPrevention />
		<TargetMachine>MachineX86</TargetMachine>
		</Link>
		<PostBuildEvent>
		<Command />
		</PostBuildEvent>
		</ItemDefinitionGroup>
		<ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='Release\|Win32'">
		<CustomBuildStep>
		<Message />
		</CustomBuildStep>
		<Midl>
		<TypeLibraryName>$(IntDir)$(ProjectName).tlb</TypeLibraryName>
		<HeaderFileName />
		</Midl>
		<ClCompile>
		<Optimization>MaxSpeed</Optimization>
		<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
		<IntrinsicFunctions>false</IntrinsicFunctions>
		<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
		<OmitFramePointers>false</OmitFramePointers>
		<EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
		<AdditionalIncludeDirectories>..\lib_enc;..\lib_com;..\lib_util;..\lib_debug;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);%(PreprocessorDefinitions)</PreprocessorDefinitions>
		<StringPooling>true</StringPooling>
		<ExceptionHandling />
		<BasicRuntimeChecks>Default</BasicRuntimeChecks>
		<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
		<FunctionLevelLinking>true</FunctionLevelLinking>
		<FloatingPointModel>Precise</FloatingPointModel>
		<RuntimeTypeInfo>false</RuntimeTypeInfo>
		<PrecompiledHeader />
		<PrecompiledHeaderOutputFile />
		<ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
		<WarningLevel>Level4</WarningLevel>
		<SuppressStartupBanner>true</SuppressStartupBanner>
		<DebugInformationFormat />
		<CompileAs>Default</CompileAs>
		<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
		<TreatWarningAsError>false</TreatWarningAsError>
		</ClCompile>
		<ResourceCompile>
		<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
		<Culture>0x0c0c</Culture>
		</ResourceCompile>
		<Link>
		<OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
		<SuppressStartupBanner>true</SuppressStartupBanner>
		<ManifestFile />
		<GenerateDebugInformation>false</GenerateDebugInformation>
		<ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
		<SubSystem>Console</SubSystem>
		<RandomizedBaseAddress>false</RandomizedBaseAddress>
		<DataExecutionPrevention />
		<TargetMachine>MachineX86</TargetMachine>
		</Link>
		</ItemDefinitionGroup>
		<ItemGroup>
		<ClCompile Include="..\apps\encoder_fmtsw.c" />
		</ItemGroup>
		<ItemGroup>
		<ProjectReference Include="lib_enc.vcxproj">
		<Project>{824da4cf-06f0-45c9-929a-8792f0e19c3e}</Project>
		<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
		</ProjectReference>
		<ProjectReference Include="lib_util.vcxproj">
		<Project>{2fa8f384-0775-f3b7-f8c3-85209222fc70}</Project>
		<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
		</ProjectReference>
		</ItemGroup>
		<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
		<ImportGroup Label="ExtensionTargets">
		</ImportGroup>
		<ProjectExtensions>
		<VisualStudio>
		<UserProperties DevPartner_IsInstrumented="0" />
		</VisualStudio>
		</ProjectExtensions>
		</Project>
		No newline at end of file