From e420968dcbc70b677fb30356951d01d7c556bd16 Mon Sep 17 00:00:00 2001 From: torikizi Date: Wed, 9 Oct 2024 21:14:00 +0900 Subject: [PATCH 1/5] =?UTF-8?q?libwebrtc=20=E3=82=92=20m130.6723.2.0=20?= =?UTF-8?q?=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 +- examples/VERSION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 78fb1d0c..2ab6b5aa 100644 --- a/VERSION +++ b/VERSION @@ -1,5 +1,5 @@ SORA_CPP_SDK_VERSION=2024.8.0-canary.13 -WEBRTC_BUILD_VERSION=m129.6668.1.0 +WEBRTC_BUILD_VERSION=m130.6723.2.0 BOOST_VERSION=1.86.0 CMAKE_VERSION=3.30.4 CUDA_VERSION=11.8.0-1 diff --git a/examples/VERSION b/examples/VERSION index 973b3d64..7ddec662 100644 --- a/examples/VERSION +++ b/examples/VERSION @@ -1,5 +1,5 @@ SORA_CPP_SDK_VERSION=2024.8.0-canary.13 -WEBRTC_BUILD_VERSION=m129.6668.1.0 +WEBRTC_BUILD_VERSION=m130.6723.2.0 BOOST_VERSION=1.86.0 CMAKE_VERSION=3.30.4 SDL2_VERSION=2.30.8 From 4f1a460000752e5ec6c5e2b133337a140b5d4097 Mon Sep 17 00:00:00 2001 From: torikizi Date: Wed, 16 Oct 2024 11:08:09 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89=E3=82=A8?= =?UTF-8?q?=E3=83=A9=E3=83=BC=E3=82=92=E4=BF=AE=E6=AD=A3=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/sora/scalable_track_source.h | 2 +- src/scalable_track_source.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/sora/scalable_track_source.h b/include/sora/scalable_track_source.h index c8c4d365..7d0b0160 100644 --- a/include/sora/scalable_track_source.h +++ b/include/sora/scalable_track_source.h @@ -31,7 +31,7 @@ class ScalableVideoTrackSource : public rtc::AdaptedVideoTrackSource { virtual ~ScalableVideoTrackSource(); bool is_screencast() const override; - absl::optional needs_denoising() const override; + std::optional needs_denoising() const override; webrtc::MediaSourceInterface::SourceState state() const override; bool remote() const override; bool OnCapturedFrame(const webrtc::VideoFrame& frame); diff --git a/src/scalable_track_source.cpp b/src/scalable_track_source.cpp index f7de5ad7..d8f7b0f5 100644 --- a/src/scalable_track_source.cpp +++ b/src/scalable_track_source.cpp @@ -33,7 +33,7 @@ bool ScalableVideoTrackSource::is_screencast() const { return false; } -absl::optional ScalableVideoTrackSource::needs_denoising() const { +std::optional ScalableVideoTrackSource::needs_denoising() const { return false; } From 06fe012e75a893eb336c9c718f0c09d7e743e4a8 Mon Sep 17 00:00:00 2001 From: torikizi Date: Wed, 16 Oct 2024 11:46:15 +0900 Subject: [PATCH 3/5] =?UTF-8?q?Windows=20=E3=81=A8=20Ubutnu=20=E3=81=AE?= =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=AB?= =?UTF-8?q?=E5=AF=BE=E5=BF=9C=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/sora/hwenc_nvcodec/nvcodec_video_decoder.h | 2 ++ include/sora/hwenc_vpl/vpl_video_decoder.h | 1 + src/hwenc_nvcodec/nvcodec_video_decoder.cpp | 4 ++-- src/hwenc_vpl/vpl_video_decoder.cpp | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/include/sora/hwenc_nvcodec/nvcodec_video_decoder.h b/include/sora/hwenc_nvcodec/nvcodec_video_decoder.h index ceed5f93..c1efbde9 100644 --- a/include/sora/hwenc_nvcodec/nvcodec_video_decoder.h +++ b/include/sora/hwenc_nvcodec/nvcodec_video_decoder.h @@ -1,6 +1,8 @@ #ifndef SORA_HWENC_NVCODEC_NVCODEC_VIDEO_DECODER_H_ #define SORA_HWENC_NVCODEC_NVCODEC_VIDEO_DECODER_H_ +#include + // WebRTC #include #include diff --git a/include/sora/hwenc_vpl/vpl_video_decoder.h b/include/sora/hwenc_vpl/vpl_video_decoder.h index 2ab8157a..3d34e87b 100644 --- a/include/sora/hwenc_vpl/vpl_video_decoder.h +++ b/include/sora/hwenc_vpl/vpl_video_decoder.h @@ -2,6 +2,7 @@ #define SORA_HWENC_VPL_VPL_VIDEO_DECODER_H_ #include +#include // WebRTC #include diff --git a/src/hwenc_nvcodec/nvcodec_video_decoder.cpp b/src/hwenc_nvcodec/nvcodec_video_decoder.cpp index cd15b418..16f85ec6 100644 --- a/src/hwenc_nvcodec/nvcodec_video_decoder.cpp +++ b/src/hwenc_nvcodec/nvcodec_video_decoder.cpp @@ -113,8 +113,8 @@ int32_t NvCodecVideoDecoder::Decode(const webrtc::EncodedImage& input_image, .set_video_frame_buffer(i420_buffer) .set_timestamp_rtp(pts) .build(); - decode_complete_callback_->Decoded(decoded_image, absl::nullopt, - absl::nullopt); + decode_complete_callback_->Decoded(decoded_image, std::nullopt, + std::nullopt); decoder_->UnlockFrame(frame); } diff --git a/src/hwenc_vpl/vpl_video_decoder.cpp b/src/hwenc_vpl/vpl_video_decoder.cpp index 5b837ba4..606f6ccc 100644 --- a/src/hwenc_vpl/vpl_video_decoder.cpp +++ b/src/hwenc_vpl/vpl_video_decoder.cpp @@ -310,8 +310,8 @@ int32_t VplVideoDecoderImpl::Decode(const webrtc::EncodedImage& input_image, .set_video_frame_buffer(i420_buffer) .set_timestamp_rtp(pts) .build(); - decode_complete_callback_->Decoded(decoded_image, absl::nullopt, - absl::nullopt); + decode_complete_callback_->Decoded(decoded_image, std::nullopt, + std::nullopt); } return WEBRTC_VIDEO_CODEC_OK; From b968be2187e00f355335c956ed2d096a5d5abeda Mon Sep 17 00:00:00 2001 From: torikizi Date: Wed, 16 Oct 2024 12:17:07 +0900 Subject: [PATCH 4/5] =?UTF-8?q?test/android=20=E3=81=AE=20cmake=20?= =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=92=20SDK=20?= =?UTF-8?q?=E3=81=AE=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=81=AB?= =?UTF-8?q?=E5=90=88=E3=82=8F=E3=81=9B=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/android/app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/android/app/build.gradle b/test/android/app/build.gradle index 1f763091..d2197a40 100644 --- a/test/android/app/build.gradle +++ b/test/android/app/build.gradle @@ -65,7 +65,7 @@ android { externalNativeBuild { cmake { path file('src/main/cpp/CMakeLists.txt') - version '3.30.3' + version '3.30.4' } } buildFeatures { From 9025734f71221cea2c0314710b123ff222a3efee Mon Sep 17 00:00:00 2001 From: torikizi Date: Wed, 16 Oct 2024 12:35:02 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=E5=A4=89=E6=9B=B4=E5=B1=A5=E6=AD=B4?= =?UTF-8?q?=E3=82=92=E6=9B=B4=E6=96=B0=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 764d6cf1..7014494c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -17,10 +17,14 @@ - @voluntas - [UPDATE] Boost を 1.86.0 にあげる - @voluntas -- [UPDATE] libwebrtc を m129.6668.1.0 にあげる +- [UPDATE] libwebrtc を m130.6723.2.0 にあげる - H.265 Patch の修正に伴い、C++ SDK の H.265 に関する設定を変更 - examples と test に `rtc::CreateRandomString` のヘッダを追加 - `SetRtpTimestamp` を `frame.timestamp` から `frame.rtp_timestamp` に変更 + - `scalable_track_source.h` と `scalable_track_source.cpp` の `absl::optional` を `std::optional` に変更 + - `nvcodec_video_decoder.h` と `vpl_video_decoder.h` に `#include ` を追加 + - `nvcodec_video_decoder.cpp` と `vpl_video_decoder.cpp` の `absl::nullopt` を `std::nullopt` に変更 + - Android の test アプリの cmake バージョンを VERSION と合わせる - @tnoho @torikizi - [UPDATE] Xcode のバージョンを 15.4 にあげる - @tnoho