Squashed commit of the following:
[opus.git] / silk / silk_common.vcxproj
similarity index 59%
rename from silk/src_SigProc_FIX.vcxproj
rename to silk/silk_common.vcxproj
index fb9df8d..748da77 100644 (file)
     </ProjectConfiguration>\r
   </ItemGroup>\r
   <PropertyGroup Label="Globals">\r
-    <ProjectGuid>{950F7176-3D29-4CBF-8C40-58B918EAEBB2}</ProjectGuid>\r
+    <ProjectGuid>{C303D2FC-FF97-49B8-9DDD-467B4C9A0B16}</ProjectGuid>\r
     <Keyword>Win32Proj</Keyword>\r
-    <RootNamespace>src_SigProc_FIX</RootNamespace>\r
+    <RootNamespace>src_common</RootNamespace>\r
+    <ProjectName>silk_common</ProjectName>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
-  <PropertyGroup />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <TargetName>$(ProjectName)</TargetName>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <TargetName>$(ProjectName)</TargetName>\r
+  </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
       <WarningLevel>Level3</WarningLevel>\r
       <Optimization>Disabled</Optimization>\r
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <AdditionalIncludeDirectories>../interface;..\..\celt\libcelt</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>fixed;float;../win32;../libcelt</AdditionalIncludeDirectories>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Windows</SubSystem>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
     </Link>\r
+    <Lib>\r
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>\r
+    </Lib>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <ClCompile>\r
@@ -60,8 +69,8 @@
       <Optimization>MaxSpeed</Optimization>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <IntrinsicFunctions>true</IntrinsicFunctions>\r
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <AdditionalIncludeDirectories>../interface;..\..\celt\libcelt</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <AdditionalIncludeDirectories>fixed;float;../win32;../libcelt</AdditionalIncludeDirectories>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Windows</SubSystem>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
       <OptimizeReferences>true</OptimizeReferences>\r
     </Link>\r
+    <Lib>\r
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>\r
+    </Lib>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
     <None Include="ReadMe.txt" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClInclude Include="..\interface\SKP_debug.h" />\r
-    <ClInclude Include="SKP_Silk_pitch_est_defines.h" />\r
-    <ClInclude Include="SKP_Silk_Inlines.h" />\r
-    <ClInclude Include="SKP_Silk_MacroCount.h" />\r
-    <ClInclude Include="SKP_Silk_MacroDebug.h" />\r
-    <ClInclude Include="SKP_Silk_macros.h" />\r
-    <ClInclude Include="SKP_Silk_resampler_private.h" />\r
-    <ClInclude Include="SKP_Silk_resampler_rom.h" />\r
-    <ClInclude Include="SKP_Silk_resampler_structs.h" />\r
-    <ClInclude Include="SKP_Silk_SigProc_FIX.h" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
     <ClCompile Include="SKP_Silk_A2NLSF.c" />\r
     <ClCompile Include="SKP_Silk_ana_filt_bank_1.c" />\r
     <ClCompile Include="SKP_Silk_apply_sine_window.c" />\r
     <ClCompile Include="SKP_Silk_burg_modified.c" />\r
     <ClCompile Include="SKP_Silk_bwexpander.c" />\r
     <ClCompile Include="SKP_Silk_bwexpander_32.c" />\r
+    <ClCompile Include="SKP_Silk_check_control_input.c" />\r
+    <ClCompile Include="SKP_Silk_CNG.c" />\r
+    <ClCompile Include="SKP_Silk_code_signs.c" />\r
+    <ClCompile Include="SKP_Silk_control_audio_bandwidth.c" />\r
+    <ClCompile Include="SKP_Silk_control_codec.c" />\r
+    <ClCompile Include="SKP_Silk_control_SNR.c" />\r
+    <ClCompile Include="SKP_Silk_create_init_destroy.c" />\r
     <ClCompile Include="SKP_Silk_debug.c" />\r
+    <ClCompile Include="SKP_Silk_decoder_set_fs.c" />\r
+    <ClCompile Include="SKP_Silk_decode_core.c" />\r
+    <ClCompile Include="SKP_Silk_decode_frame.c" />\r
+    <ClCompile Include="SKP_Silk_decode_indices.c" />\r
+    <ClCompile Include="SKP_Silk_decode_parameters.c" />\r
     <ClCompile Include="SKP_Silk_decode_pitch.c" />\r
+    <ClCompile Include="SKP_Silk_decode_pulses.c" />\r
+    <ClCompile Include="SKP_Silk_dec_API.c" />\r
+    <ClCompile Include="SKP_Silk_encode_indices.c" />\r
+    <ClCompile Include="SKP_Silk_encode_pulses.c" />\r
+    <ClCompile Include="SKP_Silk_enc_API.c" />\r
+    <ClCompile Include="SKP_Silk_gain_quant.c" />\r
+    <ClCompile Include="SKP_Silk_HP_variable_cutoff.c" />\r
+    <ClCompile Include="SKP_Silk_init_encoder.c" />\r
     <ClCompile Include="SKP_Silk_inner_prod_aligned.c" />\r
+    <ClCompile Include="SKP_Silk_interpolate.c" />\r
     <ClCompile Include="SKP_Silk_k2a.c" />\r
     <ClCompile Include="SKP_Silk_k2a_Q16.c" />\r
     <ClCompile Include="SKP_Silk_lin2log.c" />\r
     <ClCompile Include="SKP_Silk_log2lin.c" />\r
+    <ClCompile Include="SKP_Silk_LPC_analysis_filter.c" />\r
     <ClCompile Include="SKP_Silk_LPC_inv_pred_gain.c" />\r
     <ClCompile Include="SKP_Silk_LPC_stabilize.c" />\r
     <ClCompile Include="SKP_Silk_LPC_synthesis_filter.c" />\r
     <ClCompile Include="SKP_Silk_LPC_synthesis_order16.c" />\r
+    <ClCompile Include="SKP_Silk_LP_variable_cutoff.c" />\r
     <ClCompile Include="SKP_Silk_LSF_cos_table.c" />\r
-    <ClCompile Include="SKP_Silk_LPC_analysis_filter.c" />\r
     <ClCompile Include="SKP_Silk_NLSF2A.c" />\r
+    <ClCompile Include="SKP_Silk_NLSF2A_stable.c" />\r
+    <ClCompile Include="SKP_Silk_NLSF_decode.c" />\r
+    <ClCompile Include="SKP_Silk_NLSF_del_dec_quant.c" />\r
+    <ClCompile Include="SKP_Silk_NLSF_encode.c" />\r
     <ClCompile Include="SKP_Silk_NLSF_stabilize.c" />\r
+    <ClCompile Include="SKP_Silk_NLSF_unpack.c" />\r
+    <ClCompile Include="SKP_Silk_NLSF_VQ.c" />\r
     <ClCompile Include="SKP_Silk_NLSF_VQ_weights_laroia.c" />\r
+    <ClCompile Include="SKP_Silk_NSQ.c" />\r
+    <ClCompile Include="SKP_Silk_NSQ_del_dec.c" />\r
     <ClCompile Include="SKP_Silk_pitch_analysis_core.c" />\r
     <ClCompile Include="SKP_Silk_pitch_est_tables.c" />\r
+    <ClCompile Include="SKP_Silk_PLC.c" />\r
+    <ClCompile Include="SKP_Silk_process_NLSFs.c" />\r
+    <ClCompile Include="SKP_Silk_quant_LTP_gains.c" />\r
     <ClCompile Include="SKP_Silk_resampler.c" />\r
     <ClCompile Include="SKP_Silk_resampler_down2.c" />\r
     <ClCompile Include="SKP_Silk_resampler_down2_3.c" />\r
     <ClCompile Include="SKP_Silk_scale_vector.c" />\r
     <ClCompile Include="SKP_Silk_schur.c" />\r
     <ClCompile Include="SKP_Silk_schur64.c" />\r
+    <ClCompile Include="SKP_Silk_shell_coder.c" />\r
     <ClCompile Include="SKP_Silk_sigm_Q15.c" />\r
     <ClCompile Include="SKP_Silk_sort.c" />\r
+    <ClCompile Include="SKP_Silk_stereo_decode_pred.c" />\r
+    <ClCompile Include="SKP_Silk_stereo_encode_pred.c" />\r
+    <ClCompile Include="SKP_Silk_stereo_find_predictor.c" />\r
+    <ClCompile Include="SKP_Silk_stereo_LR_to_MS.c" />\r
+    <ClCompile Include="SKP_Silk_stereo_MS_to_LR.c" />\r
     <ClCompile Include="SKP_Silk_sum_sqr_shift.c" />\r
+    <ClCompile Include="SKP_Silk_tables_gain.c" />\r
+    <ClCompile Include="SKP_Silk_tables_LTP.c" />\r
+    <ClCompile Include="SKP_Silk_tables_NLSF_CB_NB_MB.c" />\r
+    <ClCompile Include="SKP_Silk_tables_NLSF_CB_WB.c" />\r
+    <ClCompile Include="SKP_Silk_tables_other.c" />\r
+    <ClCompile Include="SKP_Silk_tables_pitch_lag.c" />\r
+    <ClCompile Include="SKP_Silk_tables_pulses_per_block.c" />\r
+    <ClCompile Include="SKP_Silk_VAD.c" />\r
+    <ClCompile Include="SKP_Silk_VQ_WMat_EC.c" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\win32\config.h" />\r
+    <ClInclude Include="float\SKP_Silk_main_FLP.h" />\r
+    <ClInclude Include="SKP_Silk_control.h" />\r
+    <ClInclude Include="SKP_Silk_define.h" />\r
+    <ClInclude Include="SKP_Silk_errors.h" />\r
+    <ClInclude Include="SKP_Silk_Inlines.h" />\r
+    <ClInclude Include="SKP_Silk_MacroCount.h" />\r
+    <ClInclude Include="SKP_Silk_MacroDebug.h" />\r
+    <ClInclude Include="SKP_Silk_macros.h" />\r
+    <ClInclude Include="SKP_Silk_main.h" />\r
+    <ClInclude Include="SKP_Silk_pitch_est_defines.h" />\r
+    <ClInclude Include="SKP_Silk_PLC.h" />\r
+    <ClInclude Include="SKP_Silk_resampler_private.h" />\r
+    <ClInclude Include="SKP_Silk_resampler_rom.h" />\r
+    <ClInclude Include="SKP_Silk_resampler_structs.h" />\r
+    <ClInclude Include="SKP_Silk_SDK_API.h" />\r
+    <ClInclude Include="SKP_Silk_SigProc_FIX.h" />\r
+    <ClInclude Include="SKP_Silk_structs.h" />\r
+    <ClInclude Include="SKP_Silk_tables.h" />\r
+    <ClInclude Include="SKP_Silk_tuning_parameters.h" />\r
+    <ClInclude Include="SKP_Silk_typedef.h" />\r
   </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r