Commit 7d5ccc2e authored by vaclav's avatar vaclav
Browse files

Merge branch 'main' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec into my_maintenance

parents 0cc776b5 ce365cbc

.gitlab-ci.yml

+46 −9
Original line number Diff line number Diff line
@@ -31,6 +31,14 @@ stages: 
  tags:

    - ivas-linux



.build-job-linux:

  extends: .test-job

  stage: build

  timeout: "2 minutes"

  tags:

    - ivas-linux





# template for test jobs on linux that need the TESTV_DIR

.test-job-linux-needs-testv-dir:

  extends: .test-job-linux
@@ -40,7 +48,7 @@ stages: 


# template for build jobs to include the check for warnings

.build-job-with-check-for-warnings:

  extends: .test-job-linux

  extends: .build-job-linux

  stage: build

  allow_failure:

    exit_codes:
@@ -87,7 +95,6 @@ build-codec-linux-cmake: 
  extends: .build-job-with-check-for-warnings

  rules:

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'

  stage: build

  script:

    - mkdir build

    - cd build
@@ -98,19 +105,17 @@ build-codec-linux-cmake: 
    - ci/check_for_warnings.py $BUILD_OUTPUT || exit $?



build-codec-instrumented-linux:

  extends: .test-job-linux

  extends: .build-job-linux

  rules:

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'

  stage: build

  script:

    - bash ci/build_codec_instrumented_linux.sh



# make sure that the codec builds with msan, asan and usan

build-codec-sanitizers-linux:

  extends: .test-job-linux

  extends: .build-job-linux

  rules:

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'

  stage: build

  script:

    - bash ci/build_codec_sanitizers_linux.sh
@@ -119,8 +124,7 @@ build-codec-sanitizers-linux: 
codec-smoke-test:

  extends: .test-job-linux-needs-testv-dir

  # temporarily restrict this job to the only runner which (so far) seems to runit without problems

  tags:

    - test-fhg-linux-runner1

  timeout: "5 minutes"

  rules:

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'

  stage: test
@@ -135,6 +139,36 @@ codec-smoke-test: 
      - out/logs





# code selftest testvectors with memory-sanitizer binaries

msan-on-merge-request-linux:

  extends: .test-job-linux

  stage: test

  needs: [ "build-codec-sanitizers-linux" ]

  rules:

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'

  script:

    - make clean

    - make -j CLANG=1

    - python3 scripts/self_test.py --create | tee test_output.txt

    - run_errors=$(cat test_output.txt | grep -ic "run errors") || true

    - if [ $run_errors != 0 ] ; then echo "Run errors in self_test.py with Clang memory-sanitizer"; exit 1; fi





# code selftest testvectors with address-sanitizer binaries

asan-on-merge-request-linux:

  extends: .test-job-linux

  stage: test

  needs: [ "build-codec-sanitizers-linux" ]

  rules:

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'

  script:

    - make clean

    - make -j CLANG=2

    - python3 scripts/self_test.py --create | tee test_output.txt

    - run_errors=$(cat test_output.txt | grep -ic "run errors") || true

    - if [ $run_errors != 0 ] ; then echo "Run errors in self_test.py with Clang address-sanitizer"; exit 1; fi





# compare bit exactness between target and source branch

self-test-on-merge-request:

  extends: .test-job-linux
@@ -142,6 +176,7 @@ self-test-on-merge-request: 
  needs: [ "build-codec-linux-cmake", "codec-smoke-test" ]

  rules:

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'

  timeout: "10 minutes"

  script:

    ### build test binaries, initial clean for paranoia reasons

    - make clean
@@ -205,7 +240,7 @@ self-test-on-merge-request: 
    - exit_code=0

    - python3 ./scripts/ivas_pytests/self_test_b.py --encref IVAS_cod_ref --decref IVAS_dec_ref --encdut IVAS_cod_test --decdut IVAS_dec_test || exit_code=$?

    - if [ $exit_code -eq 1 ] && [ $non_be_flag == 0 ]; then echo "pytest run had failures and non-BE flag not present"; exit $EXIT_CODE_FAIL; fi

    - zero_errors=$(cat report-junit.xml | grep -c 'testsuite errors="0"') || true

    - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true

    - if [ $exit_code -eq 1 ] && [ $zero_errors == 1 ]; then echo "pytest run had failures, but no errors and non-BE flag present"; exit $EXIT_CODE_NON_BE; fi

    - if [ $exit_code -ne 0 ]; then echo "pytest run had errors"; exit $EXIT_CODE_FAIL; fi;

    # return exit code from selftest if everything went well with the pytest run
@@ -214,10 +249,12 @@ self-test-on-merge-request: 
    exit_codes:

      - 123

  artifacts:

    when: always

    paths:

      - test_output.txt

      - scripts/test/logs

      - scripts/ref/logs

      - report-junit.xml

    reports:

      junit: report-junit.xml

Workspace_msvc/lib_com.vcxproj

+3 −3
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ 
    </CustomBuildStep>

    <ClCompile>

      <Optimization>Disabled</Optimization>

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

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

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

      <ExceptionHandling />

      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -109,7 +109,7 @@ 
    </CustomBuildStep>

    <ClCompile>

      <Optimization>Disabled</Optimization>

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

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

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

      <ExceptionHandling>

      </ExceptionHandling>
@@ -147,7 +147,7 @@ 
      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>

      <OmitFramePointers>false</OmitFramePointers>

      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>

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

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

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

      <StringPooling>true</StringPooling>

      <ExceptionHandling />

Workspace_msvc/lib_debug.vcxproj

+5 −5
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ 
    </CustomBuildStep>

    <ClCompile>

      <Optimization>Disabled</Optimization>

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

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

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

      <MinimalRebuild>false</MinimalRebuild>

      <ExceptionHandling />
@@ -97,7 +97,7 @@ 
    </CustomBuildStep>

    <ClCompile>

      <Optimization>Disabled</Optimization>

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

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

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

      <MinimalRebuild>false</MinimalRebuild>

      <ExceptionHandling>
@@ -124,7 +124,7 @@ 
      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

      <IntrinsicFunctions>false</IntrinsicFunctions>

      <WholeProgramOptimization>false</WholeProgramOptimization>

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

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

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

      <StringPooling>true</StringPooling>

      <ExceptionHandling />
@@ -147,7 +147,7 @@ 
    <ClCompile Include="..\lib_debug\mem_count.c" />

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

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

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

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

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

  </ItemGroup>

  <ItemGroup>
@@ -155,7 +155,7 @@ 
    <ClInclude Include="..\lib_debug\deb_out.h" />

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

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

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

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

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

  </ItemGroup>

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

Workspace_msvc/lib_enc.vcxproj

+3 −3
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ 
    </Midl>

    <ClCompile>

      <Optimization>Disabled</Optimization>

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

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

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

      <ExceptionHandling />

      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -129,7 +129,7 @@ 
    </Midl>

    <ClCompile>

      <Optimization>Disabled</Optimization>

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

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

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

      <ExceptionHandling>

      </ExceptionHandling>
@@ -176,7 +176,7 @@ 
      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>

      <OmitFramePointers>false</OmitFramePointers>

      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>

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

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

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

      <StringPooling>true</StringPooling>

      <ExceptionHandling />

apps/decoder.c

+12 −20
Original line number Diff line number Diff line
@@ -57,13 +57,7 @@ 
#include "debug.h"

#endif

#include "render_config_reader.h"

#ifdef DEBUG_SBA

#include "ivas_cnst.h"

#include "spar_debug.h"

int16_t numTransportChannels = 1;

int16_t numOutChannels = 1;

int16_t pca_ingest_channels = 1;

#endif





#define WMC_TOOL_MAN
@@ -202,6 +196,9 @@ int main( 
#ifdef DEBUGGING

    int32_t noClipping;

    int32_t cnt_frames_limited;

#ifdef DEBUG_SBA_AUDIO_DUMP

    int16_t numOutChannels, numTransportChannels, pca_ingest_channels;

#endif

#endif



#ifdef WMOPS
@@ -396,13 +393,8 @@ int main( 
        }

    }



#ifdef DEBUG_SBA

    spar_debug_t dbg_params;

    dbg_params.fs = arg.output_Fs;

    dbg_params.n_ch = numOutChannels;

    dbg_params.n_transport = numTransportChannels;

    dbg_params.pca_ingest_channels = pca_ingest_channels;

    ivas_open_decoder_debug_files( &dbg_params );

#ifdef DEBUG_SBA_AUDIO_DUMP

    ivas_open_sba_decoder_debug_files( arg.output_Fs, 1, 1 );

#endif



    /*-----------------------------------------------------------------*
@@ -558,6 +550,10 @@ int main( 


cleanup:



#ifdef DEBUG_SBA_AUDIO_DUMP

    IVAS_DEC_GetSbaDebugParams( hIvasDec, &numOutChannels, &numTransportChannels, &pca_ingest_channels );

#endif



    IVAS_DEC_Close( &hIvasDec );

    CustomLsReader_close( &hLsCustomReader );

    hrtfFileReader_close( &hrtfReader );
@@ -586,12 +582,8 @@ cleanup: 
        printf( "\n" );

    }



#ifdef DEBUG_SBA

    dbg_params.fs = arg.output_Fs;

    dbg_params.n_ch = numOutChannels;

    dbg_params.n_transport = numTransportChannels;

    dbg_params.pca_ingest_channels = pca_ingest_channels;

    ivas_close_decoder_debug_files( &dbg_params );

#ifdef DEBUG_SBA_AUDIO_DUMP

    ivas_close_sba_decoder_debug_files( arg.output_Fs, numOutChannels, numTransportChannels, pca_ingest_channels );

#endif

#ifdef DEBUGGING

    dbgclose();