Merge branch 'release/2024.1.0'

shiguredo · Apr 24, 2024 · 0b1b240 · 0b1b240
2 parents 6cb4890 + 1eb0635
commit 0b1b240
Show file tree

Hide file tree

Showing 23 changed files with 2,030 additions and 865 deletions.
diff --git a/.github/actions/download/action.yml b/.github/actions/download/action.yml
@@ -10,7 +10,7 @@ inputs:
 runs:
   using: composite
   steps:
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         name: ${{ inputs.platform }}.env
         path: ${{ inputs.platform }}.env
@@ -22,7 +22,7 @@ runs:
         echo "package_name=$PACKAGE_NAME" >> $GITHUB_OUTPUT
         echo "$PACKAGE_NAME/$PACKAGE_NAME" >> package_paths.env
       id: env
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         name: ${{ steps.env.outputs.package_name }}
         path: ${{ steps.env.outputs.package_name }}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,7 +21,7 @@ jobs:
     name: Build zakuro for ${{ matrix.name }}
     runs-on: ${{ matrix.name == 'ubuntu-22.04_x86_64' && 'ubuntu-22.04' || 'ubuntu-20.04' }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Update repo
         if: matrix.name == 'ubuntu-22.04_x86_64'
         run: |
@@ -46,12 +46,12 @@ jobs:
           echo "name=${PACKAGE_NAME}" >> $GITHUB_OUTPUT
         id: package_name
       - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.package_name.outputs.name }}
           path: _package/${{ matrix.name }}/release/${{ steps.package_name.outputs.name }}
       - name: Upload Environment
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.name }}.env
           path: _package/${{ matrix.name }}/release/zakuro.env
@@ -62,7 +62,7 @@ jobs:
       - build-linux
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/download
         with:
           platform: ubuntu-20.04_x86_64

diff --git a/.gitignore b/.gitignore
@@ -33,7 +33,6 @@
 
 zakuro
 core
-.vscode
 *.tar.gz
 webrtc_logs_0
 .DS_Store

diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -0,0 +1,37 @@
+{
+    "configurations": [
+        {
+            "name": "Linux",
+            "includePath": [
+                "/usr/include",
+                "${workspaceFolder}/_build/ubuntu-20.04_x86_64/release/zakuro",
+                "${workspaceFolder}/_install/ubuntu-20.04_x86_64/release/sora/include",
+                "${workspaceFolder}/_install/ubuntu-20.04_x86_64/release/webrtc/include",
+                "${workspaceFolder}/_install/ubuntu-20.04_x86_64/release/webrtc/include/third_party/abseil-cpp",
+                "${workspaceFolder}/_install/ubuntu-20.04_x86_64/release/webrtc/include/third_party/boringssl/src/include",
+                "${workspaceFolder}/_install/ubuntu-20.04_x86_64/release/webrtc/include/third_party/libyuv/include",
+                "${workspaceFolder}/_install/ubuntu-20.04_x86_64/release/llvm/libcxx/include",
+                "${workspaceFolder}/_install/ubuntu-20.04_x86_64/release/boost/include",
+                "${workspaceFolder}/_install/ubuntu-20.04_x86_64/release/cli11/include",
+                "${workspaceFolder}/_install/ubuntu-20.04_x86_64/release/blend2d/include",
+                "${workspaceFolder}/_install/ubuntu-20.04_x86_64/release/openh264/include",
+                "${workspaceFolder}/_install/ubuntu-20.04_x86_64/release/yaml/include"
+            ],
+            "defines": [
+                "WEBRTC_POSIX",
+                "WEBRTC_LINUX",
+                "_LIBCPP_ABI_NAMESPACE=Cr",
+                "_LIBCPP_ABI_VERSION=2",
+                "_LIBCPP_DISABLE_AVAILABILITY",
+                "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
+                "OPENSSL_IS_BORINGSSL"
+            ],
+            "compilerPath": "${workspaceFolder}/_install/ubuntu-20.04_x86_64/release/llvm/clang/bin/clang++",
+            "compilerArgs": ["-nostdinc++"],
+            "cStandard": "gnu17",
+            "cppStandard": "gnu++17",
+            "intelliSenseMode": "linux-clang-x64"
+        }
+    ],
+    "version": 4
+}
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -0,0 +1,3 @@
+{
+  "recommendations": ["charliermarsh.ruff", "ms-python.mypy-type-checker"]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,40 @@
+{
+    "python.analysis.autoImportCompletions": true,
+    "python.analysis.typeCheckingMode": "basic",
+    "[python]": {
+        "editor.formatOnSave": true,
+        "editor.formatOnSaveMode": "file",
+        "editor.defaultFormatter": "charliermarsh.ruff",
+        "editor.autoIndent": "full",
+        "editor.codeActionsOnSave": {
+            "source.fixAll.ruff": "always",
+            "source.organizeImports.ruff": "explicit"
+        }
+    },
+    "[cpp]": {
+        "editor.formatOnSave": true
+    },
+    "files.associations": {
+        "*.cs": "csharp",
+        "CMakeLists.txt": "cmake",
+        "*.txt": "plaintext",
+        "csignal": "cpp",
+        "cstdlib": "cpp",
+        "memory": "cpp",
+        "algorithm": "cpp",
+        "*.ipp": "cpp",
+        "fstream": "cpp",
+        "iosfwd": "cpp",
+        "type_traits": "cpp",
+        "memory_resource": "cpp",
+        "ostream": "cpp",
+        "__node_handle": "cpp",
+        "__config": "cpp",
+        "random": "cpp",
+        "stdexcept": "cpp",
+        "chrono": "cpp",
+        "string": "cpp",
+        "__mutex_base": "cpp",
+        "vector": "cpp"
+    }
+}
diff --git a/CHANGES.md b/CHANGES.md
@@ -11,6 +11,49 @@
 
 ## develop
 
+## 2024.1.0 (2024-04-24)
+
+- [CHANGE] Lyra を削除
+  - `--sora-audio-codec-lyra-bitrate` オプションを削除
+  - `--sora-audio-codec-lyra-usedtx` オプションを削除
+  - `--sora-check-lyra-version` オプションを削除
+  - `--sora-audio-codec-type` から LYRA を削除
+  - インストールするファイルに model_coeffs を含めないようにする
+  - VERSION ファイルから LYRA_VERSION を削除
+  - @melpon
+- [ADD] run.py に `--webrtc-build-dir` と `--webrtc-build-args` オプションを追加
+  - @melpon
+- [ADD] run.py に `--sora-dir` と `--sora-args` オプションを追加
+  - @melpon
+- [UPDATE] Sora C++ SDK を 2024.6.1 に上げる
+  - それに伴って以下のライブラリのバージョンも上げる
+  - WebRTC を m122.6261.1.0 に上げる
+    - Ubuntu のビルドを通すために、 __assertion_handler というファイルをコピーする処理を追加した
+  - Boost を 1.84.0 に上げる
+  - @torikizi @voluntas @melpon
+- [UPDATE] asmjit と blend2d を最新版に上げる
+  - @voluntas @melpon
+- [UPDATE] `CMake` を `3.28.1` に上げる
+  - @voluntas @torikizi @melpon
+- [UPDATE] OpenH264 を 2.4.1 に上げる
+  - @melpon
+- [UPDATE] CLI11 を 2.4.1 に上げる
+  - @melpon
+- [UPDATE] run.py に定義されていた関数を buildbase.py に移動する
+  - @melpon
+- [UPDATE] Github Actions の actions/checkout , actions/upload-artifact , actions/download-artifact をアップデート
+  - Node.js 16 の Deprecated に伴うアップデート
+    - actions/checkout@v3 から actions/checkout@v4 にアップデート
+    - actions/upload-artifact@v3 から actions/upload-artifact@v4 にアップデート
+    - actions/download-artifact@v3 から actions/download-artifact@v4 にアップデート
+  - @miosakuma @torikizi
+- [FIX] VideoCodec は Protected のため CreateVideoCodec に修正
+  - m117.5938.2.0 へのアップデートに伴う修正
+  - @torikizi
+- [FIX] resetMatrix() から resetTransform() に修正
+  - blend2d を最新版に上げた際に発生した問題の修正
+  - @torikizi
+
 ## 2023.1.0 (2023-08-23)
 
 - [CHANGE] `--fake-network-send-codel-active-queue-management` と `--fake-network-receive-codel-active-queue-management` オプションを削除

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,7 +14,6 @@ set(Boost_USE_STATIC_LIBS ON)
 
 set(WEBRTC_LIBRARY_NAME webrtc)
 find_package(Boost REQUIRED COMPONENTS json filesystem)
-find_package(Lyra REQUIRED)
 find_package(WebRTC REQUIRED)
 find_package(Sora REQUIRED)
 find_package(Threads REQUIRED)
@@ -43,7 +42,7 @@ target_sources(zakuro
   PRIVATE
     src/dynamic_h264_video_encoder.cpp
     src/embedded_binary.cpp
-    src/fake_network_call_factory.cpp
+    src/enable_media_with_fake_call.cpp
     src/fake_video_capturer.cpp
     src/main.cpp
     src/nop_video_decoder.cpp
@@ -65,7 +64,7 @@ target_link_libraries(zakuro
     Boost::filesystem
     CLI11::CLI11
     Blend2D::Blend2D
-    yaml-cpp
+    yaml-cpp::yaml-cpp
 )
 
 target_compile_definitions(zakuro

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # WebRTC Load Testing Tool Zakuro
 
-[![libwebrtc](https://img.shields.io/badge/libwebrtc-m115.5790-blue.svg)](https://chromium.googlesource.com/external/webrtc/+/branch-heads/5790)
+[![libwebrtc](https://img.shields.io/badge/libwebrtc-m122.6261-blue.svg)](https://chromium.googlesource.com/external/webrtc/+/branch-heads/6261)
 [![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/shiguredo/zakuro.svg)](https://github.com/shiguredo/zakuro)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 

diff --git a/VERSION b/VERSION
@@ -1,11 +1,10 @@
-ZAKURO_VERSION=2023.1.0
-SORA_CPP_SDK_VERSION=2023.9.0
-WEBRTC_BUILD_VERSION=m115.5790.7.0
-BOOST_VERSION=1.82.0
-LYRA_VERSION=1.3.0
-CLI11_VERSION=v2.3.2
-CMAKE_VERSION=3.26.4
-BLEND2D_VERSION=a84dfdbd1d03f9b203e18b9158387af32b6ce41e
-ASMJIT_VERSION=5c469e3f7c307da939d38d72e09f08db7ca076ef
-OPENH264_VERSION=v2.3.1
-YAML_CPP_VERSION=yaml-cpp-0.7.0
+ZAKURO_VERSION=2024.1.0
+SORA_CPP_SDK_VERSION=2024.6.1
+WEBRTC_BUILD_VERSION=m122.6261.1.0
+BOOST_VERSION=1.84.0
+CLI11_VERSION=v2.4.1
+CMAKE_VERSION=3.28.1
+BLEND2D_VERSION=5a263ce51f3f880ee6c60f6345d18c3eccbe200f
+ASMJIT_VERSION=3ca5c186bf8922e5fe3018432e93651fd2fa4053
+OPENH264_VERSION=v2.4.1
+YAML_CPP_VERSION=0.8.0
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,7 +33,6 @@ @@
     zakuro
     core
-    .vscode
     *.tar.gz
     webrtc_logs_0
     .DS_Store
@@ Expand Down @@