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

…3.17.0 Sora C++ SDK を 2023.17.0 に上げる
shiguredo · Dec 25, 2023 · ff6c5e7 · ff6c5e7
2 parents 2c275de + 7cc5c45
commit ff6c5e7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -21,10 +21,11 @@
   - @tnoho
 - [ADD] AudioStreamSink が返す音声フレームとして pickel が可能な AudioFrame を追加
   - @tnoho
-- [UPDATE] Sora C++ SDK のバージョンを 2023.15.0 に上げる
+- [UPDATE] Sora C++ SDK のバージョンを 2023.17.0 に上げる
   - WebRTC m116 で cricket::Codec は protected になったので cricket::CreateVideoCodec に修正する
   - WebRTC m118 でパッケージディレクトリが変更されたためそれに追従する
-  - WEBRTC_BUILD_VERSION を `m119.6045.2.1` に上げる
+  - WebRTC m120 の webrtc::EncodedImage API の変更に追従する
+  - WEBRTC_BUILD_VERSION を `m120.6099.1.2` に上げる
   - BOOST_VERSION を `1.83.0` に上げる
   - CMAKE_VERSION を `3.27.7` に上げる
   - @voluntas @miosakuma

diff --git a/VERSION b/VERSION
@@ -1,5 +1,5 @@
-SORA_CPP_SDK_VERSION=2023.15.0
-WEBRTC_BUILD_VERSION=m119.6045.2.1
+SORA_CPP_SDK_VERSION=2023.17.0
+WEBRTC_BUILD_VERSION=m120.6099.1.2
 BOOST_VERSION=1.83.0
 LYRA_VERSION=1.3.0
 CMAKE_VERSION=3.27.7

diff --git a/src/dynamic_h264_decoder.cpp b/src/dynamic_h264_decoder.cpp
@@ -121,7 +121,7 @@ int32_t DynamicH264Decoder::Decode(const EncodedImage& input_image,
   webrtc::VideoFrame video_frame =
       webrtc::VideoFrame::Builder()
           .set_video_frame_buffer(i420_buffer)
-          .set_timestamp_rtp(input_image.Timestamp())
+          .set_timestamp_rtp(input_image.RtpTimestamp())
           .build();
   if (input_image.ColorSpace() != nullptr) {
     video_frame.set_color_space(*input_image.ColorSpace());

diff --git a/src/dynamic_h264_encoder.cpp b/src/dynamic_h264_encoder.cpp
@@ -544,7 +544,7 @@ int32_t DynamicH264Encoder::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].SetColorSpace(input_frame.color_space());
     encoded_images_[i]._frameType = ConvertToVideoFrameType(info.eFrameType);
     encoded_images_[i].SetSimulcastIndex(configurations_[i].simulcast_idx);