Commit 288c2060 authored by norvell's avatar norvell
Browse files

Revert vcxproj settings to 26.452. Add BASOP_NOGLOB for one test case.

parent edbaf72d

Workspace_msvc/common.vcxproj

+4 −4
Original line number Diff line number Diff line
@@ -13,18 +13,18 @@ 
  <PropertyGroup Label="Globals">

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

    <RootNamespace>common</RootNamespace>

    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>

    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>

  </PropertyGroup>

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

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

    <ConfigurationType>StaticLibrary</ConfigurationType>

    <PlatformToolset>v142</PlatformToolset>

    <PlatformToolset>v141</PlatformToolset>

    <UseOfMfc>false</UseOfMfc>

    <CharacterSet>MultiByte</CharacterSet>

  </PropertyGroup>

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

    <ConfigurationType>StaticLibrary</ConfigurationType>

    <PlatformToolset>v142</PlatformToolset>

    <PlatformToolset>v141</PlatformToolset>

    <UseOfMfc>false</UseOfMfc>

    <CharacterSet>MultiByte</CharacterSet>

  </PropertyGroup>
@@ -83,7 +83,7 @@ 
      <Optimization>MaxSpeed</Optimization>

      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

      <IntrinsicFunctions>false</IntrinsicFunctions>

      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>

      <OmitFramePointers>false</OmitFramePointers>

      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>

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

Workspace_msvc/evs_dec.vcxproj

+4 −4
Original line number Diff line number Diff line
@@ -13,18 +13,18 @@ 
  <PropertyGroup Label="Globals">

    <ProjectGuid>{E822DDAF-0F5F-4CD0-A694-38AE69DE74D3}</ProjectGuid>

    <RootNamespace>evs_dec</RootNamespace>

    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>

    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>

  </PropertyGroup>

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

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

    <ConfigurationType>Application</ConfigurationType>

    <PlatformToolset>v142</PlatformToolset>

    <PlatformToolset>v141</PlatformToolset>

    <UseOfMfc>false</UseOfMfc>

    <CharacterSet>MultiByte</CharacterSet>

  </PropertyGroup>

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

    <ConfigurationType>Application</ConfigurationType>

    <PlatformToolset>v142</PlatformToolset>

    <PlatformToolset>v141</PlatformToolset>

    <UseOfMfc>false</UseOfMfc>

    <CharacterSet>MultiByte</CharacterSet>

  </PropertyGroup>
@@ -108,7 +108,7 @@ 
      <Optimization>MaxSpeed</Optimization>

      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

      <IntrinsicFunctions>false</IntrinsicFunctions>

      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>

      <OmitFramePointers>false</OmitFramePointers>

      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>

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

Workspace_msvc/evs_enc.vcxproj

+4 −4
Original line number Diff line number Diff line
@@ -13,18 +13,18 @@ 
  <PropertyGroup Label="Globals">

    <ProjectGuid>{824DA4CF-06F0-45C9-929A-8792F0E19C3E}</ProjectGuid>

    <RootNamespace>evs_enc</RootNamespace>

    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>

    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>

  </PropertyGroup>

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

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

    <ConfigurationType>Application</ConfigurationType>

    <PlatformToolset>v142</PlatformToolset>

    <PlatformToolset>v141</PlatformToolset>

    <UseOfMfc>false</UseOfMfc>

    <CharacterSet>MultiByte</CharacterSet>

  </PropertyGroup>

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

    <ConfigurationType>Application</ConfigurationType>

    <PlatformToolset>v142</PlatformToolset>

    <PlatformToolset>v141</PlatformToolset>

    <UseOfMfc>false</UseOfMfc>

    <CharacterSet>MultiByte</CharacterSet>

  </PropertyGroup>
@@ -69,7 +69,7 @@ 
      <Optimization>MaxSpeed</Optimization>

      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

      <IntrinsicFunctions>false</IntrinsicFunctions>

      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>

      <OmitFramePointers>false</OmitFramePointers>

      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>

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

Workspace_msvc/lib_fx.vcxproj

+3 −4
Original line number Diff line number Diff line
@@ -53,18 +53,18 @@ 
  <PropertyGroup Label="Globals">

    <ProjectGuid>{52EF5F7B-DF20-4BA8-96E0-DCB4A9B3D200}</ProjectGuid>

    <RootNamespace>lib_fx</RootNamespace>

    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>

    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>

  </PropertyGroup>

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

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

    <ConfigurationType>StaticLibrary</ConfigurationType>

    <PlatformToolset>v142</PlatformToolset>

    <PlatformToolset>v141</PlatformToolset>

    <CharacterSet>MultiByte</CharacterSet>

    <WholeProgramOptimization>true</WholeProgramOptimization>

  </PropertyGroup>

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

    <ConfigurationType>StaticLibrary</ConfigurationType>

    <PlatformToolset>v142</PlatformToolset>

    <PlatformToolset>v141</PlatformToolset>

    <CharacterSet>MultiByte</CharacterSet>

  </PropertyGroup>

  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -117,7 +117,6 @@ 
      <WarningLevel>Level3</WarningLevel>

      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

      <CompileAs>Default</CompileAs>

      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

    </ClCompile>

  </ItemDefinitionGroup>

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

lib_com/cng_exc_fx.c

+8 −2
Original line number Diff line number Diff line
@@ -864,9 +864,15 @@ void cng_params_upd_fx( 
        FOR (i=0; i<NUM_ENV_CNG; i++)

        {

            /* sp[i] = 2.0f*(*ptR * *ptR + *ptI * *ptI)/L_FFT; */

#ifdef BASOP_NOGLOB

            L_tmp = L_mult_o(*ptR, *ptR, &Overflow);/* 2*Q_exc+1 */

            L_tmp = L_add_o(L_tmp,L_mult_o(*ptI,*ptI, &Overflow), &Overflow);/* 2*Q_exc+1 */

            L_tmp = L_add_o(L_tmp, L_tmp, &Overflow);/* 2*Q_exc+1 */

#else

            L_tmp = L_mult(*ptR, *ptR);/* 2*Q_exc+1 */

            L_tmp = L_add(L_tmp, L_mult(*ptI, *ptI));/* 2*Q_exc+1 */

            L_tmp = L_add(L_tmp,L_tmp);/* 2*Q_exc+1 */

#endif

            L_tmp = Mult_32_16(L_tmp,128);/* 2*Q_exc+1 */

            tmp = add(add(Q_exc,Q_exc),1);

            sp[i] = L_shr(L_tmp,sub(tmp,6));