Commit f7e729c5 authored by Lauros Pajunen's avatar Lauros Pajunen
Browse files

Merge remote-tracking branch 'origin/main' into 1154-add-rtpdump-support

parents fb4b45b8 9da419d7

.gitlab-ci.yml

+4 −1
Original line number Diff line number Diff line
@@ -872,7 +872,7 @@ lc3-wrapper-unit-test: 
  script:

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

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

    - scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test

    - scripts/split_rendering/lc3plus_float/ivas_lc3plus_unit_test



# compare split-rendering bitexactness between target and source branch

split-rendering-pytest-on-merge-request:
@@ -2464,6 +2464,9 @@ coverage-test-on-main-scheduled: 
    - *print-common-info

    - *update-ltv-repo

    - *complexity-measurements-setup

  allow_failure:

    exit_codes:

      - 123

  artifacts:

    name: "$CI_JOB_NAME--$CI_COMMIT_REF_NAME--sha-$CI_COMMIT_SHA"

    when: always

CMakeLists.txt

+4 −4
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)
@@ -174,7 +174,7 @@ target_include_directories(lib_util PUBLIC lib_util PRIVATE lib_com lib_enc lib_ 
target_include_directories(lib_util PRIVATE lib_lc3plus lib_isar)



if(NOT WMOPS)

  add_executable(ivas_lc3plus_unit_test scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test.c)

  add_executable(ivas_lc3plus_unit_test scripts/split_rendering/lc3plus_float/ivas_lc3plus_unit_test.c)

  target_link_libraries(ivas_lc3plus_unit_test lib_rend lib_dec lib_util lib_com lib_debug lib_isar)

endif()
@@ -213,7 +213,7 @@ if(COPY_EXECUTABLES_FROM_BUILD_DIR) 
  add_custom_command(TARGET IVAS_rend POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:IVAS_rend>" "${CMAKE_CURRENT_SOURCE_DIR}/")

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

  if (NOT WMOPS)

    add_custom_command(TARGET ivas_lc3plus_unit_test POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:ivas_lc3plus_unit_test>" "${CMAKE_CURRENT_SOURCE_DIR}/scripts/split_rendering/lc3plus")

    add_custom_command(TARGET ivas_lc3plus_unit_test POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:ivas_lc3plus_unit_test>" "${CMAKE_CURRENT_SOURCE_DIR}/scripts/split_rendering/lc3plus_float")

  endif()

endif()

LICENSE.md

+1 −1
Original line number Diff line number Diff line 
/******************************************************************************************************



   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,

   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,

   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,

   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,

   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other

apps/decoder.c

+3 −2
Original line number Diff line number Diff line 
/******************************************************************************************************



   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,

   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,

   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,

   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,

   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
@@ -668,7 +668,8 @@ int main( 


            if ( ( error = IVAS_DEC_SetRenderFramesize( hIvasDec, arg.renderFramesize ) ) != IVAS_ERR_OK )

            {

                return error;

                fprintf( stderr, "\nIVAS_DEC_PrintConfig failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

                goto cleanup;

            }



            if ( arg.renderFramesize != asked_frame_size )

apps/encoder.c

+1 −1
Original line number Diff line number Diff line 
/******************************************************************************************************



   (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,

   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,

   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,

   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,

   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other