Merge pull request #32 from shiguredo/feature/update-sora-cpp-sdk-202…

…4.1.0 C++ SDK のバージョンを 2024.1.0 に上げる
shiguredo · Mar 7, 2024 · 39982e3 · 39982e3
2 parents 27e598d + 524924b
commit 39982e3
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git 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

diff --git 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/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<webrtc::Call> 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<webrtc::DegradedCall::TimeScopedNetworkConfig> receive_config =
         {receive_config_};
-    return new webrtc::DegradedCall(std::unique_ptr<webrtc::Call>(call),
-                                    send_config, receive_config);
+    return std::make_unique<webrtc::DegradedCall>(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
@@ -17,7 +17,8 @@ class FakeNetworkCallFactory : public webrtc::CallFactoryInterface {
 
  private:
   ~FakeNetworkCallFactory() override {}
-  webrtc::Call* CreateCall(const webrtc::CallConfig& config) override;
+  std::unique_ptr<webrtc::Call> CreateCall(
+      const webrtc::CallConfig& config) override;
 
   webrtc::DegradedCall::TimeScopedNetworkConfig send_config_;
   webrtc::DegradedCall::TimeScopedNetworkConfig receive_config_;

diff --git 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);