Commit 5828caa5 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch 'main' of forge.3gpp.org:ivas-codec-pc/ivas-codec into FhG/hrtf_binary_fastconv

parents 5bad2637 4353d954

.gitignore

+4 −0
Original line number Diff line number Diff line
@@ -61,6 +61,10 @@ tests/renderer/cut 
tests/renderer/ref

tests/dut

tests/ref

scripts/testv/*_cut*.pcm

# default reference binary name

IVAS_cod_ref

IVAS_dec_ref



# Python files that pop up when running scripts

__pycache__/

.gitlab-ci.yml

+22 −13
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ external-renderer-make-pytest: 
    - make -j IVAS_rend

    - make -j unittests

    - make -j --directory scripts/td_object_renderer/object_renderer_standalone

    - python3 -m pytest -q --log-level ERROR -n auto -rA --junit-xml=report-junit.xml tests/renderer/test_renderer.py

    - python3 -m pytest -q -n auto -rA --junit-xml=report-junit.xml tests/renderer/test_renderer.py

  artifacts:

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"

    when: always
@@ -353,7 +353,8 @@ external-renderer-cmake-asan-pytest: 
    - python3 ci/disable_ram_counting.py

    - cmake -B cmake-build -G "Unix Makefiles" -DCLANG=asan -DCOPY_EXECUTABLES_FROM_BUILD_DIR=true

    - cmake --build cmake-build -- -j

    - python3 -m pytest -q --log-level ERROR -n auto -rA --junit-xml=report-junit.xml tests/renderer/test_renderer.py

    - python3 -m pytest -q -n auto -rA --junit-xml=report-junit.xml tests/renderer/test_renderer.py

    

  artifacts:

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"

    when: always
@@ -375,7 +376,8 @@ external-renderer-cmake-msan-pytest: 
    - python3 ci/disable_ram_counting.py

    - cmake -B cmake-build -G "Unix Makefiles" -DCLANG=msan  -DCOPY_EXECUTABLES_FROM_BUILD_DIR=true

    - cmake --build cmake-build -- -j

    - python3 -m pytest -q --log-level ERROR -n auto -rA --junit-xml=report-junit.xml tests/renderer/test_renderer.py

    - python3 -m pytest -q -n auto -rA --junit-xml=report-junit.xml tests/renderer/test_renderer.py

  

  artifacts:

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"

    when: always
@@ -397,7 +399,7 @@ external-renderer-cmake-msan-pytest: 
  script:

    - cmake -B cmake-build -G "Unix Makefiles" -DCOPY_EXECUTABLES_FROM_BUILD_DIR=true -DDEC_TO_REND_FLOAT_DUMP=true

    - cmake --build cmake-build -- -j

    - python3 -m pytest -q --log-level ERROR -n 1 -rA --junit-xml=report-junit.xml tests/renderer/test_renderer_vs_decoder.py

    - python3 -m pytest -q -n 1 -rA --junit-xml=report-junit.xml tests/renderer/test_renderer_vs_decoder.py

  artifacts:

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"

    when: always
@@ -421,7 +423,7 @@ external-renderer-pytest-on-merge-request: 
    - *print-common-info



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

    - non_be_flag=$(echo $CI_MERGE_REQUEST_TITLE | grep -c --ignore-case "\[rend(erer)*[ -]*non[ -]*be\]") || true

    - non_be_flag=$(echo $CI_MERGE_REQUEST_TITLE | grep -c --ignore-case "\[rend\(erer\)*[ -]*non[ -]*be\]") || true

    # TODO: needs splitting the test between reference and cut generation

    #- ref_using_main=$(echo $CI_MERGE_REQUEST_TITLE | grep -c --ignore-case "\[ref[ -]*using[ -]*main\]") || true
@@ -443,7 +445,7 @@ external-renderer-pytest-on-merge-request: 


    # run test

    - exit_code=0

    - python3 -m pytest -q --log-level ERROR -n auto -rA --junit-xml=report-junit.xml tests/renderer/test_renderer_be_comparison.py || exit_code=$?

    - python3 -m pytest -q --log-level ERROR -n auto -rA --html=report.html --self-contained-html --junit-xml=report-junit.xml tests/renderer/test_renderer_be_comparison.py || exit_code=$?

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



    - *merge-request-comparison-check
@@ -456,6 +458,7 @@ external-renderer-pytest-on-merge-request: 
    when: always

    paths:

      - report-junit.xml

      - report.html

    expose_as: "pytest external renderer results"

    reports:

      junit:
@@ -492,7 +495,7 @@ ivas-pytest-on-merge-request: 


    ### run pytest

    - exit_code=0

    - python3 -m pytest tests -v --junit-xml=report-junit.xml || exit_code=$?

    - python3 -m pytest tests -v --html=report.html --self-contained-html --junit-xml=report-junit.xml || exit_code=$?

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



    - *merge-request-comparison-check
@@ -505,6 +508,7 @@ ivas-pytest-on-merge-request: 
    when: always

    paths:

      - report-junit.xml

      - report.html

    expose_as: "pytest ivas results"

    reports:

      junit:
@@ -537,7 +541,7 @@ evs-pytest-on-merge-request: 


    ### run pytest for EVS cases

    - exit_code=0

    - python3 -m pytest tests/test_param_file.py -v --param_file scripts/config/self_test_evs.prm --junit-xml=report-junit-evs.xml || exit_code=$?

    - python3 -m pytest tests/test_param_file.py -v --param_file scripts/config/self_test_evs.prm --html=report.html --self-contained-html --junit-xml=report-junit-evs.xml || exit_code=$?

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



    - *merge-request-comparison-check
@@ -550,6 +554,7 @@ evs-pytest-on-merge-request: 
    when: always

    paths:

      - report-junit-evs.xml

      - report.html

    expose_as: "pytest evs results"

    reports:

      junit:
@@ -691,7 +696,7 @@ codec-comparison-on-main-push: 


    ### run pytest

    - exit_code=0

    - python3 -m pytest tests -v --junit-xml=report-junit.xml || exit_code=$?

    - python3 -m pytest tests -v --html=report.html --self-contained-html --junit-xml=report-junit.xml || 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 '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
@@ -704,6 +709,7 @@ codec-comparison-on-main-push: 
    when: always

    paths:

      - report-junit.xml

      - report.html

    expose_as: "Results of comparison to previous merge commit"

    reports:

      junit: report-junit.xml
@@ -1071,13 +1077,15 @@ complexity-StereoDmxEVS-stereo-in-mono-out: 
# Other jobs

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



# job that sets up gitlab pages website

# is run on a separate schedule and collects artifacts from other jobs (currently

# only the complexity measurements) multiple times a day

pages:

  stage: deploy

  tags:

    - test-complexity-measurement

    - ivas-linux

  rules:

    # only run for pipelines that affect the data for the page

    - if: $MEASURE_COMPLEXITY_LINUX

    - if: $UPDATE_PAGES

    # TODO: add coverage job

  script:
@@ -1085,7 +1093,8 @@ pages: 
    - branch=$CI_COMMIT_REF_NAME



    - mkdir public

    # get artifacts for complexity jobs



    ### fetch artifacts from latest run of complexity jobs

    - job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch complexity-stereo-in-stereo-out)

    - echo $job_id

    - echo "$API_URL_BASE/$job_id/artifacts"

Workspace_msvc/lib_dec.vcxproj

+1 −1
Original line number Diff line number Diff line
@@ -314,10 +314,10 @@ 
    <ClCompile Include="..\lib_dec\ivas_stereo_mdct_stereo_dec.c" />

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

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

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

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

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

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

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

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

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

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

Workspace_msvc/lib_dec.vcxproj.filters

+3 −9
Original line number Diff line number Diff line
@@ -466,9 +466,6 @@ 
    <ClCompile Include="..\lib_dec\ivas_stereo_td_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

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

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

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

      <Filter>dec_ivas_c</Filter>

    </ClCompile>
@@ -476,15 +473,9 @@ 
    <ClCompile Include="..\lib_dec\ivas_agc_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

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

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

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

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

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

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

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

      <Filter>dec_ivas_c</Filter>

    </ClCompile>
@@ -506,6 +497,9 @@ 
    <ClCompile Include="..\lib_dec\ivas_corecoder_dec_reconfig.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

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

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_dec\jbm_jb4_inputbuffer.h">

Workspace_msvc/lib_enc.vcxproj

+2 −2
Original line number Diff line number Diff line
@@ -330,8 +330,8 @@ 
    <ClCompile Include="..\lib_enc\ivas_stereo_switching_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_stereo_td_analysis.c" />

    <ClCompile Include="..\lib_enc\ivas_stereo_td_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_stereo_td_low_rate_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_tcx_core_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_td_low_rate_enc.c" />

    <ClCompile Include="..\lib_enc\lead_indexing.c" />

    <ClCompile Include="..\lib_enc\lib_enc.c" />

    <ClCompile Include="..\lib_enc\long_enr.c" />