Commit 065d2e46 authored by norvell's avatar norvell
Browse files

Merge branch 'main' into ci/mld-jobs-with-level-scaling

parents ce47654a 844cf055

Workspace_msvc/decoder.vcxproj

+1 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ 
  <ItemGroup>

    <ClCompile Include="..\apps\decoder.c" />

    <ClCompile Include="..\lib_util\test_fft.c" />

    <ClCompile Include="..\lib_util\test_mdct.c" />

  </ItemGroup>

  <ItemGroup>

    <ProjectReference Include="lib_dec.vcxproj">

Workspace_msvc/lib_com.vcxproj

+3 −0
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ 
    <ClCompile Include="..\lib_com\fft.c" />

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

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

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

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

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

    <ClCompile Include="..\lib_com\fft_rel.c" />
@@ -243,12 +244,14 @@ 
    <ClCompile Include="..\lib_com\ivas_mc_param_com.c" />

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

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

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

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

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

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

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

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

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

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

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

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

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

Workspace_msvc/lib_com.vcxproj.filters

+3 −0
Original line number Diff line number Diff line
@@ -451,6 +451,9 @@ 
    <ClCompile Include="..\lib_com\ivas_mdct_imdct.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_mdct_imdct_fx.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_ism_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

Workspace_msvc/lib_debug.vcxproj

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 
    <ClCompile>

      <Optimization>Disabled</Optimization>

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

      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;DEBUGGING;DBG_WAV_WRITER;$(Macros);%(PreprocessorDefinitions)</PreprocessorDefinitions>

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

      <MinimalRebuild>false</MinimalRebuild>

      <ExceptionHandling />

      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

apps/decoder.c

+2 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ static void usage_dec( void ); 
static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );

static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, IVAS_DEC_HANDLE hIvasDec );

void run_fft_unit_test(void);

void run_mdct_unit_test(void);



/*------------------------------------------------------------------------------------------*

 * main()
@@ -173,6 +174,7 @@ int main( 
    if (run_unit_tests)

    {

      run_fft_unit_test();

      run_mdct_unit_test();

      return;

    }