Merge pull request #37 from shiguredo/feature/libwebrtc-m125

libwebrtc を m125 に対応する
shiguredo · Jun 23, 2024 · 1599ef6 · 1599ef6
2 parents 9a83a88 + 50dc367
commit 1599ef6
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 886 deletions.
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -4,18 +4,18 @@
             "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"
+                "${workspaceFolder}/_build/ubuntu-22.04_x86_64/release/zakuro",
+                "${workspaceFolder}/_install/ubuntu-22.04_x86_64/release/sora/include",
+                "${workspaceFolder}/_install/ubuntu-22.04_x86_64/release/webrtc/include",
+                "${workspaceFolder}/_install/ubuntu-22.04_x86_64/release/webrtc/include/third_party/abseil-cpp",
+                "${workspaceFolder}/_install/ubuntu-22.04_x86_64/release/webrtc/include/third_party/boringssl/src/include",
+                "${workspaceFolder}/_install/ubuntu-22.04_x86_64/release/webrtc/include/third_party/libyuv/include",
+                "${workspaceFolder}/_install/ubuntu-22.04_x86_64/release/llvm/libcxx/include",
+                "${workspaceFolder}/_install/ubuntu-22.04_x86_64/release/boost/include",
+                "${workspaceFolder}/_install/ubuntu-22.04_x86_64/release/cli11/include",
+                "${workspaceFolder}/_install/ubuntu-22.04_x86_64/release/blend2d/include",
+                "${workspaceFolder}/_install/ubuntu-22.04_x86_64/release/openh264/include",
+                "${workspaceFolder}/_install/ubuntu-22.04_x86_64/release/yaml/include"
             ],
             "defines": [
                 "WEBRTC_POSIX",
@@ -24,9 +24,10 @@
                 "_LIBCPP_ABI_VERSION=2",
                 "_LIBCPP_DISABLE_AVAILABILITY",
                 "_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE",
-                "OPENSSL_IS_BORINGSSL"
+                "OPENSSL_IS_BORINGSSL",
+                "RTC_ENABLE_H265"
             ],
-            "compilerPath": "${workspaceFolder}/_install/ubuntu-20.04_x86_64/release/llvm/clang/bin/clang++",
+            "compilerPath": "${workspaceFolder}/_install/ubuntu-22.04_x86_64/release/llvm/clang/bin/clang++",
             "compilerArgs": ["-nostdinc++"],
             "cStandard": "gnu17",
             "cppStandard": "gnu++17",

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -35,6 +35,7 @@
         "chrono": "cpp",
         "string": "cpp",
         "__mutex_base": "cpp",
-        "vector": "cpp"
+        "vector": "cpp",
+        "optional": "cpp"
     }
 }
diff --git a/CHANGES.md b/CHANGES.md
@@ -15,6 +15,13 @@
   - @melpon
 - [CHANGE] `--webrtc-build-dir`, `--webrtc-build-args` を `--local-webrtc-build-dir` と `--local-webrtc-build-args` に変更する
   - @melpon
+- [UPDATE] Sora C++ SDK を 2024.7.0-canary.4 に上げる
+  - それに伴って以下のライブラリのバージョンも上げる
+  - libwebrtc のバージョンを `m125.6422.2.5` に上げる
+  - Boost のバージョンを `1.85.0` に上げる
+  - @melpon
+- [UPDATE] Blend2D, AsmJit を最新版に上げる
+  - @melpon
 
 ## 2024.1.0 (2024-04-24)
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -40,13 +40,11 @@ target_include_directories(zakuro PRIVATE ${OPENH264_ROOT_DIR}/include)
 
 target_sources(zakuro
   PRIVATE
-    src/dynamic_h264_video_encoder.cpp
     src/embedded_binary.cpp
     src/enable_media_with_fake_call.cpp
     src/fake_video_capturer.cpp
     src/main.cpp
     src/nop_video_decoder.cpp
-    src/sctp_transport_factory.cpp
     src/util.cpp
     src/virtual_client.cpp
     src/wav_reader.cpp

diff --git a/VERSION b/VERSION
@@ -1,10 +1,10 @@
 ZAKURO_VERSION=2024.1.0
-SORA_CPP_SDK_VERSION=2024.6.1
-WEBRTC_BUILD_VERSION=m122.6261.1.0
-BOOST_VERSION=1.84.0
+SORA_CPP_SDK_VERSION=2024.7.0-canary.3
+WEBRTC_BUILD_VERSION=m125.6422.2.5
+BOOST_VERSION=1.85.0
 CLI11_VERSION=v2.4.2
 CMAKE_VERSION=3.28.1
-BLEND2D_VERSION=5a263ce51f3f880ee6c60f6345d18c3eccbe200f
-ASMJIT_VERSION=3ca5c186bf8922e5fe3018432e93651fd2fa4053
+BLEND2D_VERSION=c966273935e70ce1bed328993ee40d7cfe8fef5c
+ASMJIT_VERSION=062e69ca81defa35eb0ee15f7412f49a0dad3cdb
 OPENH264_VERSION=v2.4.1
 YAML_CPP_VERSION=0.8.0