Commit 70d90af5 authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

merge main-pc to branch

parents 15f79ea4 38ff332b

.gitlab-ci.yml

+15 −8
Original line number Diff line number Diff line
@@ -322,6 +322,10 @@ stages: 
  - (Get-Content -Path "CMakeLists.txt") -replace '# \(add_compile_options\("\/WX"\)\)', '$1' | Set-Content -Path "CMakeLists.txt"

  - Get-ChildItem -Path "Workspace_msvc" -Filter "*.vcxproj" | ForEach-Object { (Get-Content -Path $_.FullName) -replace '<TreatWarningAsError>false', '<TreatWarningAsError>true' | Set-Content -Path $_.FullName }



.remove_unsupported_testcases: &remove_unsupported_testcases

  # Note: the --use-main-pc-set arg should only be used on main-pc and float-pc branches

  - python3 ci/remove_unsupported_testcases.py $PRM_FILES --use-main-pc-set



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

# Job templates

# ---------------------------------------------------------------
@@ -533,7 +537,7 @@ stages: 
    -    testcase_timeout=$TESTCASE_TIMEOUT_STV

    - fi



    - python3 ci/remove_unsupported_testcases.py $PRM_FILES

    - *remove_unsupported_testcases

    - if [ $LEVEL_SCALING != "1.0" ];then

    -   *apply-testv-scaling

    - fi
@@ -646,7 +650,7 @@ stages: 
    -    testcase_timeout=$TESTCASE_TIMEOUT_STV

    - fi



    - python3 ci/remove_unsupported_testcases.py $PRM_FILES

    - *remove_unsupported_testcases

    - python3 scripts/prepare_combined_format_inputs.py



    - if [ $LEVEL_SCALING != "1.0" ];then
@@ -748,6 +752,10 @@ stages: 
  script:

    - *print-common-info



    # create empty files for all artifacts to suppress warnings in case of no regressions found or all is BE

    - touch $XML_REPORT_BRANCH $XML_REPORT_MAIN $HTML_REPORT_BRANCH $HTML_REPORT_MAIN $CSV_BRANCH $CSV_MAIN $SUMMARY_HTML_ARTIFACT_NAME $FLOAT_REF_COMMIT_FILE $CUT_COMMIT_FILE $MERGE_TARGET_COMMIT_FILE regressions_crashes.csv regressions_MLD.csv regressions_MAXIMUM_ABS_DIFF.csv regressions_MIN_SSNR.csv regressions_MIN_ODG.csv improvements_crashes.csv improvements_MLD.csv improvements_MAXIMUM_ABS_DIFF.csv improvements_MIN_SSNR.csv improvements_MIN_ODG.csv

    - mkdir $IMAGES_ARTIFACT_NAME



    - set -euxo pipefail



    - if [ -s $FAILED_TESTCASES_LIST ]; then
@@ -770,7 +778,7 @@ stages: 
    -    testcase_timeout=$TESTCASE_TIMEOUT_STV

    - fi



    - python3 ci/remove_unsupported_testcases.py $PRM_FILES

    - *remove_unsupported_testcases

    - if [ $LEVEL_SCALING != "1.0" ];then

    -   *apply-testv-scaling

    - fi
@@ -793,7 +801,6 @@ stages: 
    - mv tests/dut tests/dut_branch



    # create the summary based on the branch

    - mkdir $IMAGES_ARTIFACT_NAME

    - for MEASURE in MLD DIFF SSNR ODG;do python3 scripts/create_histogram_summary.py $CSV_BRANCH $IMAGES_ARTIFACT_NAME/summary_"$MEASURE".csv $IMAGES_ARTIFACT_NAME/summary_"$MEASURE".png --measure $MEASURE; done

    - python3 ci/basop-pages/create_summary_page.py $SUMMARY_HTML_ARTIFACT_NAME $CI_JOB_ID $CI_JOB_NAME
@@ -889,13 +896,13 @@ stages: 
    - *print-common-info

    - *update-scripts-repo

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

    - python3 ci/remove_unsupported_testcases.py $PRM_FILES

    - *remove_unsupported_testcases



    - *build-float-ref-binaries

    - set -euxo pipefail

    - make_args="CLANG=$CLANG_NUM"

    - if [[ $CLANG_NUM == 3 ]]; then

    -   export UBSAN_OPTIONS="suppressions=scripts/ubsan_basop.supp,report_error_type=1"

    -   export UBSAN_OPTIONS="suppressions=scripts/ubsan_basop.supp,report_error_type=1,print_stacktrace=1"

    -   python3 scripts/basop_create_ignorelist_for_ubsan.py

    -   make_args="$make_args IGNORELIST=1"

    - fi
@@ -936,7 +943,7 @@ stages: 
    -    testcase_timeout=$TESTCASE_TIMEOUT_STV

    - fi



    - python3 ci/remove_unsupported_testcases.py $PRM_FILES

    - *remove_unsupported_testcases

    - if [ $LEVEL_SCALING != "1.0" ];then

    -   *apply-testv-scaling

    - fi
@@ -2136,7 +2143,7 @@ ivas-pytest-on-merge-request: 
    - *get-commits-behind-count

    - *check-commits-behind-count-in-compare-jobs

    - *merge-request-comparison-setup-codec

    - python3 ci/remove_unsupported_testcases.py $PRM_FILES

    - *remove_unsupported_testcases



    # some helper variables - "|| true" to prevent failures from grep not finding anything

    # write to temporary file as workaround for failures observed with piping echo

CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#        cmake --build . --config Release





cmake_minimum_required(VERSION 3.1)

cmake_minimum_required(VERSION 3.10)



set(CMAKE_C_STANDARD 99)
@@ -121,7 +121,7 @@ if(WMOPS) 
  add_definitions("-DWMOPS=1")

endif()



project(stereo-evs)

project(stereo-evs LANGUAGES C)

set_property(GLOBAL PROPERTY USE_FOLDERS ON) # make Visual Studio projects look nicer

include(CTest)

Workspace_msvc/lib_com.vcxproj

+0 −2
Original line number Diff line number Diff line
@@ -279,7 +279,6 @@ 
    <ClCompile Include="..\lib_com\swb_bwe_com_fx.c" />

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

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

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

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

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

    <ClCompile Include="..\lib_com\syn_filt_fx.c" />
@@ -321,7 +320,6 @@ 
    <ClInclude Include="..\lib_com\ivas_cnst.h" />

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

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

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

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

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

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

Workspace_msvc/lib_com.vcxproj.filters

+1 −7
Original line number Diff line number Diff line
@@ -430,9 +430,6 @@ 
    <ClCompile Include="..\lib_com\rom_com.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>
@@ -575,9 +572,6 @@ 
    <ClInclude Include="..\lib_com\ivas_error_utils.h">

      <Filter>common_h</Filter>

    </ClInclude>

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

      <Filter>common_h</Filter>

    </ClInclude>

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

      <Filter>common_h</Filter>

    </ClInclude>
@@ -621,7 +615,7 @@ 
      <Filter>common_h</Filter>

    </ClInclude>

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

      <Filter>common_all_c</Filter>

      <Filter>common_h</Filter>

    </ClInclude>

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

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

apps/renderer.c

+4 −0
Original line number Diff line number Diff line
@@ -323,7 +323,11 @@ static const CmdLnParser_Option cliOptions[] = { 
      .description = "LFE panning matrix. File (CSV table) containing a matrix of dimensions [ num_input_lfe x num_output_channels ] with elements specifying linear routing gain (like --gain, -g). \nIf specified, overrides the output LFE position option and the default behavior which attempts to map input to output LFE channel(s)" },

    {

        .id = CmdLnOptionId_noDelayCmp,

#ifdef FIX_929_RENDERER_CMDL

        .match = "no_delay_compensation",

#else

        .match = "no_delay_comparison",

#endif

        .matchShort = "no_delay_cmp",

        .description = "[flag] Turn off delay compensation",

    },