Merge pull request #107 from shiguredo/feature/m125.6422

Feature/m125.6422
shiguredo · May 28, 2024 · 8fa6b0a · 8fa6b0a
2 parents 9991c3c + a78f640
commit 8fa6b0a
Show file tree

Hide file tree

Showing 15 changed files with 251 additions and 111 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
         name:
           - windows_x86_64
     name: Build sora-cpp-sdk for ${{ matrix.name }}
-    runs-on: windows-2019
+    runs-on: windows-2022
     env:
       TEST_SIGNALING_URL: ${{ secrets.TEST_SIGNALING_URL }}
       TEST_CHANNEL_ID_PREFIX: ${{ secrets.TEST_CHANNEL_ID_PREFIX }}

diff --git a/CHANGES.md b/CHANGES.md
@@ -15,16 +15,21 @@
   - @melpon
 - [CHANGE] `--webrtc-build-dir`, `--webrtc-build-args` を `--local-webrtc-build-dir` と `--local-webrtc-build-args` に変更する
   - @melpon
-- [CHANGE] SoraVideoDecoderFactory の初期化に利用する関数を CreateVideoDecoder から Create に変更する
+- [CHANGE] SoraVideoDecoderFactory の CreateVideoDecoder 関数を Create に変更する
   - libwebrtc に定義されている継承元クラスが変更されたことに対する追従
   - @enm10k
+- [CHANGE] SoraVideoEncoderFactory の CreateVideoEncoder 関数を Create に変更する
+  - libwebrtc に定義されている継承元クラスが変更されたことに対する追従
+  - @enm10k
+- [CHANGE] `CreateOpenH264VideoEncoder()` 関数の第１引数の型を `const cricket::VideoCodec&` から `const webrtc::SdpVideoFormat&` に変更する
+  - @melpon
 - [UPDATE] Boost を 1.85.0 にあげる
   - @enm10k
 - [UPDATE] SDL2 を 2.30.3 にあげる
   - @enm10k
 - [UPDATE] CLI11 を 2.4.2 にあげる
   - @enm10k
-- [UPDATE] libwebrtc を m124.6367.3.1 にあげる
+- [UPDATE] libwebrtc を m125.6422.2.1 にあげる
   - Android の test アプリがリンクできなくなったため、リンカーを Android NDK のものから libwebrtc のものに変更
   - リンカーのバージョンの違いによる互換性の問題でエラーが発生していた
   - @melpon @enm10k

diff --git a/VERSION b/VERSION
@@ -1,5 +1,5 @@
 SORA_CPP_SDK_VERSION=2024.7.0-canary.1
-WEBRTC_BUILD_VERSION=m124.6367.3.1
+WEBRTC_BUILD_VERSION=m125.6422.2.1
 BOOST_VERSION=1.85.0
 CMAKE_VERSION=3.28.1
 CUDA_VERSION=11.8.0-1

diff --git a/buildbase.py b/buildbase.py
@@ -940,8 +940,6 @@ def install_sdl2(
         ]
         if platform == "windows":
             cmake_args += [
-                "-G",
-                "Visual Studio 16 2019",
                 "-DSDL_FORCE_STATIC_VCRT=ON",
                 "-DHAVE_LIBC=ON",
             ]

diff --git a/examples/VERSION b/examples/VERSION
@@ -1,6 +1,6 @@
 SORA_CPP_SDK_VERSION=2024.7.0-canary.1
-WEBRTC_BUILD_VERSION=m124.6367.3.1
-BOOST_VERSION=1.84.0
+WEBRTC_BUILD_VERSION=m125.6422.2.1
+BOOST_VERSION=1.85.0
 CMAKE_VERSION=3.28.1
 SDL2_VERSION=2.30.3
 CLI11_VERSION=v2.4.2
diff --git a/include/sora/hwenc_jetson/jetson_video_encoder.h b/include/sora/hwenc_jetson/jetson_video_encoder.h
@@ -22,6 +22,7 @@
 // WebRTC
 #include <api/video_codecs/video_encoder.h>
 #include <common_video/include/bitrate_adjuster.h>
+#include <media/base/codec.h>
 #include <modules/video_coding/codecs/h264/include/h264.h>
 #include <modules/video_coding/codecs/vp9/include/vp9_globals.h>
 #include <modules/video_coding/svc/scalable_video_controller.h>
@@ -40,7 +41,7 @@ namespace sora {
 
 class JetsonVideoEncoder : public webrtc::VideoEncoder {
  public:
-  explicit JetsonVideoEncoder(const cricket::VideoCodec& codec);
+  explicit JetsonVideoEncoder(const cricket::Codec& codec);
   ~JetsonVideoEncoder() override;
 
   static bool IsSupportedVP8();

diff --git a/include/sora/open_h264_video_encoder.h b/include/sora/open_h264_video_encoder.h
@@ -11,7 +11,7 @@
 namespace sora {
 
 std::unique_ptr<webrtc::VideoEncoder> CreateOpenH264VideoEncoder(
-    const cricket::VideoCodec& codec,
+    const webrtc::SdpVideoFormat& format,
     std::string openh264);
 
 }

diff --git a/include/sora/sora_video_encoder_factory.h b/include/sora/sora_video_encoder_factory.h
@@ -81,12 +81,14 @@ class SoraVideoEncoderFactory : public webrtc::VideoEncoderFactory {
 
   std::vector<webrtc::SdpVideoFormat> GetSupportedFormats() const override;
 
-  std::unique_ptr<webrtc::VideoEncoder> CreateVideoEncoder(
+  std::unique_ptr<webrtc::VideoEncoder> Create(
+      const webrtc::Environment& env,
       const webrtc::SdpVideoFormat& format) override;
 
  private:
   // 一番内側のエンコーダを作る
   std::unique_ptr<webrtc::VideoEncoder> CreateInternalVideoEncoder(
+      const webrtc::Environment& env,
       const webrtc::SdpVideoFormat& format,
       int& alignment);
 

diff --git a/src/default_video_formats.cpp b/src/default_video_formats.cpp
@@ -4,6 +4,7 @@
 #include <api/video_codecs/sdp_video_format.h>
 #include <api/video_codecs/video_codec.h>
 #include <api/video_codecs/vp9_profile.h>
+#include <media/base/media_constants.h>
 #include <modules/video_coding/codecs/av1/av1_svc_config.h>
 #include <modules/video_coding/codecs/h264/include/h264.h>
 #include <modules/video_coding/codecs/vp8/include/vp8.h>

diff --git a/src/hwenc_jetson/jetson_video_encoder.cpp b/src/hwenc_jetson/jetson_video_encoder.cpp
@@ -16,14 +16,18 @@
 
 // WebRTC
 #include <common_video/libyuv/include/webrtc_libyuv.h>
+#include <modules/video_coding/include/video_codec_interface.h>
+#include <modules/video_coding/include/video_error_codes.h>
 #include <modules/video_coding/svc/create_scalability_structure.h>
 #include <rtc_base/checks.h>
 #include <rtc_base/logging.h>
 #include <rtc_base/time_utils.h>
 #include <system_wrappers/include/metrics.h>
-#include <third_party/libyuv/include/libyuv/convert.h>
-#include <third_party/libyuv/include/libyuv/convert_from.h>
-#include <third_party/libyuv/include/libyuv/video_common.h>
+
+// libyuv
+#include <libyuv/convert.h>
+#include <libyuv/convert_from.h>
+#include <libyuv/video_common.h>
 
 // L4T Multimedia API
 #include <NvBufSurface.h>

diff --git a/src/hwenc_nvcodec/nvcodec_h264_encoder.cpp b/src/hwenc_nvcodec/nvcodec_h264_encoder.cpp
@@ -16,10 +16,14 @@
 #include <api/video/nv12_buffer.h>
 #include <common_video/h264/h264_bitstream_parser.h>
 #include <common_video/include/bitrate_adjuster.h>
-#include <libyuv.h>
 #include <modules/video_coding/codecs/h264/include/h264.h>
+#include <modules/video_coding/include/video_codec_interface.h>
+#include <modules/video_coding/include/video_error_codes.h>
 #include <rtc_base/logging.h>
 
+// libyuv
+#include <libyuv.h>
+
 // NvCodec
 #ifdef _WIN32
 #include <NvEncoder/NvEncoderD3D11.h>

diff --git a/src/hwenc_vpl/vpl_video_encoder.cpp b/src/hwenc_vpl/vpl_video_encoder.cpp
@@ -9,6 +9,8 @@
 #include <common_video/include/bitrate_adjuster.h>
 #include <modules/video_coding/codecs/h264/include/h264.h>
 #include <modules/video_coding/codecs/h265/include/h265_globals.h>
+#include <modules/video_coding/include/video_codec_interface.h>
+#include <modules/video_coding/include/video_error_codes.h>
 #include <rtc_base/logging.h>
 #include <rtc_base/synchronization/mutex.h>