From 06b969f7ebb65db9d88100e29a50a6aabcbb0cf8 Mon Sep 17 00:00:00 2001 From: voluntas Date: Tue, 30 Jan 2024 19:38:15 +0900 Subject: [PATCH 1/3] =?UTF-8?q?C++=20SDK=20=E3=81=AE=E3=83=90=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=92=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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 2c029b9..373a23c 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ ZAKURO_VERSION=2023.1.0 -SORA_CPP_SDK_VERSION=2023.16.0 -WEBRTC_BUILD_VERSION=m119.6045.2.1 +SORA_CPP_SDK_VERSION=2024.1.0 +WEBRTC_BUILD_VERSION=m120.6099.1.2 BOOST_VERSION=1.83.0 LYRA_VERSION=1.3.0 CLI11_VERSION=v2.3.2 From 578ec1f3304528b2f17522408b40185b52388569 Mon Sep 17 00:00:00 2001 From: torikizi Date: Tue, 30 Jan 2024 23:40:30 +0900 Subject: [PATCH 2/3] =?UTF-8?q?webrtc::EncodedImage=20=E3=81=AE=20API=20?= =?UTF-8?q?=E3=81=AE=E5=A4=89=E6=9B=B4=E3=81=AB=E8=BF=BD=E5=BE=93=E3=81=99?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/dynamic_h264_video_encoder.cpp | 2 +- src/nop_video_decoder.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dynamic_h264_video_encoder.cpp b/src/dynamic_h264_video_encoder.cpp index 441e32c..c65fc91 100644 --- a/src/dynamic_h264_video_encoder.cpp +++ b/src/dynamic_h264_video_encoder.cpp @@ -512,7 +512,7 @@ int32_t DynamicH264VideoEncoder::Encode( encoded_images_[i]._encodedWidth = configurations_[i].width; encoded_images_[i]._encodedHeight = configurations_[i].height; - encoded_images_[i].SetTimestamp(input_frame.timestamp()); + encoded_images_[i].SetRtpTimestamp(input_frame.timestamp()); encoded_images_[i]._frameType = ConvertToVideoFrameType(info.eFrameType); encoded_images_[i].SetSpatialIndex(configurations_[i].simulcast_idx); diff --git a/src/nop_video_decoder.cpp b/src/nop_video_decoder.cpp index 99e5f2b..782cca3 100644 --- a/src/nop_video_decoder.cpp +++ b/src/nop_video_decoder.cpp @@ -25,7 +25,7 @@ int32_t NopVideoDecoder::Decode(const webrtc::EncodedImage& input_image, webrtc::VideoFrame decoded_image = webrtc::VideoFrame::Builder() .set_video_frame_buffer(i420_buffer) - .set_timestamp_rtp(input_image.Timestamp()) + .set_timestamp_rtp(input_image.RtpTimestamp()) .build(); callback_->Decoded(decoded_image, absl::nullopt, absl::nullopt); From 27e8e8f9523faea083a7ef4987e3b59e335a57b5 Mon Sep 17 00:00:00 2001 From: melpon Date: Sat, 17 Feb 2024 19:26:51 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=83=91=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/fake_network_call_factory.cpp | 10 +++++----- src/fake_network_call_factory.h | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/fake_network_call_factory.cpp b/src/fake_network_call_factory.cpp index cd93049..7be664e 100644 --- a/src/fake_network_call_factory.cpp +++ b/src/fake_network_call_factory.cpp @@ -16,8 +16,8 @@ FakeNetworkCallFactory::FakeNetworkCallFactory( const webrtc::DegradedCall::TimeScopedNetworkConfig& receive_config) : send_config_(send_config), receive_config_(receive_config) {} -webrtc::Call* FakeNetworkCallFactory::CreateCall( - const webrtc::Call::Config& config) { +std::unique_ptr FakeNetworkCallFactory::CreateCall( + const webrtc::CallConfig& config) { webrtc::DegradedCall::TimeScopedNetworkConfig default_config; webrtc::RtpTransportConfig transport_config = config.ExtractTransportConfig(); @@ -27,7 +27,7 @@ webrtc::Call* FakeNetworkCallFactory::CreateCall( bool receive_config_changed = memcmp(&receive_config_, &default_config, sizeof(default_config)) != 0; - webrtc::Call* call = webrtc::Call::Create( + auto call = webrtc::Call::Create( config, webrtc::Clock::GetRealTimeClock(), config.rtp_transport_controller_send_factory->Create( transport_config, webrtc::Clock::GetRealTimeClock())); @@ -37,8 +37,8 @@ webrtc::Call* FakeNetworkCallFactory::CreateCall( send_config_}; std::vector receive_config = {receive_config_}; - return new webrtc::DegradedCall(std::unique_ptr(call), - send_config, receive_config); + return std::make_unique(std::move(call), send_config, + receive_config); } return call; diff --git a/src/fake_network_call_factory.h b/src/fake_network_call_factory.h index 8ae6370..511d6a1 100644 --- a/src/fake_network_call_factory.h +++ b/src/fake_network_call_factory.h @@ -17,7 +17,8 @@ class FakeNetworkCallFactory : public webrtc::CallFactoryInterface { private: ~FakeNetworkCallFactory() override {} - webrtc::Call* CreateCall(const webrtc::CallConfig& config) override; + std::unique_ptr CreateCall( + const webrtc::CallConfig& config) override; webrtc::DegradedCall::TimeScopedNetworkConfig send_config_; webrtc::DegradedCall::TimeScopedNetworkConfig receive_config_;