Commit bd0cec97 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into '626-ubsan-assignments-between-unsigned-and-signed-int-change-values-in' 

# Conflicts:
#   lib_com/options.h
parents 53205946 d9e1e8e9

.gitlab-ci.yml

+3 −1
Original line number Diff line number Diff line
@@ -281,11 +281,13 @@ build-codec-instrumented-linux: 
# make sure that the codec builds with msan, asan and usan

build-codec-sanitizers-linux:

  extends:

    - .build-job-linux

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

    - .rules-basis

  script:

    - *print-common-info

    - bash ci/build_codec_sanitizers_linux.sh

    # need to use the "|| exit $?" suffix to get the allowed_failure return code, otherwise the job fails with code 1...<

    - ci/check_for_warnings.py $BUILD_OUTPUT || exit $?



build-codec-windows-cmake:

  extends:

Workspace_msvc/lib_dec.vcxproj

+0 −3
Original line number Diff line number Diff line
@@ -271,10 +271,7 @@ 
    <ClCompile Include="..\lib_dec\ivas_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_decision_matrix_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_dirac_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_dirac_decorr_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_dirac_onsets_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_dirac_output_synthesis_cov.c" />

    <ClCompile Include="..\lib_dec\ivas_dirac_output_synthesis_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_entropy_decoder.c" />

    <ClCompile Include="..\lib_dec\ivas_init_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_ism_dec.c" />

Workspace_msvc/lib_dec.vcxproj.filters

+0 −9
Original line number Diff line number Diff line
@@ -16,15 +16,6 @@ 
    <ClCompile Include="..\lib_dec\ivas_dirac_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_dirac_decorr_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_dirac_onsets_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_dirac_output_synthesis_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_rom_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

Workspace_msvc/lib_rend.vcxproj

+4 −0
Original line number Diff line number Diff line
@@ -222,6 +222,10 @@ 
    <ClCompile Include="..\lib_rend\ivas_splitRendererPLC.c" />

    <ClCompile Include="..\lib_rend\ivas_crend.c" />

    <ClCompile Include="..\lib_rend\ivas_dirac_ana.c" />

    <ClCompile Include="..\lib_rend\ivas_dirac_decorr_dec.c" />

    <ClCompile Include="..\lib_rend\ivas_dirac_onsets_dec.c" />

    <ClCompile Include="..\lib_rend\ivas_dirac_output_synthesis_dec.c" />

    <ClCompile Include="..\lib_rend\ivas_dirac_rend.c" />

    <ClCompile Include="..\lib_rend\ivas_efap.c" />

    <ClCompile Include="..\lib_rend\ivas_limiter.c" />

    <ClCompile Include="..\lib_rend\ivas_masa_merge.c" />

apps/decoder.c

+0 −2
Original line number Diff line number Diff line
@@ -2352,7 +2352,6 @@ static ivas_error decodeVoIP( 
    uint32_t nextPacketRcvTime_ms = 0;

    uint32_t systemTime_ms = 0;

    uint32_t systemTimeInc_ms = (uint32_t) JBM_FRONTEND_FETCH_FRAMESIZE_MS;

    int32_t nFramesWritten = 0;

    int32_t nFramesFed = 0;
@@ -2710,7 +2709,6 @@ static ivas_error decodeVoIP( 


        frame++;

        systemTime_ms += systemTimeInc_ms;

        nFramesWritten++;



#ifdef WMOPS

        update_mem();