Commit a065ead1 authored by sagnowski's avatar sagnowski
Browse files

Merge branch 'FhG/multichannel-jbm' into 'main' 

Multichannel JBM

See merge request !289
parents 1c45f31e 9ef902c8

.gitignore

+2 −0
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ scripts/ref/ 
scripts/test/

scripts/out/

scripts/self_test_summary.txt

scripts/cppp/

binary/

tests/renderer/cut

tests/renderer/ref

tests/dut

.gitlab-ci.yml

+13 −0
Original line number Diff line number Diff line
@@ -270,12 +270,14 @@ codec-smoke-test: 
    ### analyze for failures

    - if cat smoke_test_output.txt | grep -c "failed"; then echo "Smoke test without PLC failed"; exit 1; fi

    - if cat smoke_test_output_plc.txt | grep -c "failed"; then echo "Smoke test with PLC failed"; exit 1; fi

    - if cat smoke_test_output_jbm_noEXT.txt | grep -c "failed"; then echo "Smoke test with PLC failed"; exit 1; fi

  artifacts:

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"

    paths:

      - out/logs/

      - smoke_test_output.txt

      - smoke_test_output_plc.txt

      - smoke_test_output_jbm_noEXT.txt

    expose_as: "Smoke test results"



# code selftest testvectors with memory-sanitizer binaries
@@ -562,6 +564,17 @@ evs-pytest-on-merge-request: 
      junit:

        - report-junit-evs.xml



voip-be-on-merge-request:

  extends:

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

    - .rules-merge-request

  stage: compare # Or should it be test? Comparison is done within one git revision

  needs: ["build-codec-linux-make", codec-smoke-test]

  timeout: "10 minutes"

  script:

    - *print-common-info

    - bash ci/ivas_voip_be_test.sh



clang-format-check:

  extends:

    - .test-job-linux

CMakeLists.txt

+3 −0
Original line number Diff line number Diff line
@@ -187,3 +187,6 @@ if(COPY_EXECUTABLES_FROM_BUILD_DIR) 
  add_custom_command(TARGET IVAS_crend_unit_test POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:IVAS_crend_unit_test>" "${CMAKE_CURRENT_SOURCE_DIR}/scripts/ivas_pytests/tests/unit_tests/crend/")

  add_custom_command(TARGET renderer_standalone POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:renderer_standalone>" "${CMAKE_CURRENT_SOURCE_DIR}/scripts/td_object_renderer/object_renderer_standalone/")

endif()



# Allow creating packages for CMake install

install(TARGETS lib_enc lib_dec lib_rend lib_com lib_util ARCHIVE DESTINATION lib)

Workspace_msvc/lib_rend.vcxproj

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ 
    </Midl>

    <ClCompile>

      <Optimization>Disabled</Optimization>

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

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

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

      <ExceptionHandling />

      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

apps/decoder.c

+435 −15

File changed.

Preview size limit exceeded, changes collapsed.