rename folder "lc3plus" to "lib_lc3plus" (5a73062c) · Commits · IVAS Codec Public Collaboration / IVAS Codec

CMakeLists.txt

+10 −10

Original line number	Diff line number	Diff line
		@@ -130,7 +130,7 @@ add_library(lib_com ${libComSrcs} ${libComHeaders})
		if(UNIX)
		target_link_libraries(lib_com PRIVATE m)
		endif()
		target_include_directories(lib_com PUBLIC lib_com PRIVATE lib_enc lib_dec lib_rend lib_debug lc3plus)
		target_include_directories(lib_com PUBLIC lib_com PRIVATE lib_enc lib_dec lib_rend lib_debug lib_lc3plus)

		file(GLOB libDebugSrcs "lib_debug/*.c")
		file(GLOB libDebugHeaders "lib_debug/*.h")
		@@ -142,15 +142,15 @@ file(GLOB libEncSrcs "lib_enc/*.c")
		file(GLOB libEncHeaders "lib_enc/*.h")
		add_library(lib_enc ${libEncSrcs} ${libEncHeaders})
		target_link_libraries(lib_enc lib_com lib_debug)
		target_include_directories(lib_enc PUBLIC lib_enc PRIVATE lib_dec lib_rend lc3plus)
		target_include_directories(lib_enc PUBLIC lib_enc PRIVATE lib_dec lib_rend lib_lc3plus)

		file(GLOB libLC3plusSrcs "lc3plus/*.c")
		file(GLOB libLC3plusHeaders "lc3plus/*.h")
		add_library(lc3plus ${libLC3plusSrcs} ${libLC3plusHeaders})
		target_include_directories(lc3plus PUBLIC lc3plus)
		target_link_libraries(lc3plus lib_com) # For including options.h, which is needed for instrumentation to work correctly
		file(GLOB libLC3plusSrcs "lib_lc3plus/*.c")
		file(GLOB libLC3plusHeaders "lib_lc3plus/*.h")
		add_library(lib_lc3plus ${libLC3plusSrcs} ${libLC3plusHeaders})
		target_include_directories(lib_lc3plus PUBLIC lib_lc3plus)
		target_link_libraries(lib_lc3plus lib_com) # For including options.h, which is needed for instrumentation to work correctly
		if(WMOPS)
		target_link_libraries(lc3plus lib_debug)
		target_link_libraries(lib_lc3plus lib_debug)
		endif()

		file(GLOB libCldfbTransCodecSrcs "lib_rend/ivas_cldfb_trans_codec/*.c")
		@@ -158,7 +158,7 @@ file(GLOB libCldfbTransCodecHeaders "lib_rend/ivas_cldfb_trans_codec/*.h")
		file(GLOB libRendSrcs "lib_rend/*.c")
		file(GLOB libRendHeaders "lib_rend/*.h")
		add_library(lib_rend ${libRendSrcs} ${libCldfbTransCodecSrcs} ${libRendHeaders} ${libCldfbTransCodecHeaders})
		target_link_libraries(lib_rend lib_dec lib_com lib_debug lc3plus) # Todo refactor: This dependency on lib_dec should be removed.
		target_link_libraries(lib_rend lib_dec lib_com lib_debug lib_lc3plus) # Todo refactor: This dependency on lib_dec should be removed.
		target_include_directories(lib_rend PUBLIC lib_rend PRIVATE lib_enc)


		@@ -171,7 +171,7 @@ target_include_directories(lib_dec PUBLIC lib_dec lib_rend PRIVATE lib_enc)
		file(GLOB libUtilSrcs "lib_util/*.c")
		file(GLOB libUtilHeaders "lib_util/*.h")
		add_library(lib_util ${libUtilSrcs} ${libUtilHeaders})
		target_include_directories(lib_util PUBLIC lib_util PRIVATE lib_com lib_enc lib_dec lib_rend lib_debug lc3plus)
		target_include_directories(lib_util PUBLIC lib_util PRIVATE lib_com lib_enc lib_dec lib_rend lib_debug lib_lc3plus)

		if(NOT WMOPS)
		file(GLOB unitTestIvasLc3plusSrcs "scripts/split_rendering/lc3plus/*.c")

Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ SRC_LIBDEBUG = lib_debug
		SRC_LIBDEC = lib_dec
		SRC_LIBENC = lib_enc
		SRC_LIBREND = lib_rend
		SRC_LC3PLUS = lc3plus lc3plus/fft
		SRC_LC3PLUS = lib_lc3plus lib_lc3plus/fft
		SRC_LIBUTIL = lib_util
		SRC_APP = apps
		BUILD = build

Workspace_msvc/LC3plus.vcxproj

deleted100644 → 0

+0 −182

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="Debug\|x64">
		<Configuration>Debug</Configuration>
		<Platform>x64</Platform>
		</ProjectConfiguration>
		<ProjectConfiguration Include="Release\|Win32">
		<Configuration>Release</Configuration>
		<Platform>Win32</Platform>
		</ProjectConfiguration>
		<ProjectConfiguration Include="Release\|x64">
		<Configuration>Release</Configuration>
		<Platform>x64</Platform>
		</ProjectConfiguration>
		</ItemGroup>
		<PropertyGroup Label="Globals">
		<ProjectGuid>{95030B82-70CD-4C6B-84D4-61096035BEA2}</ProjectGuid>
		<Keyword>Win32Proj</Keyword>
		<RootNamespace>LC3_FL</RootNamespace>
		<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
		</PropertyGroup>
		<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
		<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Debug\|Win32'" Label="Configuration">
		<ConfigurationType>StaticLibrary</ConfigurationType>
		<UseDebugLibraries>true</UseDebugLibraries>
		<PlatformToolset>v141</PlatformToolset>
		<CharacterSet>Unicode</CharacterSet>
		</PropertyGroup>
		<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Release\|Win32'" Label="Configuration">
		<ConfigurationType>StaticLibrary</ConfigurationType>
		<UseDebugLibraries>false</UseDebugLibraries>
		<PlatformToolset>v141</PlatformToolset>
		<WholeProgramOptimization>true</WholeProgramOptimization>
		<CharacterSet>Unicode</CharacterSet>
		</PropertyGroup>
		<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
		<ImportGroup Label="ExtensionSettings">
		</ImportGroup>
		<ImportGroup Label="Shared">
		</ImportGroup>
		<ImportGroup Label="PropertySheets" Condition="'$(Configuration)\|$(Platform)'=='Debug\|Win32'">
		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
		</ImportGroup>
		<ImportGroup Label="PropertySheets" Condition="'$(Configuration)\|$(Platform)'=='Release\|Win32'">
		<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
		</ImportGroup>
		<PropertyGroup Label="UserMacros" />
		<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Debug\|Win32'">
		<TargetName>LC3plus</TargetName>
		<OutDir>$(Platform)\$(Configuration)\</OutDir>
		<IntDir>$(Platform)\$(Configuration)\Obj\</IntDir>
		</PropertyGroup>
		<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Release\|Win32'">
		<TargetName>LC3plus</TargetName>
		<OutDir>$(Platform)\$(Configuration)\</OutDir>
		<IntDir>$(Platform)\$(Configuration)\Obj\</IntDir>
		</PropertyGroup>
		<ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='Debug\|Win32'">
		<ClCompile>
		<PrecompiledHeader>
		</PrecompiledHeader>
		<WarningLevel>Level3</WarningLevel>
		<AdditionalIncludeDirectories>..\lib_com;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		<Optimization>Disabled</Optimization>
		<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
		<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
		<DisableSpecificWarnings>4305;4244;4996</DisableSpecificWarnings>
		<DebugInformationFormat>OldStyle</DebugInformationFormat>
		</ClCompile>
		<Link>
		<SubSystem>Console</SubSystem>
		<GenerateDebugInformation>true</GenerateDebugInformation>
		</Link>
		</ItemDefinitionGroup>
		<ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='Release\|Win32'">
		<ClCompile>
		<WarningLevel>Level3</WarningLevel>
		<PrecompiledHeader>
		</PrecompiledHeader>
		<AdditionalIncludeDirectories>..\lib_com;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		<Optimization>MaxSpeed</Optimization>
		<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
		<FunctionLevelLinking>true</FunctionLevelLinking>
		<IntrinsicFunctions>true</IntrinsicFunctions>
		<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
		<DisableSpecificWarnings>4244;4305;4996</DisableSpecificWarnings>
		</ClCompile>
		<Link>
		<SubSystem>Console</SubSystem>
		<EnableCOMDATFolding>true</EnableCOMDATFolding>
		<OptimizeReferences>true</OptimizeReferences>
		<GenerateDebugInformation>true</GenerateDebugInformation>
		</Link>
		</ItemDefinitionGroup>
		<ItemGroup>
		<ClCompile Include="..\lc3plus\adjust_global_gain.c" />
		<ClCompile Include="..\lc3plus\al_fec_fl.c" />
		<ClCompile Include="..\lc3plus\apply_global_gain.c" />
		<ClCompile Include="..\lc3plus\ari_codec.c" />
		<ClCompile Include="..\lc3plus\attack_detector.c" />
		<ClCompile Include="..\lc3plus\plc_compute_stab_fac.c" />
		<ClCompile Include="..\lc3plus\constants.c" />
		<ClCompile Include="..\lc3plus\cutoff_bandwidth.c" />
		<ClCompile Include="..\lc3plus\dct4.c" />
		<ClCompile Include="..\lc3plus\dec_entropy.c" />
		<ClCompile Include="..\lc3plus\dec_lc3_fl.c" />
		<ClCompile Include="..\lc3plus\detect_cutoff_warped.c" />
		<ClCompile Include="..\lc3plus\enc_entropy.c" />
		<ClCompile Include="..\lc3plus\enc_lc3_fl.c" />
		<ClCompile Include="..\lc3plus\estimate_global_gain.c" />
		<ClCompile Include="..\lc3plus\lc3plus_fft.c" />
		<ClCompile Include="..\lc3plus\imdct.c" />
		<ClCompile Include="..\lc3plus\lc3.c" />
		<ClCompile Include="..\lc3plus\ltpf_coder.c" />
		<ClCompile Include="..\lc3plus\ltpf_decoder.c" />
		<ClCompile Include="..\lc3plus\mdct.c" />
		<ClCompile Include="..\lc3plus\mdct_shaping.c" />
		<ClCompile Include="..\lc3plus\near_nyquist_detector.c" />
		<ClCompile Include="..\lc3plus\noise_factor.c" />
		<ClCompile Include="..\lc3plus\noise_filling.c" />
		<ClCompile Include="..\lc3plus\olpa.c" />
		<ClCompile Include="..\lc3plus\pc_apply.c" />
		<ClCompile Include="..\lc3plus\pc_classify.c" />
		<ClCompile Include="..\lc3plus\pc_main.c" />
		<ClCompile Include="..\lc3plus\pc_update.c" />
		<ClCompile Include="..\lc3plus\per_band_energy.c" />
		<ClCompile Include="..\lc3plus\plc_classify.c" />
		<ClCompile Include="..\lc3plus\plc_damping_scrambling.c" />
		<ClCompile Include="..\lc3plus\plc_main.c" />
		<ClCompile Include="..\lc3plus\plc_noise_substitution.c" />
		<ClCompile Include="..\lc3plus\plc_tdc_tdac.c" />
		<ClCompile Include="..\lc3plus\plc_update.c" />
		<ClCompile Include="..\lc3plus\plc_phecu_f0_refine_first.c" />
		<ClCompile Include="..\lc3plus\plc_phecu_fec_hq.c" />
		<ClCompile Include="..\lc3plus\plc_phecu_hq_ecu.c" />
		<ClCompile Include="..\lc3plus\plc_phecu_lf_peak_analysis.c" />
		<ClCompile Include="..\lc3plus\plc_phecu_rec_frame.c" />
		<ClCompile Include="..\lc3plus\plc_phecu_setf0hz.c" />
		<ClCompile Include="..\lc3plus\plc_phecu_subst_spec.c" />
		<ClCompile Include="..\lc3plus\plc_phecu_spec_ana.c" />
		<ClCompile Include="..\lc3plus\plc_phecu_tba_per_band_gain.c" />
		<ClCompile Include="..\lc3plus\plc_phecu_tba_spect_Xavg.c" />
		<ClCompile Include="..\lc3plus\plc_phecu_tba_trans_dect_gains.c" />
		<ClCompile Include="..\lc3plus\plc_phecu_trans_burst_ana_sub.c" />
		<ClCompile Include="..\lc3plus\quantize_spec.c" />
		<ClCompile Include="..\lc3plus\reorder_bitstream.c" />
		<ClCompile Include="..\lc3plus\resamp12k8.c" />
		<ClCompile Include="..\lc3plus\residual_coding.c" />
		<ClCompile Include="..\lc3plus\residual_decoding.c" />
		<ClCompile Include="..\lc3plus\setup_dec_lc3.c" />
		<ClCompile Include="..\lc3plus\setup_enc_lc3.c" />
		<ClCompile Include="..\lc3plus\setup_com_lc3.c" />
		<ClCompile Include="..\lc3plus\sns_compute_scf.c" />
		<ClCompile Include="..\lc3plus\sns_interpolate_scf.c" />
		<ClCompile Include="..\lc3plus\sns_quantize_scf.c" />
		<ClCompile Include="..\lc3plus\plc_tdc.c" />
		<ClCompile Include="..\lc3plus\tns_coder.c" />
		<ClCompile Include="..\lc3plus\tns_decoder.c" />
		</ItemGroup>
		<ItemGroup>
		<ClInclude Include="..\lc3plus\clib.h" />
		<ClInclude Include="..\lc3plus\constants.h" />
		<ClInclude Include="..\lc3plus\defines.h" />
		<ClInclude Include="..\lc3plus\file_io.h" />
		<ClInclude Include="..\lc3plus\functions.h" />
		<ClInclude Include="..\lc3plus\lc3.h" />
		<ClInclude Include="..\lc3plus\setup_dec_lc3.h" />
		<ClInclude Include="..\lc3plus\setup_enc_lc3.h" />
		<ClInclude Include="..\lc3plus\structs.h" />
		<ClInclude Include="..\lc3plus\tinywavein_c.h" />
		<ClInclude Include="..\lc3plus\tinywaveout_c.h" />
		<ClInclude Include="..\lc3plus\util.h" />
		</ItemGroup>
		<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
		<ImportGroup Label="ExtensionTargets">
		</ImportGroup>
		</Project>
		No newline at end of file

Workspace_msvc/Workspace_msvc.sln

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "encoder", "encoder.vcxproj"
		EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "renderer", "renderer.vcxproj", "{12B4C8A5-1E06-4E30-B443-D1F916F52B47}"
		EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LC3plus", "LC3plus.vcxproj", "{95030B82-70CD-4C6B-84D4-61096035BEA2}"
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LC3plus", "lib_lc3plus.vcxproj", "{95030B82-70CD-4C6B-84D4-61096035BEA2}"
		EndProject
		Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{51160D4C-55C9-4C16-A792-D94507225746}"
		ProjectSection(SolutionItems) = preProject

Workspace_msvc/lib_com.vcxproj

+3 −3

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@
		</CustomBuildStep>
		<ClCompile>
		<Optimization>Disabled</Optimization>
		<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;..\lc3plus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;..\lib_lc3plus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
		<ExceptionHandling />
		<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
		@@ -109,7 +109,7 @@
		</CustomBuildStep>
		<ClCompile>
		<Optimization>Disabled</Optimization>
		<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;..\lc3plus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;..\lib_lc3plus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
		<ExceptionHandling>
		</ExceptionHandling>
		@@ -147,7 +147,7 @@
		<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
		<OmitFramePointers>false</OmitFramePointers>
		<EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
		<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;..\lc3plus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;..\lib_lc3plus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);%(PreprocessorDefinitions)</PreprocessorDefinitions>
		<StringPooling>true</StringPooling>
		<ExceptionHandling />