Commit 3b6ab59d authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge remote-tracking branch 'origin/main' into 740-masa-pre-rendering-disabled-in-validity-check

parents 00793175 c83d31aa

.gitlab-ci.yml

+8 −3
Original line number Diff line number Diff line
@@ -159,6 +159,12 @@ stages: 
.check-commits-behind-count-in-compare-jobs: &check-commits-behind-count-in-compare-jobs

  - if [ $commits_behind_count -ne 0 ]; then echo "Your branch is not up-to-date with main -> Compare tests will not run as they can contain false negatives this way.\nMain might have changed during your pipeline run. Run 'git merge origin/main' to update."; exit 1; fi



.copy-ltv-files-to-testv-dir: &copy-ltv-files-to-testv-dir

    - cp "$LTV_DIR"/*.wav scripts/testv/

    - cp "$LTV_DIR"/*.met scripts/testv/

    - cp "$LTV_DIR"/*.csv scripts/testv/





# ---------------------------------------------------------------

# Job templates

# ---------------------------------------------------------------
@@ -1233,9 +1239,7 @@ test-long-self-test: 
    ### prepare pytest



    # Copy test vectors from LTV to TESTV

    - cp "$LTV_DIR"/*.wav scripts/testv/

    - cp "$LTV_DIR"/*.met scripts/testv/

    - cp "$LTV_DIR"/*.csv scripts/testv/

    - *copy-ltv-files-to-testv-dir



    # create references

    - exit_code_ref=0
@@ -1519,6 +1523,7 @@ coverage-test-on-main-scheduled: 
  script:

    - *print-common-info

    - *update-ltv-repo

    - *copy-ltv-files-to-testv-dir

    - make GCOV=1 -j

    - cp IVAS_rend IVAS_rend_ref # Copy exec to be able to run renderer script

    - python3 tests/create_short_testvectors.py

Workspace_msvc/lib_com.vcxproj

+0 −1
Original line number Diff line number Diff line
@@ -283,7 +283,6 @@ 
    <ClInclude Include="..\lib_com\basop_util.h" />

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

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

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

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

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

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

Workspace_msvc/lib_com.vcxproj.filters

+0 −3
Original line number Diff line number Diff line
@@ -489,9 +489,6 @@ 
    <ClInclude Include="..\lib_com\basop32.h">

      <Filter>common_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_com\control.h">

      <Filter>common_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_com\cnst.h">

      <Filter>common_h</Filter>

    </ClInclude>

apps/decoder.c

+2 −0
Original line number Diff line number Diff line
@@ -3503,3 +3503,5 @@ static IVAS_DEC_FORCED_REND_MODE parseForcedRendModeDec( 
    return IVAS_DEC_FORCE_REND_UNDEFINED;

}

#endif



#undef WMC_TOOL_SKIP

apps/encoder.c

+2 −0
Original line number Diff line number Diff line
@@ -2117,3 +2117,5 @@ static ivas_error readForcedMode( 
    return IVAS_ERR_OK;

}

#endif



#undef WMC_TOOL_SKIP