Commit eabcb20b authored by TYAGIRIS's avatar TYAGIRIS
Browse files

co[pilation fixes on windows

parent 86f8098b

Workspace_msvc/lib_isar.vcxproj

+7 −25
Original line number Diff line number Diff line
@@ -13,16 +13,16 @@ 
  <PropertyGroup Label="Globals">

    <ProjectName>lib_isar</ProjectName>

    <ProjectGuid>{869A305E-D99E-4C3A-BDB3-AA57ABCCE619}</ProjectGuid>

    <RootNamespace>evs_dec</RootNamespace>

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

    <PlatformToolset>v141</PlatformToolset>

    <UseOfMfc>false</UseOfMfc>

    <CharacterSet>MultiByte</CharacterSet>

  </PropertyGroup>

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

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

    <ConfigurationType>StaticLibrary</ConfigurationType>

    <PlatformToolset>v141</PlatformToolset>
@@ -47,33 +47,24 @@ 
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

    <OutDir>.\Debug_$(ProjectName)\</OutDir>

    <IntDir>.\Debug_$(ProjectName)\</IntDir>

    <LinkIncremental>false</LinkIncremental>

    <GenerateManifest>false</GenerateManifest>

    <TargetName>libivasrend</TargetName>

    <TargetName>libisar</TargetName>

  </PropertyGroup>

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

    <OutDir>.\Release_$(ProjectName)\</OutDir>

    <IntDir>.\Release_$(ProjectName)\</IntDir>

    <LinkIncremental>false</LinkIncremental>

    <GenerateManifest>false</GenerateManifest>

    <TargetName>libivasrend</TargetName>

    <TargetName>libisar</TargetName>

  </PropertyGroup>

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

    <CustomBuildStep>

      <Message />

    </CustomBuildStep>

    <Midl>

      <TypeLibraryName>.\Debug\$(ProjectName).tlb</TypeLibraryName>

      <HeaderFileName />

    </Midl>

    <ClCompile>

      <Optimization>Disabled</Optimization>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;..\lib_isar;..\lib_lc3plus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;..\lib_isar;..\lib_lc3plus;.%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions);</PreprocessorDefinitions>

      <ExceptionHandling />

      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

      <RuntimeTypeInfo>false</RuntimeTypeInfo>

      <PrecompiledHeader />

      <PrecompiledHeaderOutputFile />

      <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
@@ -82,7 +73,6 @@ 
      <DebugInformationFormat>OldStyle</DebugInformationFormat>

      <CompileAs>Default</CompileAs>

      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>

      <TreatWarningAsError>false</TreatWarningAsError>

    </ClCompile>

    <ResourceCompile>

      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -98,10 +88,6 @@ 
    <CustomBuildStep>

      <Message />

    </CustomBuildStep>

    <Midl>

      <TypeLibraryName>$(IntDir)$(ProjectName).tlb</TypeLibraryName>

      <HeaderFileName />

    </Midl>

    <ClCompile>

      <Optimization>MaxSpeed</Optimization>

      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
@@ -109,14 +95,13 @@ 
      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>

      <OmitFramePointers>false</OmitFramePointers>

      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;..\lib_isar;..\lib_lc3plus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;..\lib_isar;..\lib_lc3plus;.%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <StringPooling>true</StringPooling>

      <ExceptionHandling />

      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

      <FunctionLevelLinking>true</FunctionLevelLinking>

      <RuntimeTypeInfo>false</RuntimeTypeInfo>

      <PrecompiledHeader />

      <PrecompiledHeaderOutputFile />

      <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
@@ -125,7 +110,6 @@ 
      <DebugInformationFormat />

      <CompileAs>Default</CompileAs>

      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>

      <TreatWarningAsError>false</TreatWarningAsError>

    </ClCompile>

    <ResourceCompile>

      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -138,7 +122,6 @@ 
    </Lib>

  </ItemDefinitionGroup>

  <ItemGroup>

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

    <ClCompile Include="..\lib_isar\isar_lcld_decoder.c" />

    <ClCompile Include="..\lib_isar\isar_lcld_encoder.c" />

    <ClCompile Include="..\lib_isar\isar_lcld_rom_tables.c" />
@@ -163,7 +146,6 @@ 
    <ClCompile Include="..\lib_isar\lib_isar_pre_rend.c" />

  </ItemGroup>

  <ItemGroup>

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

    <ClInclude Include="..\lib_isar\isar_lcld_prot.h" />

    <ClInclude Include="..\lib_isar\isar_prot.h" />

    <ClInclude Include="..\lib_isar\isar_stat.h" />

Workspace_msvc/lib_lc3plus.vcxproj

+2 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ 
      <PrecompiledHeader>

      </PrecompiledHeader>

      <WarningLevel>Level3</WarningLevel>

      <AdditionalIncludeDirectories>..\lib_com;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <Optimization>Disabled</Optimization>

      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -84,7 +84,7 @@ 
      <WarningLevel>Level3</WarningLevel>

      <PrecompiledHeader>

      </PrecompiledHeader>

      <AdditionalIncludeDirectories>..\lib_com;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <Optimization>MaxSpeed</Optimization>

      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

      <FunctionLevelLinking>true</FunctionLevelLinking>

apps/decoder.c

+16 −31
Original line number Diff line number Diff line
@@ -1942,13 +1942,15 @@ static ivas_error decodeG192( 
            {

                for ( i = 0; i < num_subframes; i++ )

                {

                    Quaternions[i].w = -3.0f;

                    Quaternions[i].x = 0.0f;

                    Quaternions[i].y = 0.0f;

                    Quaternions[i].z = 0.0f;

                    Pos[i].x = 0.0f;

                    Pos[i].y = 0.0f;

                    Pos[i].z = 0.0f;

                    Quaternions[i].w_fx = -12582912;

                    Quaternions[i].x_fx = 0;

                    Quaternions[i].y_fx = 0;

                    Quaternions[i].z_fx = 0;

                    Quaternions[i].q_fact = 22;

                    Pos[i].x_fx = 0;

                    Pos[i].y_fx = 0;

                    Pos[i].z_fx = 0;

                    Pos[i].q_fact = 25;

                }

            }

            else
@@ -2046,13 +2048,7 @@ static ivas_error decodeG192( 
            else

            {

#endif

#ifdef SPLIT_REND_WITH_HEAD_ROT

                if ( ( error = IVAS_DEC_GetSamples( hIvasDec, nSamplesToRender, IVAS_DEC_PCM_INT16, (void *) ( pcmBuf + nOutChannels * nSamplesRendered ), &nSamplesRendered_loop, &needNewFrame ) ) != IVAS_ERR_OK )



#else

                if ( ( error = IVAS_DEC_GetSamples( hIvasDec, nSamplesToRender, ( pcmBuf + nOutChannels * nSamplesRendered ), &nSamplesRendered_loop, &needNewFrame ) ) != IVAS_ERR_OK )



#endif

                {

                    fprintf( stderr, "\nError in IVAS_DEC_GetSamples: %s\n", IVAS_DEC_GetErrorMessage( error ) );

                    goto cleanup;
@@ -2264,11 +2260,7 @@ static ivas_error decodeG192( 
        }



        /* decode and get samples */

#ifdef SPLIT_REND_WITH_HEAD_ROT

        if ( ( error = IVAS_DEC_Flush( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, &nSamplesFlushed ) ) != IVAS_ERR_OK )

#else

        if ( ( error = IVAS_DEC_Flush( hIvasDec, nOutSamples, pcmBuf, &nSamplesFlushed ) ) != IVAS_ERR_OK )

#endif

        {

            fprintf( stderr, "\nError in IVAS_DEC_VoIP_Flush: %s\n", IVAS_DEC_GetErrorMessage( error ) );

            goto cleanup;
@@ -2655,13 +2647,15 @@ static ivas_error decodeVoIP( 
            {

                for ( i = 0; i < num_subframes; i++ )

                {

                    Quaternions[i].w = -3.0f;

                    Quaternions[i].x = 0.0f;

                    Quaternions[i].y = 0.0f;

                    Quaternions[i].z = 0.0f;

                    Quaternions[i].w_fx = -12582912;

                    Quaternions[i].x_fx = 0;

                    Quaternions[i].y_fx = 0;

                    Quaternions[i].z_fx = 0;

                    Quaternions[i].q_fact = 22;

                    Pos[i].x = 0.0f;

                    Pos[i].y = 0.0f;

                    Pos[i].z = 0.0f;

                    Pos[i].q_fact = 25;

                }

            }

            else
@@ -2774,19 +2768,10 @@ static ivas_error decodeVoIP( 




        /* decode and get samples */



#ifdef SPLIT_REND_WITH_HEAD_ROT

#ifdef SUPPORT_JBM_TRACEFILE

        if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, systemTime_ms, writeJbmTraceFileFrameWrapper, jbmTraceWriter ) ) != IVAS_ERR_OK )

#else

        if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, systemTime_ms ) ) != IVAS_ERR_OK )

#endif

#else

#ifdef SUPPORT_JBM_TRACEFILE

        if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, pcmBuf, systemTime_ms, writeJbmTraceFileFrameWrapper, jbmTraceWriter ) ) != IVAS_ERR_OK )

#else

        if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, pcmBuf, systemTime_ms ) ) != IVAS_ERR_OK )

#endif

#endif

        {

            fprintf( stderr, "\nError in IVAS_DEC_VoIP_GetSamples: %s\n", IVAS_DEC_GetErrorMessage( error ) );

apps/renderer.c

+1 −1
Original line number Diff line number Diff line
@@ -3854,7 +3854,7 @@ static void convertInputBuffer_fx( 
                IVAS_REND_cldfbAnalysis_ts_wrapper( &fIn[chnl][numCldfbBands * slotIdx],

                                                    &Word32Buffer[( chnl * numFloatSamplesPerChannel ) + ( 2 * slotIdx * numCldfbBands )],

                                                    &Word32Buffer[numCldfbBands + ( chnl * numFloatSamplesPerChannel ) + ( 2 * slotIdx * numCldfbBands )],

                                                    numCldfbBands, cldfbAna[chnl], in_q_factor, *out_q_factor );

                                                    numCldfbBands, cldfbAna[chnl], Q11, *out_q_factor );

            }

        }

    }

lib_com/cnst.h

+5 −0
Original line number Diff line number Diff line
@@ -3069,8 +3069,13 @@ enum 
#define SYNC_BAD_FRAME                        (UWord16) 0x6B20         /* synchronization word of a "bad" frame */

#define G192_BIN0                             (UWord16) 0x007F         /* binary "0" according to ITU-T G.192 */

#define G192_BIN1                             (UWord16) 0x0081         /* binary "1" according to ITU-T G.192 */

#ifdef SPLIT_REND_WITH_HEAD_ROT

#define DEGREE_180                            (Word32)(180.0 *ONE_IN_Q22)

#define DEGREE_360                            (Word32)(360.0 *ONE_IN_Q22)

#else

#define DEGREE_180                            (Word32)(180.0 *ONE_IN_Q23)

#define DEGREE_360                            (Word32)(360.0 *ONE_IN_Q23)

#endif

extern const Word16 Idx2Freq_Tbl[];



#define chk_fs(fs)