From 69222d3fe7c8a1f4063517f73aa5252ed296a73b Mon Sep 17 00:00:00 2001 From: torikizi Date: Thu, 22 Aug 2024 17:12:49 +0900 Subject: [PATCH 1/8] =?UTF-8?q?WEBRTC=5FBUILD=5FVERSION=20=E3=82=92=20m128?= =?UTF-8?q?.6613.2.0=20=E3=81=AB=E4=B8=8A=E3=81=92=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index b443bc95..022dd55a 100644 --- a/VERSION +++ b/VERSION @@ -1,5 +1,5 @@ SORA_CPP_SDK_VERSION=2024.7.0 -WEBRTC_BUILD_VERSION=m127.6533.1.1 +WEBRTC_BUILD_VERSION=m128.6613.2.0 BOOST_VERSION=1.85.0 CMAKE_VERSION=3.29.6 CUDA_VERSION=11.8.0-1 From dbcb9e4effa52031a10ed12a518db1b98fab6cd2 Mon Sep 17 00:00:00 2001 From: tnoho Date: Thu, 22 Aug 2024 19:58:49 +0900 Subject: [PATCH 2/8] =?UTF-8?q?ScreenCaptureKit=20=E3=81=AE=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 21e76e52..90f51829 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -370,6 +370,7 @@ elseif (SORA_TARGET_OS STREQUAL "macos") "-framework MetalKit" "-framework OpenGL" "-framework IOSurface" + "-framework ScreenCaptureKit" ) elseif (SORA_TARGET_OS STREQUAL "ios") From 95ec404c20acfa842b413bdf67e45f60df233c7e Mon Sep 17 00:00:00 2001 From: tnoho Date: Thu, 22 Aug 2024 19:59:04 +0900 Subject: [PATCH 3/8] =?UTF-8?q?rtc::CreateRandomString=20=E3=81=AE?= =?UTF-8?q?=E3=83=98=E3=83=83=E3=83=80=E3=82=92=E8=BF=BD=E8=A8=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/sumomo/src/sumomo.cpp | 3 +++ test/hello.cpp | 1 + 2 files changed, 4 insertions(+) diff --git a/examples/sumomo/src/sumomo.cpp b/examples/sumomo/src/sumomo.cpp index 702dbacc..85feba06 100644 --- a/examples/sumomo/src/sumomo.cpp +++ b/examples/sumomo/src/sumomo.cpp @@ -13,6 +13,9 @@ // Boost #include +// WebRTC +#include + #include "sdl_renderer.h" #ifdef _WIN32 diff --git a/test/hello.cpp b/test/hello.cpp index 1e5ebf4e..360d3124 100644 --- a/test/hello.cpp +++ b/test/hello.cpp @@ -4,6 +4,7 @@ #include // WebRTC +#include #include #ifdef _WIN32 From c3ec43e0cb58500799220adf245b665b38da66b1 Mon Sep 17 00:00:00 2001 From: tnoho Date: Thu, 22 Aug 2024 20:03:20 +0900 Subject: [PATCH 4/8] =?UTF-8?q?H265=20=E5=91=A8=E3=82=8A=E3=81=AE=E3=83=98?= =?UTF-8?q?=E3=83=83=E3=83=80=E3=83=BC=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?= =?UTF-8?q?=E3=82=92=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hwenc_nvcodec/nvcodec_video_encoder.cpp | 2 -- src/hwenc_vpl/vpl_video_encoder.cpp | 3 --- 2 files changed, 5 deletions(-) diff --git a/src/hwenc_nvcodec/nvcodec_video_encoder.cpp b/src/hwenc_nvcodec/nvcodec_video_encoder.cpp index ed05d326..3ac6a6ad 100644 --- 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 index 03325e6b..8136146b 100644 --- a/src/hwenc_vpl/vpl_video_encoder.cpp +++ b/src/hwenc_vpl/vpl_video_encoder.cpp @@ -8,7 +8,6 @@ #include #include #include -#include #include #include #include @@ -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); From 51429f28e63b1a52e28ffa27af86b80ddc749cf1 Mon Sep 17 00:00:00 2001 From: tnoho Date: Thu, 22 Aug 2024 20:11:07 +0900 Subject: [PATCH 5/8] =?UTF-8?q?Xcode=20=E3=81=AE=E3=83=90=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=82=E4=B8=8A=E3=81=92=E3=81=A6?= =?UTF-8?q?=E3=81=97=E3=81=BE=E3=81=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 75208c38..e0da9393 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -108,8 +108,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 From 416ef6c3beb061f222576a833144e153940ef375 Mon Sep 17 00:00:00 2001 From: tnoho Date: Thu, 22 Aug 2024 20:13:55 +0900 Subject: [PATCH 6/8] =?UTF-8?q?rtc::CreateRandomString=20=E3=81=AE?= =?UTF-8?q?=E3=83=98=E3=83=83=E3=83=80=E8=BF=BD=E8=A8=98=E6=BC=8F=E3=82=8C?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/sdl_sample/src/sdl_sample.cpp | 3 +++ test/connect_disconnect.cpp | 1 + test/e2e.cpp | 1 + 3 files changed, 5 insertions(+) diff --git a/examples/sdl_sample/src/sdl_sample.cpp b/examples/sdl_sample/src/sdl_sample.cpp index 20a404c9..e5e440c7 100644 --- a/examples/sdl_sample/src/sdl_sample.cpp +++ b/examples/sdl_sample/src/sdl_sample.cpp @@ -8,6 +8,9 @@ // Boost #include +// WebRTC +#include + #include "sdl_renderer.h" #ifdef _WIN32 diff --git a/test/connect_disconnect.cpp b/test/connect_disconnect.cpp index 3f1d4d64..a20fee6b 100644 --- a/test/connect_disconnect.cpp +++ b/test/connect_disconnect.cpp @@ -3,6 +3,7 @@ #include // WebRTC +#include #include #ifdef _WIN32 diff --git a/test/e2e.cpp b/test/e2e.cpp index 3d6316ac..caaade17 100644 --- a/test/e2e.cpp +++ b/test/e2e.cpp @@ -4,6 +4,7 @@ #include // WebRTC +#include #include #ifdef _WIN32 From 680a6ed95adaefa7b91f5896024f3da5cf656496 Mon Sep 17 00:00:00 2001 From: torikizi Date: Sat, 24 Aug 2024 00:31:49 +0900 Subject: [PATCH 7/8] =?UTF-8?q?examples=20=E3=82=82=20m128=20=E3=81=AB?= =?UTF-8?q?=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/VERSION b/examples/VERSION index 520a1b4a..0be18c0e 100644 --- a/examples/VERSION +++ b/examples/VERSION @@ -1,5 +1,5 @@ SORA_CPP_SDK_VERSION=2024.7.0 -WEBRTC_BUILD_VERSION=m127.6533.1.1 +WEBRTC_BUILD_VERSION=m128.6613.2.0 BOOST_VERSION=1.85.0 CMAKE_VERSION=3.29.6 SDL2_VERSION=2.30.5 From a6788dba83364b0fb41c370fcaa90f7c03a57869 Mon Sep 17 00:00:00 2001 From: torikizi Date: Wed, 28 Aug 2024 10:58:12 +0900 Subject: [PATCH 8/8] =?UTF-8?q?CHANGES=20=E3=81=AE=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index cf6ae5fe..9cbc8bd8 100644 --- 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