Commit 456e841e authored by norvell's avatar norvell
Browse files

Merge branch 'ci/update-basop-ci-branch' into 'basop-ci-branch' 

[CI] update basop-ci-branch

See merge request !2366
parents 8bcc86db 017ededb

.gitlab-ci.yml

+40 −21
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ workflow: 
    - make clean

    - make -j CLANG=$CLANG_NUM

    - testcase_timeout=$SELFTEST_SANITY_TIMEOUT

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

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



    - exit_code20=0

    - exit_code10=0
@@ -608,7 +608,7 @@ renderer-usan: 
  variables:

    SANITIZER_BUILD_STRING: "usan"

  script:

    - UBSAN_OPTIONS=suppressions=scripts/ubsan.supp,report_error_type=1 python3 -m pytest -q --tb=no -n auto --html=report.html --self-contained-html --junit-xml=report-junit.xml tests/renderer/test_renderer.py tests/split_rendering/test_split_rendering.py --testcase_timeout=$testcase_timeout

    - UBSAN_OPTIONS=suppressions=scripts/ubsan.supp,report_error_type=1,print_stacktrace=1 python3 -m pytest -q --tb=no -n auto --html=report.html --self-contained-html --junit-xml=report-junit.xml tests/renderer/test_renderer.py tests/split_rendering/test_split_rendering.py --testcase_timeout=$testcase_timeout

  artifacts:

    expose_as: "renderer usan result"
@@ -707,6 +707,29 @@ split-rendering-voip-be-to-binaural: 
      junit:

        - report-junit.xml



# test rtpdump

rtpdump-test:

  extends:

    - .test-job-linux

    - .rules-merge-request-to-main

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

  stage: test

  script:

    - make -j

    - testcase_timeout=15

    - python3 -m pytest -q --tb=no -n auto -rA --html=report.html --self-contained-html --junit-xml=report-junit.xml tests/rtp/test_rtp.py --testcase_timeout=$testcase_timeout

  artifacts:

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

    expire_in: 1 week

    when: always

    paths:

      - report-junit.xml

      - report.html

    expose_as: "rtpdump pytest results"

    reports:

      junit:

        - report-junit.xml



lc3-wrapper-unit-test:

  extends:

    - .test-job-linux
@@ -1279,11 +1302,8 @@ ivas-conformance: 


    # Reference creation

    - python scripts/prepare_combined_format_inputs.py

    - $TEST_SET = "tests/codec_be_on_mr_nonselection", "tests/renderer/test_renderer.py", "tests/split_rendering/test_split_rendering.py"

    - python -m pytest $TEST_SET -v -n auto --update_ref 1 --create_ref --keep_files



    # Output creation

    - python -m pytest $TEST_SET -v -n auto --keep_files --create_cut --html=report_cmd.html --self-contained-html

    - $TEST_SET = "tests/codec_be_on_mr_nonselection", "tests/renderer_short/test_renderer.py", "tests/split_rendering/test_split_rendering.py"

    - python -m pytest -q $TEST_SET -v -n auto --update_ref 1 --create_ref --keep_files --html=report_cmd.html --self-contained-html

    - python scripts/parse_commands.py report_cmd.html Readme_IVAS.txt



    # Copy input data and output ref data
@@ -1297,7 +1317,7 @@ ivas-conformance: 
    - mkdir testvec

    - mkdir testvec/binauralRenderer_interface

    - mkdir testvec/testv

    - mkdir testvec/testv/renderer

    - mkdir testvec/testv/renderer_short

    - mkdir testvec/testv/split_rendering

    - mkdir testvec/bin

    - cp    -force -ErrorAction Ignore scripts/testv/* testvec/testv
@@ -1307,9 +1327,8 @@ ivas-conformance: 
    - cp -r -force -ErrorAction Ignore scripts/trajectories testvec

    - cp -r -force -ErrorAction Ignore scripts/binauralRenderer_interface/binaural_renderers_hrtf_data testvec/binauralRenderer_interface

    - cp -r -force -ErrorAction Ignore tests/ref testvec/testv/ref

    - cp -r -force -ErrorAction Ignore tests/dut/* testvec/testv/ref

    - cp -r -force -ErrorAction Ignore tests/renderer/cut testvec/testv/renderer/ref

    - cp -r -force -ErrorAction Ignore tests/split_rendering/cut testvec/testv/split_rendering/ref

    - cp -r -force -ErrorAction Ignore tests/renderer_short/ref testvec/testv/renderer_short/ref

    - cp -r -force -ErrorAction Ignore tests/split_rendering/ref testvec/testv/split_rendering/ref

    - cp -r -force -ErrorAction Ignore tests/split_rendering/renderer_configs testvec/testv/split_rendering/renderer_configs

    - cp -r -force -ErrorAction Ignore tests/split_rendering/error_patterns testvec/testv/split_rendering/error_patterns
@@ -1379,11 +1398,8 @@ ivas-conformance-linux: 


    # Reference creation

    - python3 scripts/prepare_combined_format_inputs.py

    - TEST_SET="tests/codec_be_on_mr_nonselection tests/renderer/test_renderer.py tests/split_rendering/test_split_rendering.py"

    - python3 -m pytest -q $TEST_SET -v -n auto --update_ref 1 --create_ref --keep_files



    # Output creation

    - python3 -m pytest -q $TEST_SET -v -n auto --keep_files --create_cut --html=report_cmd.html --self-contained-html

    - TEST_SET="tests/codec_be_on_mr_nonselection tests/renderer_short/test_renderer.py tests/split_rendering/test_split_rendering.py"

    - python3 -m pytest -q $TEST_SET -v -n auto --update_ref 1 --create_ref --keep_files --html=report_cmd.html --self-contained-html

    - python3 scripts/parse_commands.py report_cmd.html Readme_IVAS.txt



    # Copy input data and output ref data
@@ -1391,7 +1407,7 @@ ivas-conformance-linux: 
    - mkdir testvec

    - mkdir testvec/binauralRenderer_interface

    - mkdir testvec/testv

    - mkdir testvec/testv/renderer

    - mkdir testvec/testv/renderer_short

    - mkdir testvec/testv/split_rendering

    - mkdir testvec/bin

    - cp -r scripts/testv/* testvec/testv
@@ -1401,9 +1417,8 @@ ivas-conformance-linux: 
    - cp -r scripts/trajectories testvec

    - cp -r scripts/binauralRenderer_interface/binaural_renderers_hrtf_data testvec/binauralRenderer_interface

    - cp -r tests/ref testvec/testv/ref

    - cp -r tests/dut/* testvec/testv/ref

    - cp -r tests/renderer/cut testvec/testv/renderer/ref

    - cp -r tests/split_rendering/cut testvec/testv/split_rendering/ref

    - cp -r tests/renderer_short/ref testvec/testv/renderer_short/ref

    - cp -r tests/split_rendering/ref testvec/testv/split_rendering/ref

    - cp -r tests/split_rendering/renderer_configs testvec/testv/split_rendering/renderer_configs

    - cp -r tests/split_rendering/error_patterns testvec/testv/split_rendering/error_patterns
@@ -1468,6 +1483,8 @@ test-long-self-test: 
  stage: compare

  resource_group: ivas-long-self-test-resource

  timeout: "50 minutes"

  tags:

    - ivas-linux-fast

  rules:

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'test-long-self-test'

  allow_failure:
@@ -2214,7 +2231,9 @@ sanitizer-test-osba-planar-hoa3-ism4: 
    expire_in: 1 week



coverage-merge:

  extends: .rules-main-scheduled

  extends:

    - .rules-main-scheduled

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

  tags:

    - ivas-linux-fast

  stage: test

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ file(GLOB libDecSrcs "lib_dec/*.c") 
file(GLOB libDecHeaders "lib_dec/*.h")

add_library(lib_dec ${libDecSrcs} ${libDecHeaders})

target_link_libraries(lib_dec lib_com lib_rend lib_debug lib_isar)

target_include_directories(lib_dec PUBLIC lib_dec lib_rend PRIVATE lib_enc lib_isar)

target_include_directories(lib_dec PUBLIC lib_dec lib_rend PRIVATE lib_enc lib_isar lib_util)



file(GLOB libUtilSrcs "lib_util/*.c")

file(GLOB libUtilHeaders "lib_util/*.h")

Makefile

+4 −1
Original line number Diff line number Diff line
@@ -71,6 +71,9 @@ LDLIBS += -lm 


# Clang sanitizer compiler options

CCCLANG = clang

ifeq "$(CLANG)" "0"

CC       = $(CCCLANG)

endif

ifeq "$(CLANG)" "1"

CC       = $(CCCLANG)

CFLAGS  += -fsanitize=memory
@@ -166,7 +169,7 @@ DEPS = $(addprefix $(OBJDIR)/,$(SRCS_LIBCOM:.c=.P) $(SRCS_LIBDEBUG:.c=.P) $(SRCS 


.PHONY: all clean



all: $(CLI_APIENC) $(CLI_APIDEC) $(CLI_APIREND) $(CLI_APIPOSTREND)

all: $(CLI_APIENC) $(CLI_APIDEC) $(CLI_APIREND) $(CLI_APIPOSTREND) $(CLI_AMBICONVERT)



$(OBJDIR):

	$(QUIET)mkdir -p $(OBJDIR)

Workspace_msvc/lib_dec.vcxproj

+2 −2
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ 
    </Midl>

    <ClCompile>

      <Optimization>Disabled</Optimization>

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

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

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

      <ExceptionHandling />

      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -109,7 +109,7 @@ 
      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>

      <OmitFramePointers>false</OmitFramePointers>

      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>

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

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

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

      <StringPooling>true</StringPooling>

      <ExceptionHandling />

Workspace_msvc/lib_lc3plus.vcxproj

+1 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ 
    <ClCompile Include="..\lib_lc3plus\ari_codec.c" />

    <ClCompile Include="..\lib_lc3plus\attack_detector.c" />

    <ClCompile Include="..\lib_lc3plus\constants.c" />

    <ClCompile Include="..\lib_lc3plus\com_entropy.c" />

    <ClCompile Include="..\lib_lc3plus\cutoff_bandwidth.c" />

    <ClCompile Include="..\lib_lc3plus\dct4.c" />

    <ClCompile Include="..\lib_lc3plus\dec_entropy.c" />