Merge remote-tracking branch 'origin/develop' into support/hololens2

shiguredo · Aug 29, 2024 · abd3f5c · abd3f5c
2 parents 7e0c5e5 + 74174af
commit abd3f5c
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -111,8 +111,8 @@ jobs:
       TEST_MATRIX_NAME: ${{ matrix.name }}
     steps:
       - uses: actions/checkout@v4
-      - name: Select Xcode 14.3.1
-        run: sudo xcode-select --switch /Applications/Xcode_14.3.1.app/Contents/Developer
+      - name: Select Xcode 15.4
+        run: sudo xcode-select --switch /Applications/Xcode_15.4.app/Contents/Developer
       - name: Env to output
         run: |
           echo "user=`users`" >> $GITHUB_OUTPUT

diff --git a/CHANGES.md b/CHANGES.md
@@ -11,6 +11,12 @@
 
 ## develop
 
+- [UPDATE] libwebrtc を m128.6613.2.0 にあげる
+  - H.265 Patch の修正に伴い、C++ SDK の H.265 に関する設定を変更
+  - examples と test に `rtc::CreateRandomString` のヘッダを追加
+  - @tnoho
+- [UPDATE] Xcode のバージョンを 15.4 にあげる
+  - @tnoho
 - [ADD] Intel VPL で AV1 エンコーダを動くようにする
   - @tnoho
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -398,6 +398,7 @@ elseif (SORA_TARGET_OS STREQUAL "macos")
       "-framework MetalKit"
       "-framework OpenGL"
       "-framework IOSurface"
+      "-framework ScreenCaptureKit"
   )
 
 elseif (SORA_TARGET_OS STREQUAL "ios")

diff --git a/examples/sdl_sample/src/sdl_sample.cpp b/examples/sdl_sample/src/sdl_sample.cpp
@@ -8,6 +8,9 @@
 // Boost
 #include <boost/optional/optional.hpp>
 
+// WebRTC
+#include <rtc_base/crypto_random.h>
+
 #include "sdl_renderer.h"
 
 #ifdef _WIN32

diff --git a/examples/sumomo/src/sumomo.cpp b/examples/sumomo/src/sumomo.cpp
@@ -13,6 +13,9 @@
 // Boost
 #include <boost/optional/optional.hpp>
 
+// WebRTC
+#include <rtc_base/crypto_random.h>
+
 #include "sdl_renderer.h"
 
 #ifdef _WIN32

diff --git a/src/hwenc_nvcodec/nvcodec_video_encoder.cpp b/src/hwenc_nvcodec/nvcodec_video_encoder.cpp
@@ -387,8 +387,6 @@ int32_t NvCodecVideoEncoderImpl::Encode(
       encoded_image_.qp_ = h264_bitstream_parser_.GetLastSliceQp().value_or(-1);
     } else if (codec_ == CudaVideoCodec::H265) {
       codec_specific.codecType = webrtc::kVideoCodecH265;
-      codec_specific.codecSpecific.H265.packetization_mode =
-          webrtc::H265PacketizationMode::NonInterleaved;
 
       h265_bitstream_parser_.ParseBitstream(encoded_image_);
       encoded_image_.qp_ = h265_bitstream_parser_.GetLastSliceQp().value_or(-1);

diff --git a/src/hwenc_vpl/vpl_video_encoder.cpp b/src/hwenc_vpl/vpl_video_encoder.cpp
@@ -8,7 +8,6 @@
 #include <common_video/h265/h265_bitstream_parser.h>
 #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>
@@ -542,8 +541,6 @@ int32_t VplVideoEncoderImpl::Encode(
       encoded_image_.qp_ = h264_bitstream_parser_.GetLastSliceQp().value_or(-1);
     } else if (codec_ == MFX_CODEC_HEVC) {
       codec_specific.codecType = webrtc::kVideoCodecH265;
-      codec_specific.codecSpecific.H265.packetization_mode =
-          webrtc::H265PacketizationMode::NonInterleaved;
 
       h265_bitstream_parser_.ParseBitstream(encoded_image_);
       encoded_image_.qp_ = h265_bitstream_parser_.GetLastSliceQp().value_or(-1);

diff --git a/test/connect_disconnect.cpp b/test/connect_disconnect.cpp
@@ -3,6 +3,7 @@
 #include <iostream>
 
 // WebRTC
+#include <rtc_base/crypto_random.h>
 #include <rtc_base/logging.h>
 
 #ifdef _WIN32

diff --git a/test/e2e.cpp b/test/e2e.cpp
@@ -4,6 +4,7 @@
 #include <iostream>
 
 // WebRTC
+#include <rtc_base/crypto_random.h>
 #include <rtc_base/logging.h>
 
 #ifdef _WIN32

diff --git a/test/hello.cpp b/test/hello.cpp
@@ -4,6 +4,7 @@
 #include <iostream>
 
 // WebRTC
+#include <rtc_base/crypto_random.h>
 #include <rtc_base/logging.h>
 
 #ifdef _WIN32