Commit 64894827 authored by vaillancour's avatar vaillancour
Browse files

Addition of 26.452-g30, 16.3

parent 12d31867

Makefile

0 → 100644
+92 −0
Original line number Diff line number Diff line 
# GNU Makefile



# Paths

SRC_ENC   = lib_enc lib_com basic_op basic_math lib_debug

SRC_DEC   = lib_dec lib_com basic_op basic_math lib_debug

BUILD     = build



SRC_DIRS  = $(sort -u $(SRC_ENC) $(SRC_DEC)) 



# Name of CLI binaries

CLI_ENC   = EVS_cod

CLI_DEC   = EVS_dec



# Default tool settings

CC        = gcc

RM        = rm -f



ifndef VERBOSE

QUIET_CC  = @echo '   ' Compiling $<;

QUIET_LINK= @echo '   ' Linking $@;

QUIET     = @

endif



# C compiler flags

CFLAGS   += -pedantic -Wcast-qual -Wall -W -Wextra -Wno-long-long     \

            -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes  \

            -Werror-implicit-function-declaration 



ifeq "$(RELEASE)" "1"

CFLAGS   += -DRELEASE

DELIVERY  = 1

OPTIM    ?= 2

endif



ifneq "$(DEBUG)" "0"

CFLAGS   += -g3

LDFLAGS  += -g3

endif



ifeq "$(WMOPS)" "1"

CFLAGS   += -DWMOPS=1

endif



OPTIM    ?= 0

CFLAGS   += -O$(OPTIM)



CFLAGS   += $(foreach DIR,$(SRC_DIRS),-I$(DIR))



# Source file search paths

VPATH     = $(SRC_DIRS)



###############################################################################



SRCS_ENC  = $(foreach DIR,$(SRC_ENC),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))

SRCS_DEC  = $(foreach DIR,$(SRC_DEC),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))



OBJS_ENC  = $(addprefix $(BUILD)/,$(SRCS_ENC:.c=.o))

OBJS_DEC  = $(addprefix $(BUILD)/,$(SRCS_DEC:.c=.o))



DEPS      = $(addprefix $(BUILD)/,$(SRCS_ENC:.c=.P) $(SRCS_DEC:.c=.P))



###############################################################################



.PHONY: all clean clean_all



all: $(CLI_ENC) $(CLI_DEC)



$(BUILD):

	$(QUIET)mkdir -p $(BUILD)



$(CLI_ENC): $(OBJS_ENC)

	$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_ENC) -lm -o $(CLI_ENC)



$(CLI_DEC): $(OBJS_DEC)

	$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_DEC) -lm -o $(CLI_DEC)



clean:

	$(QUIET)$(RM) $(OBJS_ENC) $(OBJS_DEC) $(DEPS)

	$(QUIET)$(RM) $(DEPS:.P=.d)

	$(QUIET)test ! -d $(BUILD) || rm -rf $(BUILD)



clean_all: clean

	$(QUIET)$(RM) $(CLI_ENC) $(CLI_DEC)



$(BUILD)/%.o : %.c | $(BUILD)

	$(QUIET_CC)$(CC) $(CFLAGS) -c -MD -o $@ $<

	@cp $(BUILD)/$*.d $(BUILD)/$*.P; \

	sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \

	    -e '/^$$/ d' -e 's/$$/ :/' < $(BUILD)/$*.d >> $(BUILD)/$*.P; \

	$(RM) $(BUILD)/$*.d



-include $(DEPS)

Workspace_msvc/Workspace_msvc.sln

0 → 100644
+39 −0
Original line number Diff line number Diff line 
Microsoft Visual Studio Solution File, Format Version 12.00

# Visual Studio 15

VisualStudioVersion = 15.0.26228.12

MinimumVisualStudioVersion = 10.0.40219.1

Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common.vcxproj", "{39EC200D-7795-4FF8-B214-B24EDA5526AE}"

EndProject

Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "evs_dec", "evs_dec.vcxproj", "{E822DDAF-0F5F-4CD0-A694-38AE69DE74D3}"

EndProject

Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "evs_enc", "evs_enc.vcxproj", "{824DA4CF-06F0-45C9-929A-8792F0E19C3E}"

EndProject

Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_fx", "lib_fx.vcxproj", "{52EF5F7B-DF20-4BA8-96E0-DCB4A9B3D200}"

EndProject

Global

	GlobalSection(SolutionConfigurationPlatforms) = preSolution

		Debug|Win32 = Debug|Win32

		Release|Win32 = Release|Win32

	EndGlobalSection

	GlobalSection(ProjectConfigurationPlatforms) = postSolution

		{39EC200D-7795-4FF8-B214-B24EDA5526AE}.Debug|Win32.ActiveCfg = Debug|Win32

		{39EC200D-7795-4FF8-B214-B24EDA5526AE}.Debug|Win32.Build.0 = Debug|Win32

		{39EC200D-7795-4FF8-B214-B24EDA5526AE}.Release|Win32.ActiveCfg = Release|Win32

		{39EC200D-7795-4FF8-B214-B24EDA5526AE}.Release|Win32.Build.0 = Release|Win32

		{E822DDAF-0F5F-4CD0-A694-38AE69DE74D3}.Debug|Win32.ActiveCfg = Debug|Win32

		{E822DDAF-0F5F-4CD0-A694-38AE69DE74D3}.Debug|Win32.Build.0 = Debug|Win32

		{E822DDAF-0F5F-4CD0-A694-38AE69DE74D3}.Release|Win32.ActiveCfg = Release|Win32

		{E822DDAF-0F5F-4CD0-A694-38AE69DE74D3}.Release|Win32.Build.0 = Release|Win32

		{824DA4CF-06F0-45C9-929A-8792F0E19C3E}.Debug|Win32.ActiveCfg = Debug|Win32

		{824DA4CF-06F0-45C9-929A-8792F0E19C3E}.Debug|Win32.Build.0 = Debug|Win32

		{824DA4CF-06F0-45C9-929A-8792F0E19C3E}.Release|Win32.ActiveCfg = Release|Win32

		{824DA4CF-06F0-45C9-929A-8792F0E19C3E}.Release|Win32.Build.0 = Release|Win32

		{52EF5F7B-DF20-4BA8-96E0-DCB4A9B3D200}.Debug|Win32.ActiveCfg = Debug|Win32

		{52EF5F7B-DF20-4BA8-96E0-DCB4A9B3D200}.Debug|Win32.Build.0 = Debug|Win32

		{52EF5F7B-DF20-4BA8-96E0-DCB4A9B3D200}.Release|Win32.ActiveCfg = Release|Win32

		{52EF5F7B-DF20-4BA8-96E0-DCB4A9B3D200}.Release|Win32.Build.0 = Release|Win32

	EndGlobalSection

	GlobalSection(SolutionProperties) = preSolution

		HideSolutionNode = FALSE

	EndGlobalSection

EndGlobal

Workspace_msvc/common.vcxproj

0 → 100644
+250 −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">

    <ProjectGuid>{39EC200D-7795-4FF8-B214-B24EDA5526AE}</ProjectGuid>

    <RootNamespace>common</RootNamespace>

    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>

  </PropertyGroup>

  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

    <ConfigurationType>StaticLibrary</ConfigurationType>

    <PlatformToolset>v142</PlatformToolset>

    <UseOfMfc>false</UseOfMfc>

    <CharacterSet>MultiByte</CharacterSet>

  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

    <ConfigurationType>StaticLibrary</ConfigurationType>

    <PlatformToolset>v142</PlatformToolset>

    <UseOfMfc>false</UseOfMfc>

    <CharacterSet>MultiByte</CharacterSet>

  </PropertyGroup>

  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

  <ImportGroup Label="ExtensionSettings">

  </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>

  <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>

  <PropertyGroup Label="UserMacros" />

  <PropertyGroup>

    <_ProjectFileVersion>15.0.26228.10</_ProjectFileVersion>

  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

    <OutDir>.\Debug_Common\</OutDir>

    <IntDir>.\Debug_Common\</IntDir>

  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

    <OutDir>.\Release_Common\</OutDir>

    <IntDir>.\Release_Common\</IntDir>

  </PropertyGroup>

  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

    <ClCompile>

      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>

      <Optimization>Disabled</Optimization>

      <AdditionalIncludeDirectories>..\lib_enc;..\lib_dec;..\lib_com;..\lib_debug;..\basic_op;..\basic_math;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <ExceptionHandling />

      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

      <PrecompiledHeader />

      <PrecompiledHeaderOutputFile />

      <ProgramDataBaseFileName>$(IntDir)commonlib.pdb</ProgramDataBaseFileName>

      <WarningLevel>Level4</WarningLevel>

      <SuppressStartupBanner>true</SuppressStartupBanner>

      <DebugInformationFormat>OldStyle</DebugInformationFormat>

      <CompileAs>Default</CompileAs>

    </ClCompile>

    <ResourceCompile>

      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <Culture>0x0c0c</Culture>

    </ResourceCompile>

    <Lib>

      <AdditionalDependencies>WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>

      <SuppressStartupBanner>true</SuppressStartupBanner>

    </Lib>

  </ItemDefinitionGroup>

  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

    <ClCompile>

      <Optimization>MaxSpeed</Optimization>

      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

      <IntrinsicFunctions>false</IntrinsicFunctions>

      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

      <OmitFramePointers>false</OmitFramePointers>

      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>

      <AdditionalIncludeDirectories>..\lib_enc;..\lib_dec;..\lib_com;..\basic_op;..\basic_math;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;RELEASE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <StringPooling>true</StringPooling>

      <ExceptionHandling />

      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

      <FunctionLevelLinking>true</FunctionLevelLinking>

      <PrecompiledHeader />

      <PrecompiledHeaderOutputFile />

      <ProgramDataBaseFileName>$(IntDir)commonlib.pdb</ProgramDataBaseFileName>

      <WarningLevel>Level4</WarningLevel>

      <SuppressStartupBanner>true</SuppressStartupBanner>

      <DebugInformationFormat />

      <CompileAs>Default</CompileAs>

    </ClCompile>

    <ResourceCompile>

      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <Culture>0x0c0c</Culture>

    </ResourceCompile>

    <Lib>

      <AdditionalDependencies>WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>

      <SuppressStartupBanner>true</SuppressStartupBanner>

    </Lib>

  </ItemDefinitionGroup>

  <ItemGroup>

    <ClCompile Include="..\lib_com\ACcontextMapping.c" />

    <ClCompile Include="..\lib_com\ari.c" />

    <ClCompile Include="..\lib_com\arith_coder.c" />

    <ClCompile Include="..\lib_com\ari_hm.c" />

    <ClCompile Include="..\lib_com\basop_util.c" />

    <ClCompile Include="..\lib_com\bitallocsum_fx.c" />

    <ClCompile Include="..\lib_com\bitalloc_fx.c" />

    <ClCompile Include="..\lib_com\bitstream_fx.c" />

    <ClCompile Include="..\lib_com\bits_alloc.c" />

    <ClCompile Include="..\lib_com\cb_shape_fx.c" />

    <ClCompile Include="..\lib_com\cldfb.c" />

    <ClCompile Include="..\lib_com\cng_exc_fx.c" />

    <ClCompile Include="..\lib_com\codec_tcx_common.c" />

    <ClCompile Include="..\lib_com\core_com_config_fx.c" />

    <ClCompile Include="..\lib_com\deemph_fx.c" />

    <ClCompile Include="..\lib_com\delay_comp.c" />

    <ClCompile Include="..\lib_com\disclaimer.c" />

    <ClCompile Include="..\lib_com\dlpc_bfi.c" />

    <ClCompile Include="..\lib_com\edct_fx.c" />

    <ClCompile Include="..\lib_com\enhancer_fx.c" />

    <ClCompile Include="..\lib_com\enr_1_az_fx.c" />

    <ClCompile Include="..\lib_com\env_adj_fx.c" />

    <ClCompile Include="..\lib_com\env_stab_fx.c" />

    <ClCompile Include="..\lib_com\env_stab_trans_fx.c" />

    <ClCompile Include="..\lib_com\est_tilt_fx.c" />

    <ClCompile Include="..\lib_com\fd_cng_com.c" />

    <ClCompile Include="..\lib_com\fft.c" />

    <ClCompile Include="..\lib_com\fft_fx.c" />

    <ClCompile Include="..\lib_com\fft_rel_fx.c" />

    <ClCompile Include="..\lib_com\fft_rel_sas_fx.c" />

    <ClCompile Include="..\lib_com\fill_spectrum_fx.c" />

    <ClCompile Include="..\lib_com\findpulse_fx.c" />

    <ClCompile Include="..\lib_com\fine_gain_bits_fx.c" />

    <ClCompile Include="..\lib_com\frame_ener_fx.c" />

    <ClCompile Include="..\lib_com\g192.c" />

    <ClCompile Include="..\lib_com\gain_inov.c" />

    <ClCompile Include="..\lib_com\get_gain.c" />

    <ClCompile Include="..\lib_com\gs_bitallocation_fx.c" />

    <ClCompile Include="..\lib_com\gs_gains_fx.c" />

    <ClCompile Include="..\lib_com\gs_inact_switching_fx.c" />

    <ClCompile Include="..\lib_com\gs_noisefill_fx.c" />

    <ClCompile Include="..\lib_com\gs_preech_fx.c" />

    <ClCompile Include="..\lib_com\guided_plc_util.c" />

    <ClCompile Include="..\lib_com\hp50.c" />

    <ClCompile Include="..\lib_com\hq2_bit_alloc_fx.c" />

    <ClCompile Include="..\lib_com\hq2_core_com_fx.c" />

    <ClCompile Include="..\lib_com\hq2_noise_inject_fx.c" />

    <ClCompile Include="..\lib_com\hq_bit_allocation_fx.c" />

    <ClCompile Include="..\lib_com\hq_conf_fx.c" />

    <ClCompile Include="..\lib_com\hq_tools_fx.c" />

    <ClCompile Include="..\lib_com\hvq_pvq_bitalloc_fx.c" />

    <ClCompile Include="..\lib_com\igf_base.c" />

    <ClCompile Include="..\lib_com\index_pvq_opt_fx.c" />

    <ClCompile Include="..\lib_com\interleave_spectrum_fx.c" />

    <ClCompile Include="..\lib_com\interpol_fx.c" />

    <ClCompile Include="..\lib_com\int_lsp_fx.c" />

    <ClCompile Include="..\lib_com\isf_dec_amr_wb_fx.c" />

    <ClCompile Include="..\lib_com\lag_wind.c" />

    <ClCompile Include="..\lib_com\lerp.c" />

    <ClCompile Include="..\lib_com\limit_t0_fx.c" />

    <ClCompile Include="..\lib_com\logqnorm_fx.c" />

    <ClCompile Include="..\lib_com\longarith.c" />

    <ClCompile Include="..\lib_com\low_rate_band_att_fx.c" />

    <ClCompile Include="..\lib_com\lpc_tools_fx.c" />

    <ClCompile Include="..\lib_com\lsf_dec_bfi_fx.c" />

    <ClCompile Include="..\lib_com\lsf_msvq_ma.c" />

    <ClCompile Include="..\lib_com\lsf_tools_fx.c" />

    <ClCompile Include="..\lib_com\lsp_conv_poly_fx.c" />

    <ClCompile Include="..\lib_com\modif_fs_fx.c" />

    <ClCompile Include="..\lib_com\mslvq_com_fx.c" />

    <ClCompile Include="..\lib_com\nelp_fx.c" />

    <ClCompile Include="..\lib_com\parameter_bitmaping.c" />

    <ClCompile Include="..\lib_com\phase_dispersion.c" />

    <ClCompile Include="..\lib_com\ppp_fx.c" />

    <ClCompile Include="..\lib_com\pred_lt4_fx.c" />

    <ClCompile Include="..\lib_com\preemph_fx.c" />

    <ClCompile Include="..\lib_com\pvq_com_fx.c" />

    <ClCompile Include="..\lib_com\range_com_fx.c" />

    <ClCompile Include="..\lib_com\re8_ppv_fx.c" />

    <ClCompile Include="..\lib_com\re8_util_fx.c" />

    <ClCompile Include="..\lib_com\recovernorm_fx.c" />

    <ClCompile Include="..\lib_com\reordvct_fx.c" />

    <ClCompile Include="..\lib_com\residu_fx.c" />

    <ClCompile Include="..\lib_com\rom_basop_util.c" />

    <ClCompile Include="..\lib_com\rom_com_fx.c" />

    <ClCompile Include="..\lib_com\scale_mem_fx.c" />

    <ClCompile Include="..\lib_com\stab_est_fx.c" />

    <ClCompile Include="..\lib_com\stat_noise_uv_mod_fx.c" />

    <ClCompile Include="..\lib_com\swb_bwe_com_fx.c" />

    <ClCompile Include="..\lib_com\swb_bwe_com_hr_fx.c" />

    <ClCompile Include="..\lib_com\swb_bwe_com_lr_fx.c" />

    <ClCompile Include="..\lib_com\swb_tbe_com_fx.c" />

    <ClCompile Include="..\lib_com\syn_12k8_fx.c" />

    <ClCompile Include="..\lib_com\syn_filt_fx.c" />

    <ClCompile Include="..\lib_com\tcq_position_arith_fx.c" />

    <ClCompile Include="..\lib_com\tcx_ltp.c" />

    <ClCompile Include="..\lib_com\tcx_mdct.c" />

    <ClCompile Include="..\lib_com\tcx_mdct_window.c" />

    <ClCompile Include="..\lib_com\tcx_utils.c" />

    <ClCompile Include="..\lib_com\tec_com.c" />

    <ClCompile Include="..\lib_com\tns_base.c" />

    <ClCompile Include="..\lib_com\tools_fx.c" />

    <ClCompile Include="..\lib_com\trans_direct_fx.c" />

    <ClCompile Include="..\lib_com\trans_inv_fx.c" />

    <ClCompile Include="..\lib_com\vlpc_2st_com.c" />

    <ClCompile Include="..\lib_com\weight_a_fx.c" />

    <ClCompile Include="..\lib_com\weight_fx.c" />

    <ClCompile Include="..\lib_com\window.c" />

    <ClCompile Include="..\lib_com\window_ola_fx.c" />

    <ClCompile Include="..\lib_com\wi_fx.c" />

    <ClCompile Include="..\lib_com\wtda_fx.c" />

    <ClCompile Include="..\lib_debug\debug.c" />

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_com\basop_mpy.h" />

    <ClInclude Include="..\lib_com\basop_util.h" />

    <ClInclude Include="..\lib_com\cnst_fx.h" />

    <ClInclude Include="..\lib_com\disclaimer.h" />

    <ClInclude Include="..\lib_com\homing.h" />

    <ClInclude Include="..\lib_com\mime.h" />

    <ClInclude Include="..\lib_com\options.h" />

    <ClInclude Include="..\lib_com\prot_fx.h" />

    <ClInclude Include="..\lib_com\rom_com_fx.h" />

    <ClInclude Include="..\lib_com\stat_com.h" />

    <ClInclude Include="..\lib_debug\debug.h" />

  </ItemGroup>

  <ItemGroup>

    <ProjectReference Include="lib_fx.vcxproj">

      <Project>{52ef5f7b-df20-4ba8-96e0-dcb4a9b3d200}</Project>

      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

    </ProjectReference>

  </ItemGroup>

  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

  <ImportGroup Label="ExtensionTargets">

  </ImportGroup>

</Project>
 
 No newline at end of file

Workspace_msvc/evs_dec.vcxproj

0 → 100644
+294 −0

File added.

Preview size limit exceeded, changes collapsed.

Workspace_msvc/evs_enc.vcxproj

0 → 100644
+321 −0

File added.

Preview size limit exceeded, changes collapsed.