From 3a3a9d7ef2632ec7bd9719f4a7f035ed9530e4d8 Mon Sep 17 00:00:00 2001 From: enm10k Date: Thu, 7 Mar 2024 15:56:03 +0900 Subject: [PATCH 1/3] =?UTF-8?q?Lyra=20=E3=82=92=E5=89=8A=E9=99=A4=E3=81=99?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 4 --- CHANGES.md | 5 ++++ VERSION | 1 - base.py | 27 +------------------ .../macos_arm64/CMakeLists.txt | 15 ----------- messaging_recvonly_sample/macos_arm64/run.py | 3 +-- .../ubuntu-20.04_armv8_jetson/CMakeLists.txt | 15 ----------- .../ubuntu-20.04_armv8_jetson/run.py | 3 +-- .../ubuntu-20.04_x86_64/CMakeLists.txt | 15 ----------- .../ubuntu-20.04_x86_64/run.py | 2 -- .../ubuntu-22.04_x86_64/CMakeLists.txt | 15 ----------- .../ubuntu-22.04_x86_64/run.py | 3 +-- .../windows_x86_64/CMakeLists.txt | 15 ----------- .../windows_x86_64/run.py | 3 +-- sdl_sample/macos_arm64/CMakeLists.txt | 15 ----------- sdl_sample/macos_arm64/run.py | 3 +-- sdl_sample/src/sdl_sample.cpp | 14 +++------- .../ubuntu-20.04_armv8_jetson/CMakeLists.txt | 15 ----------- sdl_sample/ubuntu-20.04_armv8_jetson/run.py | 3 +-- sdl_sample/ubuntu-20.04_x86_64/CMakeLists.txt | 15 ----------- sdl_sample/ubuntu-20.04_x86_64/run.py | 3 +-- sdl_sample/ubuntu-22.04_x86_64/CMakeLists.txt | 15 ----------- sdl_sample/ubuntu-22.04_x86_64/run.py | 3 +-- sdl_sample/windows_x86_64/CMakeLists.txt | 15 ----------- sdl_sample/windows_x86_64/run.py | 3 +-- sumomo/macos_arm64/CMakeLists.txt | 15 ----------- sumomo/macos_arm64/run.py | 3 +-- .../ubuntu-20.04_armv8_jetson/CMakeLists.txt | 15 ----------- sumomo/ubuntu-20.04_armv8_jetson/run.py | 3 +-- sumomo/ubuntu-20.04_x86_64/CMakeLists.txt | 15 ----------- sumomo/ubuntu-20.04_x86_64/run.py | 3 +-- sumomo/ubuntu-22.04_x86_64/CMakeLists.txt | 15 ----------- sumomo/ubuntu-22.04_x86_64/run.py | 3 +-- sumomo/windows_x86_64/CMakeLists.txt | 15 ----------- sumomo/windows_x86_64/run.py | 3 +-- 35 files changed, 23 insertions(+), 297 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 685b563..8727e4b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,7 +29,6 @@ jobs: cp _build\${{ matrix.name }}\release\sdl_sample\Release\sdl_sample.exe ${{ matrix.name }} cp _build\${{ matrix.name }}\release\sumomo\Release\sumomo.exe ${{ matrix.name }} cp _build\${{ matrix.name }}\release\messaging_recvonly_sample\Release\messaging_recvonly_sample.exe ${{ matrix.name }} - cp -Recurse _install\${{ matrix.name }}\release\lyra\share\model_coeffs ${{ matrix.name }}\model_coeffs - name: Upload Artifact uses: actions/upload-artifact@v3 with: @@ -54,7 +53,6 @@ jobs: cp _build/${{ matrix.name }}/release/sdl_sample/sdl_sample ${{ matrix.name }} cp _build/${{ matrix.name }}/release/sumomo/sumomo ${{ matrix.name }} cp _build/${{ matrix.name }}/release/messaging_recvonly_sample/messaging_recvonly_sample ${{ matrix.name }} - cp -r _install/${{ matrix.name }}/release/lyra/share/model_coeffs ${{ matrix.name }}/model_coeffs - name: Upload Artifact uses: actions/upload-artifact@v3 with: @@ -92,7 +90,6 @@ jobs: cp _build/${{ matrix.name }}/release/sdl_sample/sdl_sample ${{ matrix.name }} cp _build/${{ matrix.name }}/release/sumomo/sumomo ${{ matrix.name }} cp _build/${{ matrix.name }}/release/messaging_recvonly_sample/messaging_recvonly_sample ${{ matrix.name }} - cp -r _install/${{ matrix.name }}/release/lyra/share/model_coeffs ${{ matrix.name }}/model_coeffs - name: Upload Artifact uses: actions/upload-artifact@v3 with: @@ -122,7 +119,6 @@ jobs: cp _build/${{ matrix.name }}/release/sdl_sample/sdl_sample ${{ matrix.name }} cp _build/${{ matrix.name }}/release/sumomo/sumomo ${{ matrix.name }} cp _build/${{ matrix.name }}/release/messaging_recvonly_sample/messaging_recvonly_sample ${{ matrix.name }} - cp -r _install/${{ matrix.name }}/release/lyra/share/model_coeffs ${{ matrix.name }}/model_coeffs - name: Upload Artifact uses: actions/upload-artifact@v3 with: diff --git a/CHANGES.md b/CHANGES.md index 12b44eb..249e8b4 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -9,6 +9,11 @@ - FIX - バグ修正 +## develop + +- [CHANGE] Lyra を削除する + - @enm10k + ## sora-cpp-sdk-2024.2.0 - [CHANGE] momo_sample を sumomo にリネームする diff --git a/VERSION b/VERSION index 43d7bd2..b0aa61a 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,6 @@ SORA_CPP_SDK_VERSION=2024.2.0 WEBRTC_BUILD_VERSION=m121.6167.3.0 BOOST_VERSION=1.84.0 -LYRA_VERSION=1.3.2 CMAKE_VERSION=3.28.1 SDL2_VERSION=2.30.0 CLI11_VERSION=v2.4.1 diff --git a/base.py b/base.py index 9f53699..43a42a8 100644 --- a/base.py +++ b/base.py @@ -399,7 +399,6 @@ def get_webrtc_info(webrtcbuild: bool, source_dir: str, build_dir: str, install_ class SoraInfo(NamedTuple): sora_install_dir: str boost_install_dir: str - lyra_install_dir: str def install_sora_and_deps(platform: str, source_dir:str, build_dir:str, install_dir: str): @@ -416,17 +415,6 @@ def install_sora_and_deps(platform: str, source_dir:str, build_dir:str, install_ } install_boost(**install_boost_args) - # Lyra - install_lyra_args = { - 'version': version['LYRA_VERSION'], - 'version_file': os.path.join(install_dir, 'lyra.version'), - 'source_dir': source_dir, - 'install_dir': install_dir, - 'sora_version': version['SORA_CPP_SDK_VERSION'], - 'platform': platform, - } - install_lyra(**install_lyra_args) - # Sora C++ SDK install_sora_args = { 'version': version['SORA_CPP_SDK_VERSION'], @@ -467,8 +455,7 @@ def get_sora_info(install_dir: str, sora_dir: Optional[str], platform: str, debu return SoraInfo( sora_install_dir = os.path.join(install_dir, 'sora'), - boost_install_dir = os.path.join(install_dir, 'boost'), - lyra_install_dir = os.path.join(install_dir, 'lyra'), + boost_install_dir = os.path.join(install_dir, 'boost') ) @@ -509,18 +496,6 @@ def install_boost(version, source_dir, install_dir, sora_version, platform: str) extract(archive, output_dir=install_dir, output_dirname='boost') -@versioned -def install_lyra(version, source_dir, install_dir, sora_version, platform: str): - win = platform.startswith("windows_") - filename = f'lyra-{version}_sora-cpp-sdk-{sora_version}_{platform}.{"zip" if win else "tar.gz"}' - rm_rf(os.path.join(source_dir, filename)) - archive = download( - f'https://github.com/shiguredo/sora-cpp-sdk/releases/download/{sora_version}/{filename}', - output_dir=source_dir) - rm_rf(os.path.join(install_dir, 'lyra')) - extract(archive, output_dir=install_dir, output_dirname='lyra') - - def cmake_path(path: str) -> str: return path.replace('\\', '/') diff --git a/messaging_recvonly_sample/macos_arm64/CMakeLists.txt b/messaging_recvonly_sample/macos_arm64/CMakeLists.txt index 96e80a3..2491645 100644 --- a/messaging_recvonly_sample/macos_arm64/CMakeLists.txt +++ b/messaging_recvonly_sample/macos_arm64/CMakeLists.txt @@ -20,7 +20,6 @@ list(APPEND CMAKE_MODULE_PATH ${SORA_DIR}/share/cmake) set(Boost_USE_STATIC_LIBS ON) find_package(Boost REQUIRED COMPONENTS json filesystem) -find_package(Lyra REQUIRED) find_package(WebRTC REQUIRED) find_package(Sora REQUIRED) find_package(Threads REQUIRED) @@ -34,17 +33,3 @@ target_sources(messaging_recvonly_sample PRIVATE ../src/messaging_recvonly_sampl target_include_directories(messaging_recvonly_sample PRIVATE ${CLI11_DIR}/include) target_link_libraries(messaging_recvonly_sample PRIVATE Sora::sora) target_compile_definitions(messaging_recvonly_sample PRIVATE CLI11_HAS_FILESYSTEM=0) - -# Lyra ファイルのコピー -add_custom_command( - TARGET messaging_recvonly_sample POST_BUILD - COMMAND - ${CMAKE_COMMAND} -E copy_directory - ${LYRA_DIR}/share/model_coeffs/ - ${CMAKE_CURRENT_BINARY_DIR}/model_coeffs/ - DEPENDS - ${LYRA_DIR}/share/model_coeffs/lyra_config.binarypb - ${LYRA_DIR}/share/model_coeffs/lyragan.tflite - ${LYRA_DIR}/share/model_coeffs/quantizer.tflite - ${LYRA_DIR}/share/model_coeffs/soundstream_encoder.tflite -) diff --git a/messaging_recvonly_sample/macos_arm64/run.py b/messaging_recvonly_sample/macos_arm64/run.py index 1934c37..5213667 100644 --- a/messaging_recvonly_sample/macos_arm64/run.py +++ b/messaging_recvonly_sample/macos_arm64/run.py @@ -41,7 +41,7 @@ def install_deps(source_dir, build_dir, install_dir, debug, sora_dir: Optional[s } install_webrtc(**install_webrtc_args) - # Sora C++ SDK, Boost, Lyra + # Sora C++ SDK, Boost if sora_dir is None: install_sora_and_deps('macos_arm64', source_dir, build_dir, install_dir) else: @@ -97,7 +97,6 @@ def main(): cmake_args = [] cmake_args.append(f'-DCMAKE_BUILD_TYPE={configuration}') cmake_args.append(f"-DBOOST_ROOT={cmake_path(sora_info.boost_install_dir)}") - cmake_args.append(f"-DLYRA_DIR={cmake_path(sora_info.lyra_install_dir)}") cmake_args.append(f"-DWEBRTC_INCLUDE_DIR={cmake_path(webrtc_info.webrtc_include_dir)}") cmake_args.append(f"-DWEBRTC_LIBRARY_DIR={cmake_path(webrtc_info.webrtc_library_dir)}") cmake_args.append(f"-DSORA_DIR={cmake_path(sora_info.sora_install_dir)}") diff --git a/messaging_recvonly_sample/ubuntu-20.04_armv8_jetson/CMakeLists.txt b/messaging_recvonly_sample/ubuntu-20.04_armv8_jetson/CMakeLists.txt index 1e9c31d..af27858 100644 --- a/messaging_recvonly_sample/ubuntu-20.04_armv8_jetson/CMakeLists.txt +++ b/messaging_recvonly_sample/ubuntu-20.04_armv8_jetson/CMakeLists.txt @@ -20,7 +20,6 @@ list(APPEND CMAKE_MODULE_PATH ${SORA_DIR}/share/cmake) set(Boost_USE_STATIC_LIBS ON) find_package(Boost REQUIRED COMPONENTS json filesystem) -find_package(Lyra REQUIRED) find_package(WebRTC REQUIRED) find_package(Sora REQUIRED) find_package(Threads REQUIRED) @@ -39,17 +38,3 @@ target_include_directories(messaging_recvonly_sample PRIVATE ${CLI11_DIR}/includ target_link_libraries(messaging_recvonly_sample PRIVATE Sora::sora) target_link_directories(messaging_recvonly_sample PRIVATE ${CMAKE_SYSROOT}/usr/lib/aarch64-linux-gnu/tegra) target_compile_definitions(messaging_recvonly_sample PRIVATE CLI11_HAS_FILESYSTEM=0) - -# Lyra ファイルのコピー -add_custom_command( - TARGET messaging_recvonly_sample POST_BUILD - COMMAND - ${CMAKE_COMMAND} -E copy_directory - ${LYRA_DIR}/share/model_coeffs/ - ${CMAKE_CURRENT_BINARY_DIR}/model_coeffs/ - DEPENDS - ${LYRA_DIR}/share/model_coeffs/lyra_config.binarypb - ${LYRA_DIR}/share/model_coeffs/lyragan.tflite - ${LYRA_DIR}/share/model_coeffs/quantizer.tflite - ${LYRA_DIR}/share/model_coeffs/soundstream_encoder.tflite -) diff --git a/messaging_recvonly_sample/ubuntu-20.04_armv8_jetson/run.py b/messaging_recvonly_sample/ubuntu-20.04_armv8_jetson/run.py index 1513b99..f56c949 100644 --- a/messaging_recvonly_sample/ubuntu-20.04_armv8_jetson/run.py +++ b/messaging_recvonly_sample/ubuntu-20.04_armv8_jetson/run.py @@ -81,7 +81,7 @@ def install_deps(source_dir, build_dir, install_dir, debug, sora_dir: Optional[s } install_llvm(**install_llvm_args) - # Sora C++ SDK, Boost, Lyra + # Sora C++ SDK, Boost if sora_dir is None: install_sora_and_deps('ubuntu-20.04_armv8_jetson', source_dir, build_dir, install_dir) else: @@ -137,7 +137,6 @@ def main(): cmake_args = [] cmake_args.append(f'-DCMAKE_BUILD_TYPE={configuration}') cmake_args.append(f"-DBOOST_ROOT={cmake_path(sora_info.boost_install_dir)}") - cmake_args.append(f"-DLYRA_DIR={cmake_path(sora_info.lyra_install_dir)}") cmake_args.append(f"-DWEBRTC_INCLUDE_DIR={cmake_path(webrtc_info.webrtc_include_dir)}") cmake_args.append(f"-DWEBRTC_LIBRARY_DIR={cmake_path(webrtc_info.webrtc_library_dir)}") cmake_args.append(f"-DSORA_DIR={cmake_path(sora_info.sora_install_dir)}") diff --git a/messaging_recvonly_sample/ubuntu-20.04_x86_64/CMakeLists.txt b/messaging_recvonly_sample/ubuntu-20.04_x86_64/CMakeLists.txt index 16573af..87e017e 100644 --- a/messaging_recvonly_sample/ubuntu-20.04_x86_64/CMakeLists.txt +++ b/messaging_recvonly_sample/ubuntu-20.04_x86_64/CMakeLists.txt @@ -20,7 +20,6 @@ list(APPEND CMAKE_MODULE_PATH ${SORA_DIR}/share/cmake) set(Boost_USE_STATIC_LIBS ON) find_package(Boost REQUIRED COMPONENTS json filesystem) -find_package(Lyra REQUIRED) find_package(WebRTC REQUIRED) find_package(Sora REQUIRED) find_package(Threads REQUIRED) @@ -40,17 +39,3 @@ target_compile_options(messaging_recvonly_sample target_include_directories(messaging_recvonly_sample PRIVATE ${CLI11_DIR}/include) target_link_libraries(messaging_recvonly_sample PRIVATE Sora::sora) target_compile_definitions(messaging_recvonly_sample PRIVATE CLI11_HAS_FILESYSTEM=0) - -# Lyra ファイルのコピー -add_custom_command( - TARGET messaging_recvonly_sample POST_BUILD - COMMAND - ${CMAKE_COMMAND} -E copy_directory - ${LYRA_DIR}/share/model_coeffs/ - ${CMAKE_CURRENT_BINARY_DIR}/model_coeffs/ - DEPENDS - ${LYRA_DIR}/share/model_coeffs/lyra_config.binarypb - ${LYRA_DIR}/share/model_coeffs/lyragan.tflite - ${LYRA_DIR}/share/model_coeffs/quantizer.tflite - ${LYRA_DIR}/share/model_coeffs/soundstream_encoder.tflite -) diff --git a/messaging_recvonly_sample/ubuntu-20.04_x86_64/run.py b/messaging_recvonly_sample/ubuntu-20.04_x86_64/run.py index d08d9bc..ab10d3d 100644 --- a/messaging_recvonly_sample/ubuntu-20.04_x86_64/run.py +++ b/messaging_recvonly_sample/ubuntu-20.04_x86_64/run.py @@ -22,7 +22,6 @@ build_sora, install_sora_and_deps, install_cmake, - install_sora, install_cli11, add_sora_arguments, ) @@ -123,7 +122,6 @@ def main(): cmake_args = [] cmake_args.append(f'-DCMAKE_BUILD_TYPE={configuration}') cmake_args.append(f"-DBOOST_ROOT={cmake_path(sora_info.boost_install_dir)}") - cmake_args.append(f"-DLYRA_DIR={cmake_path(sora_info.lyra_install_dir)}") cmake_args.append(f"-DWEBRTC_INCLUDE_DIR={cmake_path(webrtc_info.webrtc_include_dir)}") cmake_args.append(f"-DWEBRTC_LIBRARY_DIR={cmake_path(webrtc_info.webrtc_library_dir)}") cmake_args.append(f"-DSORA_DIR={cmake_path(sora_info.sora_install_dir)}") diff --git a/messaging_recvonly_sample/ubuntu-22.04_x86_64/CMakeLists.txt b/messaging_recvonly_sample/ubuntu-22.04_x86_64/CMakeLists.txt index 4fdff66..48fbba9 100644 --- a/messaging_recvonly_sample/ubuntu-22.04_x86_64/CMakeLists.txt +++ b/messaging_recvonly_sample/ubuntu-22.04_x86_64/CMakeLists.txt @@ -20,7 +20,6 @@ list(APPEND CMAKE_MODULE_PATH ${SORA_DIR}/share/cmake) set(Boost_USE_STATIC_LIBS ON) find_package(Boost REQUIRED COMPONENTS json filesystem) -find_package(Lyra REQUIRED) find_package(WebRTC REQUIRED) find_package(Sora REQUIRED) find_package(Threads REQUIRED) @@ -40,17 +39,3 @@ target_compile_options(messaging_recvonly_sample target_include_directories(messaging_recvonly_sample PRIVATE ${CLI11_DIR}/include) target_link_libraries(messaging_recvonly_sample PRIVATE Sora::sora) target_compile_definitions(messaging_recvonly_sample PRIVATE CLI11_HAS_FILESYSTEM=0) - -# Lyra ファイルのコピー -add_custom_command( - TARGET messaging_recvonly_sample POST_BUILD - COMMAND - ${CMAKE_COMMAND} -E copy_directory - ${LYRA_DIR}/share/model_coeffs/ - ${CMAKE_CURRENT_BINARY_DIR}/model_coeffs/ - DEPENDS - ${LYRA_DIR}/share/model_coeffs/lyra_config.binarypb - ${LYRA_DIR}/share/model_coeffs/lyragan.tflite - ${LYRA_DIR}/share/model_coeffs/quantizer.tflite - ${LYRA_DIR}/share/model_coeffs/soundstream_encoder.tflite -) diff --git a/messaging_recvonly_sample/ubuntu-22.04_x86_64/run.py b/messaging_recvonly_sample/ubuntu-22.04_x86_64/run.py index 27f4924..9bc2f8a 100644 --- a/messaging_recvonly_sample/ubuntu-22.04_x86_64/run.py +++ b/messaging_recvonly_sample/ubuntu-22.04_x86_64/run.py @@ -67,7 +67,7 @@ def install_deps(source_dir, build_dir, install_dir, debug, sora_dir: Optional[s } install_llvm(**install_llvm_args) - # Sora C++ SDK, Boost, Lyra + # Sora C++ SDK, Boost if sora_dir is None: install_sora_and_deps('ubuntu-22.04_x86_64', source_dir, build_dir, install_dir) else: @@ -123,7 +123,6 @@ def main(): cmake_args = [] cmake_args.append(f'-DCMAKE_BUILD_TYPE={configuration}') cmake_args.append(f"-DBOOST_ROOT={cmake_path(sora_info.boost_install_dir)}") - cmake_args.append(f"-DLYRA_DIR={cmake_path(sora_info.lyra_install_dir)}") cmake_args.append(f"-DWEBRTC_INCLUDE_DIR={cmake_path(webrtc_info.webrtc_include_dir)}") cmake_args.append(f"-DWEBRTC_LIBRARY_DIR={cmake_path(webrtc_info.webrtc_library_dir)}") cmake_args.append(f"-DSORA_DIR={cmake_path(sora_info.sora_install_dir)}") diff --git a/messaging_recvonly_sample/windows_x86_64/CMakeLists.txt b/messaging_recvonly_sample/windows_x86_64/CMakeLists.txt index b6155fe..5c5d258 100644 --- a/messaging_recvonly_sample/windows_x86_64/CMakeLists.txt +++ b/messaging_recvonly_sample/windows_x86_64/CMakeLists.txt @@ -21,7 +21,6 @@ set(Boost_USE_STATIC_LIBS ON) set(Boost_USE_STATIC_RUNTIME ON) find_package(Boost REQUIRED COMPONENTS json filesystem) -find_package(Lyra REQUIRED) find_package(WebRTC REQUIRED) find_package(Sora REQUIRED) @@ -41,20 +40,6 @@ set_target_properties(messaging_recvonly_sample MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>" ) -# Lyra ファイルのコピー -add_custom_command( - TARGET messaging_recvonly_sample POST_BUILD - COMMAND - ${CMAKE_COMMAND} -E copy_directory - ${LYRA_DIR}/share/model_coeffs/ - ${CMAKE_CURRENT_BINARY_DIR}/$/model_coeffs/ - DEPENDS - ${LYRA_DIR}/share/model_coeffs/lyra_config.binarypb - ${LYRA_DIR}/share/model_coeffs/lyragan.tflite - ${LYRA_DIR}/share/model_coeffs/quantizer.tflite - ${LYRA_DIR}/share/model_coeffs/soundstream_encoder.tflite -) - target_compile_definitions(messaging_recvonly_sample PRIVATE _CONSOLE diff --git a/messaging_recvonly_sample/windows_x86_64/run.py b/messaging_recvonly_sample/windows_x86_64/run.py index c6010dd..39a06a9 100644 --- a/messaging_recvonly_sample/windows_x86_64/run.py +++ b/messaging_recvonly_sample/windows_x86_64/run.py @@ -41,7 +41,7 @@ def install_deps(source_dir, build_dir, install_dir, debug, sora_dir: Optional[s install_webrtc(**install_webrtc_args) - # Sora C++ SDK, Boost, Lyra + # Sora C++ SDK, Boost if sora_dir is None: install_sora_and_deps('windows_x86_64', source_dir, build_dir, install_dir) else: @@ -98,7 +98,6 @@ def main(): cmake_args = [] cmake_args.append(f'-DCMAKE_BUILD_TYPE={configuration}') cmake_args.append(f"-DBOOST_ROOT={cmake_path(sora_info.boost_install_dir)}") - cmake_args.append(f"-DLYRA_DIR={cmake_path(sora_info.lyra_install_dir)}") cmake_args.append(f"-DWEBRTC_INCLUDE_DIR={cmake_path(webrtc_info.webrtc_include_dir)}") cmake_args.append(f"-DWEBRTC_LIBRARY_DIR={cmake_path(webrtc_info.webrtc_library_dir)}") cmake_args.append(f"-DSORA_DIR={cmake_path(sora_info.sora_install_dir)}") diff --git a/sdl_sample/macos_arm64/CMakeLists.txt b/sdl_sample/macos_arm64/CMakeLists.txt index 52cb7a9..7a0fb7f 100644 --- a/sdl_sample/macos_arm64/CMakeLists.txt +++ b/sdl_sample/macos_arm64/CMakeLists.txt @@ -21,7 +21,6 @@ list(APPEND CMAKE_MODULE_PATH ${SORA_DIR}/share/cmake) set(Boost_USE_STATIC_LIBS ON) find_package(Boost REQUIRED COMPONENTS json filesystem) -find_package(Lyra REQUIRED) find_package(WebRTC REQUIRED) find_package(Sora REQUIRED) find_package(SDL2 REQUIRED) @@ -36,17 +35,3 @@ target_sources(sdl_sample PRIVATE ../src/sdl_sample.cpp ../src/sdl_renderer.cpp) target_include_directories(sdl_sample PRIVATE ${CLI11_DIR}/include) target_link_libraries(sdl_sample PRIVATE Sora::sora SDL2::SDL2 SDL2::SDL2main) target_compile_definitions(sdl_sample PRIVATE CLI11_HAS_FILESYSTEM=0) - -# Lyra ファイルのコピー -add_custom_command( - TARGET sdl_sample POST_BUILD - COMMAND - ${CMAKE_COMMAND} -E copy_directory - ${LYRA_DIR}/share/model_coeffs/ - ${CMAKE_CURRENT_BINARY_DIR}/model_coeffs/ - DEPENDS - ${LYRA_DIR}/share/model_coeffs/lyra_config.binarypb - ${LYRA_DIR}/share/model_coeffs/lyragan.tflite - ${LYRA_DIR}/share/model_coeffs/quantizer.tflite - ${LYRA_DIR}/share/model_coeffs/soundstream_encoder.tflite -) diff --git a/sdl_sample/macos_arm64/run.py b/sdl_sample/macos_arm64/run.py index 8ca6f52..eb62faa 100644 --- a/sdl_sample/macos_arm64/run.py +++ b/sdl_sample/macos_arm64/run.py @@ -44,7 +44,7 @@ def install_deps(source_dir, build_dir, install_dir, debug, sora_dir: Optional[s sysroot = cmdcap(['xcrun', '--sdk', 'macosx', '--show-sdk-path']) - # Sora C++ SDK, Boost, Lyra + # Sora C++ SDK, Boost if sora_dir is None: install_sora_and_deps('macos_arm64', source_dir, build_dir, install_dir) else: @@ -122,7 +122,6 @@ def main(): cmake_args = [] cmake_args.append(f'-DCMAKE_BUILD_TYPE={configuration}') cmake_args.append(f"-DBOOST_ROOT={cmake_path(sora_info.boost_install_dir)}") - cmake_args.append(f"-DLYRA_DIR={cmake_path(sora_info.lyra_install_dir)}") cmake_args.append(f"-DWEBRTC_INCLUDE_DIR={cmake_path(webrtc_info.webrtc_include_dir)}") cmake_args.append(f"-DWEBRTC_LIBRARY_DIR={cmake_path(webrtc_info.webrtc_library_dir)}") cmake_args.append(f"-DSORA_DIR={cmake_path(sora_info.sora_install_dir)}") diff --git a/sdl_sample/src/sdl_sample.cpp b/sdl_sample/src/sdl_sample.cpp index ca6b9e6..05a2ef2 100644 --- a/sdl_sample/src/sdl_sample.cpp +++ b/sdl_sample/src/sdl_sample.cpp @@ -22,8 +22,6 @@ struct SDLSampleConfig { std::string role; std::string video_codec_type; std::string audio_codec_type; - int audio_codec_lyra_bitrate = 0; - boost::optional audio_codec_lyra_usedtx; boost::optional multistream; int width = 640; int height = 480; @@ -79,8 +77,6 @@ class SDLSample : public std::enable_shared_from_this, config.role = config_.role; config.video_codec_type = config_.video_codec_type; config.audio_codec_type = config_.audio_codec_type; - config.audio_codec_lyra_bitrate = config_.audio_codec_lyra_bitrate; - config.audio_codec_lyra_usedtx = config_.audio_codec_lyra_usedtx; config.metadata = config_.metadata; conn_ = sora::SoraSignaling::Create(config); @@ -221,12 +217,7 @@ int main(int argc, char* argv[]) { ->check(CLI::IsMember({"", "VP8", "VP9", "AV1", "H264", "H265"})); app.add_option("--audio-codec-type", config.audio_codec_type, "Audio codec for send") - ->check(CLI::IsMember({"", "OPUS", "LYRA"})); - app.add_option("--audio-codec-lyra-bitrate", config.audio_codec_lyra_bitrate, - "Bitrate used in the audio codec Lyra"); - add_optional_bool(app, "--audio-codec-lyra-usedtx", - config.audio_codec_lyra_usedtx, - "Use DTX used in the audio codec Lyra (default: none)"); + ->check(CLI::IsMember({"", "OPUS"})); std::string metadata; app.add_option("--metadata", metadata, "Signaling metadata used in connect message") @@ -257,7 +248,8 @@ int main(int argc, char* argv[]) { rtc::LogMessage::LogThreads(); } - auto context = sora::SoraClientContext::Create(sora::SoraClientContextConfig()); + auto context = + sora::SoraClientContext::Create(sora::SoraClientContextConfig()); auto sdlsample = std::make_shared(context, config); sdlsample->Run(); diff --git a/sdl_sample/ubuntu-20.04_armv8_jetson/CMakeLists.txt b/sdl_sample/ubuntu-20.04_armv8_jetson/CMakeLists.txt index 7471121..2863ed1 100644 --- a/sdl_sample/ubuntu-20.04_armv8_jetson/CMakeLists.txt +++ b/sdl_sample/ubuntu-20.04_armv8_jetson/CMakeLists.txt @@ -21,7 +21,6 @@ list(APPEND CMAKE_MODULE_PATH ${SORA_DIR}/share/cmake) set(Boost_USE_STATIC_LIBS ON) find_package(Boost REQUIRED COMPONENTS json filesystem) -find_package(Lyra REQUIRED) find_package(WebRTC REQUIRED) find_package(Sora REQUIRED) find_package(SDL2 REQUIRED) @@ -41,17 +40,3 @@ target_include_directories(sdl_sample PRIVATE ${CLI11_DIR}/include) target_link_libraries(sdl_sample PRIVATE Sora::sora SDL2::SDL2 SDL2::SDL2main) target_link_directories(sdl_sample PRIVATE ${CMAKE_SYSROOT}/usr/lib/aarch64-linux-gnu/tegra) target_compile_definitions(sdl_sample PRIVATE CLI11_HAS_FILESYSTEM=0) - -# Lyra ファイルのコピー -add_custom_command( - TARGET sdl_sample POST_BUILD - COMMAND - ${CMAKE_COMMAND} -E copy_directory - ${LYRA_DIR}/share/model_coeffs/ - ${CMAKE_CURRENT_BINARY_DIR}/model_coeffs/ - DEPENDS - ${LYRA_DIR}/share/model_coeffs/lyra_config.binarypb - ${LYRA_DIR}/share/model_coeffs/lyragan.tflite - ${LYRA_DIR}/share/model_coeffs/quantizer.tflite - ${LYRA_DIR}/share/model_coeffs/soundstream_encoder.tflite -) diff --git a/sdl_sample/ubuntu-20.04_armv8_jetson/run.py b/sdl_sample/ubuntu-20.04_armv8_jetson/run.py index 9f935bf..af604e9 100644 --- a/sdl_sample/ubuntu-20.04_armv8_jetson/run.py +++ b/sdl_sample/ubuntu-20.04_armv8_jetson/run.py @@ -83,7 +83,7 @@ def install_deps(source_dir, build_dir, install_dir, debug, sora_dir: Optional[s } install_llvm(**install_llvm_args) - # Sora C++ SDK, Boost, Lyra + # Sora C++ SDK, Boost if sora_dir is None: install_sora_and_deps('ubuntu-20.04_armv8_jetson', source_dir, build_dir, install_dir) else: @@ -165,7 +165,6 @@ def main(): cmake_args = [] cmake_args.append(f'-DCMAKE_BUILD_TYPE={configuration}') cmake_args.append(f"-DBOOST_ROOT={cmake_path(sora_info.boost_install_dir)}") - cmake_args.append(f"-DLYRA_DIR={cmake_path(sora_info.lyra_install_dir)}") cmake_args.append(f"-DWEBRTC_INCLUDE_DIR={cmake_path(webrtc_info.webrtc_include_dir)}") cmake_args.append(f"-DWEBRTC_LIBRARY_DIR={cmake_path(webrtc_info.webrtc_library_dir)}") cmake_args.append(f"-DSORA_DIR={cmake_path(sora_info.sora_install_dir)}") diff --git a/sdl_sample/ubuntu-20.04_x86_64/CMakeLists.txt b/sdl_sample/ubuntu-20.04_x86_64/CMakeLists.txt index 1ded24e..7d57c4a 100644 --- a/sdl_sample/ubuntu-20.04_x86_64/CMakeLists.txt +++ b/sdl_sample/ubuntu-20.04_x86_64/CMakeLists.txt @@ -21,7 +21,6 @@ list(APPEND CMAKE_MODULE_PATH ${SORA_DIR}/share/cmake) set(Boost_USE_STATIC_LIBS ON) find_package(Boost REQUIRED COMPONENTS json filesystem) -find_package(Lyra REQUIRED) find_package(WebRTC REQUIRED) find_package(Sora REQUIRED) find_package(SDL2 REQUIRED) @@ -42,17 +41,3 @@ target_compile_options(sdl_sample target_include_directories(sdl_sample PRIVATE ${CLI11_DIR}/include) target_link_libraries(sdl_sample PRIVATE Sora::sora SDL2::SDL2 SDL2::SDL2main) target_compile_definitions(sdl_sample PRIVATE CLI11_HAS_FILESYSTEM=0) - -# Lyra ファイルのコピー -add_custom_command( - TARGET sdl_sample POST_BUILD - COMMAND - ${CMAKE_COMMAND} -E copy_directory - ${LYRA_DIR}/share/model_coeffs/ - ${CMAKE_CURRENT_BINARY_DIR}/model_coeffs/ - DEPENDS - ${LYRA_DIR}/share/model_coeffs/lyra_config.binarypb - ${LYRA_DIR}/share/model_coeffs/lyragan.tflite - ${LYRA_DIR}/share/model_coeffs/quantizer.tflite - ${LYRA_DIR}/share/model_coeffs/soundstream_encoder.tflite -) diff --git a/sdl_sample/ubuntu-20.04_x86_64/run.py b/sdl_sample/ubuntu-20.04_x86_64/run.py index 01dca33..2ebe980 100644 --- a/sdl_sample/ubuntu-20.04_x86_64/run.py +++ b/sdl_sample/ubuntu-20.04_x86_64/run.py @@ -68,7 +68,7 @@ def install_deps(source_dir, build_dir, install_dir, debug, sora_dir: Optional[s } install_llvm(**install_llvm_args) - # Sora C++ SDK, Boost, Lyra + # Sora C++ SDK, Boost if sora_dir is None: install_sora_and_deps('ubuntu-20.04_x86_64', source_dir, build_dir, install_dir) else: @@ -140,7 +140,6 @@ def main(): cmake_args = [] cmake_args.append(f'-DCMAKE_BUILD_TYPE={configuration}') cmake_args.append(f"-DBOOST_ROOT={cmake_path(sora_info.boost_install_dir)}") - cmake_args.append(f"-DLYRA_DIR={cmake_path(sora_info.lyra_install_dir)}") cmake_args.append(f"-DWEBRTC_INCLUDE_DIR={cmake_path(webrtc_info.webrtc_include_dir)}") cmake_args.append(f"-DWEBRTC_LIBRARY_DIR={cmake_path(webrtc_info.webrtc_library_dir)}") cmake_args.append(f"-DSORA_DIR={cmake_path(sora_info.sora_install_dir)}") diff --git a/sdl_sample/ubuntu-22.04_x86_64/CMakeLists.txt b/sdl_sample/ubuntu-22.04_x86_64/CMakeLists.txt index 1ded24e..7d57c4a 100644 --- a/sdl_sample/ubuntu-22.04_x86_64/CMakeLists.txt +++ b/sdl_sample/ubuntu-22.04_x86_64/CMakeLists.txt @@ -21,7 +21,6 @@ list(APPEND CMAKE_MODULE_PATH ${SORA_DIR}/share/cmake) set(Boost_USE_STATIC_LIBS ON) find_package(Boost REQUIRED COMPONENTS json filesystem) -find_package(Lyra REQUIRED) find_package(WebRTC REQUIRED) find_package(Sora REQUIRED) find_package(SDL2 REQUIRED) @@ -42,17 +41,3 @@ target_compile_options(sdl_sample target_include_directories(sdl_sample PRIVATE ${CLI11_DIR}/include) target_link_libraries(sdl_sample PRIVATE Sora::sora SDL2::SDL2 SDL2::SDL2main) target_compile_definitions(sdl_sample PRIVATE CLI11_HAS_FILESYSTEM=0) - -# Lyra ファイルのコピー -add_custom_command( - TARGET sdl_sample POST_BUILD - COMMAND - ${CMAKE_COMMAND} -E copy_directory - ${LYRA_DIR}/share/model_coeffs/ - ${CMAKE_CURRENT_BINARY_DIR}/model_coeffs/ - DEPENDS - ${LYRA_DIR}/share/model_coeffs/lyra_config.binarypb - ${LYRA_DIR}/share/model_coeffs/lyragan.tflite - ${LYRA_DIR}/share/model_coeffs/quantizer.tflite - ${LYRA_DIR}/share/model_coeffs/soundstream_encoder.tflite -) diff --git a/sdl_sample/ubuntu-22.04_x86_64/run.py b/sdl_sample/ubuntu-22.04_x86_64/run.py index 44a161b..dedfc9c 100644 --- a/sdl_sample/ubuntu-22.04_x86_64/run.py +++ b/sdl_sample/ubuntu-22.04_x86_64/run.py @@ -68,7 +68,7 @@ def install_deps(source_dir, build_dir, install_dir, debug, sora_dir: Optional[s } install_llvm(**install_llvm_args) - # Sora C++ SDK, Boost, Lyra + # Sora C++ SDK, Boost if sora_dir is None: install_sora_and_deps('ubuntu-22.04_x86_64', source_dir, build_dir, install_dir) else: @@ -140,7 +140,6 @@ def main(): cmake_args = [] cmake_args.append(f'-DCMAKE_BUILD_TYPE={configuration}') cmake_args.append(f"-DBOOST_ROOT={cmake_path(sora_info.boost_install_dir)}") - cmake_args.append(f"-DLYRA_DIR={cmake_path(sora_info.lyra_install_dir)}") cmake_args.append(f"-DWEBRTC_INCLUDE_DIR={cmake_path(webrtc_info.webrtc_include_dir)}") cmake_args.append(f"-DWEBRTC_LIBRARY_DIR={cmake_path(webrtc_info.webrtc_library_dir)}") cmake_args.append(f"-DSORA_DIR={cmake_path(sora_info.sora_install_dir)}") diff --git a/sdl_sample/windows_x86_64/CMakeLists.txt b/sdl_sample/windows_x86_64/CMakeLists.txt index 8df6af6..a064bff 100644 --- a/sdl_sample/windows_x86_64/CMakeLists.txt +++ b/sdl_sample/windows_x86_64/CMakeLists.txt @@ -22,7 +22,6 @@ set(Boost_USE_STATIC_LIBS ON) set(Boost_USE_STATIC_RUNTIME ON) find_package(Boost REQUIRED COMPONENTS json filesystem) -find_package(Lyra REQUIRED) find_package(WebRTC REQUIRED) find_package(Sora REQUIRED) find_package(SDL2 REQUIRED) @@ -43,20 +42,6 @@ set_target_properties(sdl_sample MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>" ) -# Lyra ファイルのコピー -add_custom_command( - TARGET sdl_sample POST_BUILD - COMMAND - ${CMAKE_COMMAND} -E copy_directory - ${LYRA_DIR}/share/model_coeffs/ - ${CMAKE_CURRENT_BINARY_DIR}/$/model_coeffs/ - DEPENDS - ${LYRA_DIR}/share/model_coeffs/lyra_config.binarypb - ${LYRA_DIR}/share/model_coeffs/lyragan.tflite - ${LYRA_DIR}/share/model_coeffs/quantizer.tflite - ${LYRA_DIR}/share/model_coeffs/soundstream_encoder.tflite -) - target_compile_definitions(sdl_sample PRIVATE _CONSOLE diff --git a/sdl_sample/windows_x86_64/run.py b/sdl_sample/windows_x86_64/run.py index 32c1dbb..6cac47f 100644 --- a/sdl_sample/windows_x86_64/run.py +++ b/sdl_sample/windows_x86_64/run.py @@ -42,7 +42,7 @@ def install_deps(source_dir, build_dir, install_dir, debug, sora_dir: Optional[s install_webrtc(**install_webrtc_args) - # Sora C++ SDK, Boost, Lyra + # Sora C++ SDK, Boost if sora_dir is None: install_sora_and_deps('windows_x86_64', source_dir, build_dir, install_dir) else: @@ -112,7 +112,6 @@ def main(): cmake_args = [] cmake_args.append(f'-DCMAKE_BUILD_TYPE={configuration}') cmake_args.append(f"-DBOOST_ROOT={cmake_path(sora_info.boost_install_dir)}") - cmake_args.append(f"-DLYRA_DIR={cmake_path(sora_info.lyra_install_dir)}") cmake_args.append(f"-DWEBRTC_INCLUDE_DIR={cmake_path(webrtc_info.webrtc_include_dir)}") cmake_args.append(f"-DWEBRTC_LIBRARY_DIR={cmake_path(webrtc_info.webrtc_library_dir)}") cmake_args.append(f"-DSORA_DIR={cmake_path(sora_info.sora_install_dir)}") diff --git a/sumomo/macos_arm64/CMakeLists.txt b/sumomo/macos_arm64/CMakeLists.txt index 279eb5f..5dc8ca7 100644 --- a/sumomo/macos_arm64/CMakeLists.txt +++ b/sumomo/macos_arm64/CMakeLists.txt @@ -21,7 +21,6 @@ list(APPEND CMAKE_MODULE_PATH ${SORA_DIR}/share/cmake) set(Boost_USE_STATIC_LIBS ON) find_package(Boost REQUIRED COMPONENTS json filesystem) -find_package(Lyra REQUIRED) find_package(WebRTC REQUIRED) find_package(Sora REQUIRED) find_package(SDL2 REQUIRED) @@ -36,17 +35,3 @@ target_sources(sumomo PRIVATE ../src/sumomo.cpp ../src/sdl_renderer.cpp) target_include_directories(sumomo PRIVATE ${CLI11_DIR}/include) target_link_libraries(sumomo PRIVATE Sora::sora SDL2::SDL2 SDL2::SDL2main) target_compile_definitions(sumomo PRIVATE CLI11_HAS_FILESYSTEM=0) - -# Lyra ファイルのコピー -add_custom_command( - TARGET sumomo POST_BUILD - COMMAND - ${CMAKE_COMMAND} -E copy_directory - ${LYRA_DIR}/share/model_coeffs/ - ${CMAKE_CURRENT_BINARY_DIR}/model_coeffs/ - DEPENDS - ${LYRA_DIR}/share/model_coeffs/lyra_config.binarypb - ${LYRA_DIR}/share/model_coeffs/lyragan.tflite - ${LYRA_DIR}/share/model_coeffs/quantizer.tflite - ${LYRA_DIR}/share/model_coeffs/soundstream_encoder.tflite -) diff --git a/sumomo/macos_arm64/run.py b/sumomo/macos_arm64/run.py index f0ee20c..d84184d 100644 --- a/sumomo/macos_arm64/run.py +++ b/sumomo/macos_arm64/run.py @@ -44,7 +44,7 @@ def install_deps(source_dir, build_dir, install_dir, debug, sora_dir: Optional[s sysroot = cmdcap(['xcrun', '--sdk', 'macosx', '--show-sdk-path']) - # Sora C++ SDK, Boost, Lyra + # Sora C++ SDK, Boost if sora_dir is None: install_sora_and_deps('macos_arm64', source_dir, build_dir, install_dir) else: @@ -121,7 +121,6 @@ def main(): cmake_args = [] cmake_args.append(f'-DCMAKE_BUILD_TYPE={configuration}') cmake_args.append(f"-DBOOST_ROOT={cmake_path(sora_info.boost_install_dir)}") - cmake_args.append(f"-DLYRA_DIR={cmake_path(sora_info.lyra_install_dir)}") cmake_args.append(f"-DWEBRTC_INCLUDE_DIR={cmake_path(webrtc_info.webrtc_include_dir)}") cmake_args.append(f"-DWEBRTC_LIBRARY_DIR={cmake_path(webrtc_info.webrtc_library_dir)}") cmake_args.append(f"-DSORA_DIR={cmake_path(sora_info.sora_install_dir)}") diff --git a/sumomo/ubuntu-20.04_armv8_jetson/CMakeLists.txt b/sumomo/ubuntu-20.04_armv8_jetson/CMakeLists.txt index 99e9134..88f3942 100644 --- a/sumomo/ubuntu-20.04_armv8_jetson/CMakeLists.txt +++ b/sumomo/ubuntu-20.04_armv8_jetson/CMakeLists.txt @@ -21,7 +21,6 @@ list(APPEND CMAKE_MODULE_PATH ${SORA_DIR}/share/cmake) set(Boost_USE_STATIC_LIBS ON) find_package(Boost REQUIRED COMPONENTS json filesystem) -find_package(Lyra REQUIRED) find_package(WebRTC REQUIRED) find_package(Sora REQUIRED) find_package(SDL2 REQUIRED) @@ -41,17 +40,3 @@ target_include_directories(sumomo PRIVATE ${CLI11_DIR}/include) target_link_libraries(sumomo PRIVATE Sora::sora SDL2::SDL2 SDL2::SDL2main) target_link_directories(sumomo PRIVATE ${CMAKE_SYSROOT}/usr/lib/aarch64-linux-gnu/tegra) target_compile_definitions(sumomo PRIVATE CLI11_HAS_FILESYSTEM=0) - -# Lyra ファイルのコピー -add_custom_command( - TARGET sumomo POST_BUILD - COMMAND - ${CMAKE_COMMAND} -E copy_directory - ${LYRA_DIR}/share/model_coeffs/ - ${CMAKE_CURRENT_BINARY_DIR}/model_coeffs/ - DEPENDS - ${LYRA_DIR}/share/model_coeffs/lyra_config.binarypb - ${LYRA_DIR}/share/model_coeffs/lyragan.tflite - ${LYRA_DIR}/share/model_coeffs/quantizer.tflite - ${LYRA_DIR}/share/model_coeffs/soundstream_encoder.tflite -) diff --git a/sumomo/ubuntu-20.04_armv8_jetson/run.py b/sumomo/ubuntu-20.04_armv8_jetson/run.py index f254a3f..7188721 100644 --- a/sumomo/ubuntu-20.04_armv8_jetson/run.py +++ b/sumomo/ubuntu-20.04_armv8_jetson/run.py @@ -83,7 +83,7 @@ def install_deps(source_dir, build_dir, install_dir, debug, sora_dir: Optional[s } install_llvm(**install_llvm_args) - # Sora C++ SDK, Boost, Lyra + # Sora C++ SDK, Boost if sora_dir is None: install_sora_and_deps('ubuntu-20.04_armv8_jetson', source_dir, build_dir, install_dir) else: @@ -165,7 +165,6 @@ def main(): cmake_args = [] cmake_args.append(f'-DCMAKE_BUILD_TYPE={configuration}') cmake_args.append(f"-DBOOST_ROOT={cmake_path(sora_info.boost_install_dir)}") - cmake_args.append(f"-DLYRA_DIR={cmake_path(sora_info.lyra_install_dir)}") cmake_args.append(f"-DWEBRTC_INCLUDE_DIR={cmake_path(webrtc_info.webrtc_include_dir)}") cmake_args.append(f"-DWEBRTC_LIBRARY_DIR={cmake_path(webrtc_info.webrtc_library_dir)}") cmake_args.append(f"-DSORA_DIR={cmake_path(sora_info.sora_install_dir)}") diff --git a/sumomo/ubuntu-20.04_x86_64/CMakeLists.txt b/sumomo/ubuntu-20.04_x86_64/CMakeLists.txt index d2851dd..c41f6cb 100644 --- a/sumomo/ubuntu-20.04_x86_64/CMakeLists.txt +++ b/sumomo/ubuntu-20.04_x86_64/CMakeLists.txt @@ -21,7 +21,6 @@ list(APPEND CMAKE_MODULE_PATH ${SORA_DIR}/share/cmake) set(Boost_USE_STATIC_LIBS ON) find_package(Boost REQUIRED COMPONENTS json filesystem) -find_package(Lyra REQUIRED) find_package(WebRTC REQUIRED) find_package(Sora REQUIRED) find_package(SDL2 REQUIRED) @@ -42,17 +41,3 @@ target_compile_options(sumomo target_include_directories(sumomo PRIVATE ${CLI11_DIR}/include) target_link_libraries(sumomo PRIVATE Sora::sora SDL2::SDL2 SDL2::SDL2main) target_compile_definitions(sumomo PRIVATE CLI11_HAS_FILESYSTEM=0) - -# Lyra ファイルのコピー -add_custom_command( - TARGET sumomo POST_BUILD - COMMAND - ${CMAKE_COMMAND} -E copy_directory - ${LYRA_DIR}/share/model_coeffs/ - ${CMAKE_CURRENT_BINARY_DIR}/model_coeffs/ - DEPENDS - ${LYRA_DIR}/share/model_coeffs/lyra_config.binarypb - ${LYRA_DIR}/share/model_coeffs/lyragan.tflite - ${LYRA_DIR}/share/model_coeffs/quantizer.tflite - ${LYRA_DIR}/share/model_coeffs/soundstream_encoder.tflite -) diff --git a/sumomo/ubuntu-20.04_x86_64/run.py b/sumomo/ubuntu-20.04_x86_64/run.py index c91aa53..a96bb24 100644 --- a/sumomo/ubuntu-20.04_x86_64/run.py +++ b/sumomo/ubuntu-20.04_x86_64/run.py @@ -68,7 +68,7 @@ def install_deps(source_dir, build_dir, install_dir, debug, sora_dir: Optional[s } install_llvm(**install_llvm_args) - # Sora C++ SDK, Boost, Lyra + # Sora C++ SDK, Boost if sora_dir is None: install_sora_and_deps('ubuntu-20.04_x86_64', source_dir, build_dir, install_dir) else: @@ -141,7 +141,6 @@ def main(): cmake_args = [] cmake_args.append(f'-DCMAKE_BUILD_TYPE={configuration}') cmake_args.append(f"-DBOOST_ROOT={cmake_path(sora_info.boost_install_dir)}") - cmake_args.append(f"-DLYRA_DIR={cmake_path(sora_info.lyra_install_dir)}") cmake_args.append(f"-DWEBRTC_INCLUDE_DIR={cmake_path(webrtc_info.webrtc_include_dir)}") cmake_args.append(f"-DWEBRTC_LIBRARY_DIR={cmake_path(webrtc_info.webrtc_library_dir)}") cmake_args.append(f"-DSORA_DIR={cmake_path(sora_info.sora_install_dir)}") diff --git a/sumomo/ubuntu-22.04_x86_64/CMakeLists.txt b/sumomo/ubuntu-22.04_x86_64/CMakeLists.txt index d2851dd..c41f6cb 100644 --- a/sumomo/ubuntu-22.04_x86_64/CMakeLists.txt +++ b/sumomo/ubuntu-22.04_x86_64/CMakeLists.txt @@ -21,7 +21,6 @@ list(APPEND CMAKE_MODULE_PATH ${SORA_DIR}/share/cmake) set(Boost_USE_STATIC_LIBS ON) find_package(Boost REQUIRED COMPONENTS json filesystem) -find_package(Lyra REQUIRED) find_package(WebRTC REQUIRED) find_package(Sora REQUIRED) find_package(SDL2 REQUIRED) @@ -42,17 +41,3 @@ target_compile_options(sumomo target_include_directories(sumomo PRIVATE ${CLI11_DIR}/include) target_link_libraries(sumomo PRIVATE Sora::sora SDL2::SDL2 SDL2::SDL2main) target_compile_definitions(sumomo PRIVATE CLI11_HAS_FILESYSTEM=0) - -# Lyra ファイルのコピー -add_custom_command( - TARGET sumomo POST_BUILD - COMMAND - ${CMAKE_COMMAND} -E copy_directory - ${LYRA_DIR}/share/model_coeffs/ - ${CMAKE_CURRENT_BINARY_DIR}/model_coeffs/ - DEPENDS - ${LYRA_DIR}/share/model_coeffs/lyra_config.binarypb - ${LYRA_DIR}/share/model_coeffs/lyragan.tflite - ${LYRA_DIR}/share/model_coeffs/quantizer.tflite - ${LYRA_DIR}/share/model_coeffs/soundstream_encoder.tflite -) diff --git a/sumomo/ubuntu-22.04_x86_64/run.py b/sumomo/ubuntu-22.04_x86_64/run.py index d495bd8..4a94f5b 100644 --- a/sumomo/ubuntu-22.04_x86_64/run.py +++ b/sumomo/ubuntu-22.04_x86_64/run.py @@ -68,7 +68,7 @@ def install_deps(source_dir, build_dir, install_dir, debug, sora_dir: Optional[s } install_llvm(**install_llvm_args) - # Sora C++ SDK, Boost, Lyra + # Sora C++ SDK, Boost if sora_dir is None: install_sora_and_deps('ubuntu-22.04_x86_64', source_dir, build_dir, install_dir) else: @@ -141,7 +141,6 @@ def main(): cmake_args = [] cmake_args.append(f'-DCMAKE_BUILD_TYPE={configuration}') cmake_args.append(f"-DBOOST_ROOT={cmake_path(sora_info.boost_install_dir)}") - cmake_args.append(f"-DLYRA_DIR={cmake_path(sora_info.lyra_install_dir)}") cmake_args.append(f"-DWEBRTC_INCLUDE_DIR={cmake_path(webrtc_info.webrtc_include_dir)}") cmake_args.append(f"-DWEBRTC_LIBRARY_DIR={cmake_path(webrtc_info.webrtc_library_dir)}") cmake_args.append(f"-DSORA_DIR={cmake_path(sora_info.sora_install_dir)}") diff --git a/sumomo/windows_x86_64/CMakeLists.txt b/sumomo/windows_x86_64/CMakeLists.txt index 521822a..0ea6b94 100644 --- a/sumomo/windows_x86_64/CMakeLists.txt +++ b/sumomo/windows_x86_64/CMakeLists.txt @@ -22,7 +22,6 @@ set(Boost_USE_STATIC_LIBS ON) set(Boost_USE_STATIC_RUNTIME ON) find_package(Boost REQUIRED COMPONENTS json filesystem) -find_package(Lyra REQUIRED) find_package(WebRTC REQUIRED) find_package(Sora REQUIRED) find_package(SDL2 REQUIRED) @@ -43,20 +42,6 @@ set_target_properties(sumomo MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>" ) -# Lyra ファイルのコピー -add_custom_command( - TARGET sumomo POST_BUILD - COMMAND - ${CMAKE_COMMAND} -E copy_directory - ${LYRA_DIR}/share/model_coeffs/ - ${CMAKE_CURRENT_BINARY_DIR}/$/model_coeffs/ - DEPENDS - ${LYRA_DIR}/share/model_coeffs/lyra_config.binarypb - ${LYRA_DIR}/share/model_coeffs/lyragan.tflite - ${LYRA_DIR}/share/model_coeffs/quantizer.tflite - ${LYRA_DIR}/share/model_coeffs/soundstream_encoder.tflite -) - target_compile_definitions(sumomo PRIVATE _CONSOLE diff --git a/sumomo/windows_x86_64/run.py b/sumomo/windows_x86_64/run.py index 7303a9f..1ae38b3 100644 --- a/sumomo/windows_x86_64/run.py +++ b/sumomo/windows_x86_64/run.py @@ -42,7 +42,7 @@ def install_deps(source_dir, build_dir, install_dir, debug, sora_dir: Optional[s install_webrtc(**install_webrtc_args) - # Sora C++ SDK, Boost, Lyra + # Sora C++ SDK, Boost if sora_dir is None: install_sora_and_deps('windows_x86_64', source_dir, build_dir, install_dir) else: @@ -116,7 +116,6 @@ def main(): cmake_args = [] cmake_args.append(f'-DCMAKE_BUILD_TYPE={configuration}') cmake_args.append(f"-DBOOST_ROOT={cmake_path(sora_info.boost_install_dir)}") - cmake_args.append(f"-DLYRA_DIR={cmake_path(sora_info.lyra_install_dir)}") cmake_args.append(f"-DWEBRTC_INCLUDE_DIR={cmake_path(webrtc_info.webrtc_include_dir)}") cmake_args.append(f"-DWEBRTC_LIBRARY_DIR={cmake_path(webrtc_info.webrtc_library_dir)}") cmake_args.append(f"-DSORA_DIR={cmake_path(sora_info.sora_install_dir)}") From 2d510bd718d8cec32d324f216ec0fff28fc86340 Mon Sep 17 00:00:00 2001 From: enm10k Date: Thu, 7 Mar 2024 16:02:52 +0900 Subject: [PATCH 2/3] =?UTF-8?q?Sora=20C++=20SDK=20=E3=81=AE=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=92=E3=81=82=E3=81=92?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 3 +++ VERSION | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 249e8b4..a1fd98d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -13,6 +13,9 @@ - [CHANGE] Lyra を削除する - @enm10k +- [UPDATE] VERSION のライブラリをアップデートする + - SORA_CPP_SDK_VERSION を 2024.3.0 にあげる + - @enm10k ## sora-cpp-sdk-2024.2.0 diff --git a/VERSION b/VERSION index b0aa61a..9a243c7 100644 --- a/VERSION +++ b/VERSION @@ -1,4 +1,4 @@ -SORA_CPP_SDK_VERSION=2024.2.0 +SORA_CPP_SDK_VERSION=2024.3.0 WEBRTC_BUILD_VERSION=m121.6167.3.0 BOOST_VERSION=1.84.0 CMAKE_VERSION=3.28.1 From 2ccecf816ef0b808755ff9df81a32af18f84cda6 Mon Sep 17 00:00:00 2001 From: enm10k Date: Thu, 7 Mar 2024 16:04:19 +0900 Subject: [PATCH 3/3] =?UTF-8?q?CHANGES.md=20=E3=81=AE=20typo=20=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E3=81=99=E3=82=8B:=20%s/VERSIONS/VERSION/g?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index a1fd98d..14df697 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -21,7 +21,7 @@ - [CHANGE] momo_sample を sumomo にリネームする - @enm10k -- [UPDATE] VERSIONS のライブラリをアップデートする +- [UPDATE] VERSION のライブラリをアップデートする - SORA_CPP_SDK_VERSION を 2024.2.0 にあげる - WEBRTC_BUILD_VERSION を m121.6167.3.0 にあげる - BOOST_VERSION を 1.84.0 にあげる @@ -42,13 +42,13 @@ - JetPack 5.1.1, 5.1.2 で動作を確認 - JetPack 5.1 では、互換性の問題で JetsonJpegDecoder がエラーになることを確認 - @enm10k -- [UPDATE] VERSIONS のライブラリをアップデートする +- [UPDATE] VERSION のライブラリをアップデートする - SORA_CPP_SDK_VERSION を 2024.1.0 にあげる - @miosakuma ## sora-cpp-sdk-2023.17.0 -- [UPDATE] VERSIONS のライブラリをアップデートする +- [UPDATE] VERSION のライブラリをアップデートする - SORA_CPP_SDK_VERSION を 2023.17.0 にあげる - WEBRTC_BUILD_VERSION を m120.6099.1.2 にあげる - @miosakuma @@ -61,7 +61,7 @@ - [UPDATE] - momo_sample に --hw-mjpeg-decoder オプションを追加する - @enm10k -- [UPDATE] VERSIONS のライブラリをアップデートする +- [UPDATE] VERSION のライブラリをアップデートする - SORA_CPP_SDK_VERSION を 2023.15.1 にあげる - WEBRTC_BUILD_VERSION を m119.6045.2.1 にあげる - CMake を 3.27.7 に上げる @@ -69,14 +69,14 @@ ## sora-cpp-sdk-2023.14.0 -- [UPDATE] VERSIONS のライブラリをアップデートする +- [UPDATE] VERSION のライブラリをアップデートする - SORA_CPP_SDK_VERSION を 2023.14.0 にあげる - WEBRTC_BUILD_VERSION を m117.5938.2.0 にあげる - @torikizi ## sora-cpp-sdk-2023.13.0 -- [UPDATE] VERSIONS のライブラリをアップデートする +- [UPDATE] VERSION のライブラリをアップデートする - SORA_CPP_SDK_VERSION を 2023.13.0 にあげる - WEBRTC_BUILD_VERSION を m116.5845.6.1 にあげる - @torikizi @@ -92,7 +92,7 @@ ## sora-cpp-sdk-2023.7.0 -- [UPDATE] VERSIONS のライブラリをアップデートする +- [UPDATE] VERSION のライブラリをアップデートする - SORA_CPP_SDK_VERSION を 2023.7.0 にあげる - CMAKE_VERSION を 3.26.4 にあげる - @torikizi @@ -117,7 +117,7 @@ - @melpon - [UPDATE] JetPack 5.1 に対応する - @melpon -- [UPDATE] VERSIONS のライブラリをアップデートする +- [UPDATE] VERSION のライブラリをアップデートする - SORA_CPP_SDK_VERSION を 2023.5.0 にあげる - WEBRTC_BUILD_VERSION を m114.5735.0.1 にあげる - BOOST_VERSION を 1.82.0 にあげる