Merge pull request #368 from shiguredo/feauture/update-webrtc-m129.66…

…68.1.0 m129.6668.1.0 に上げる
shiguredo · Dec 17, 2024 · 4946189 · 4946189
2 parents 540a2d6 + 0a28fc7
commit 4946189
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -11,6 +11,11 @@
 
 ## develop
 
+- [UPDATE] WebRTC を m129.6668.1.0 に上げる
+  - アップデートに伴い、nvcodec_video_encoder.cpp に `video_frame.h` のインクルードを追加
+  - jetson_video_encoder と nvcodec_video_encoder、vpl_video_encoder の `frame.timestamp()` を `frame.rtp_timestamp()` に変更
+  - @torikizi
+
 ### misc
 
 - [UPDATE] SDL を 2.30.8 に上げる

diff --git a/VERSION b/VERSION
@@ -1,5 +1,5 @@
 MOMO_VERSION=2024.1.0
-WEBRTC_BUILD_VERSION=m128.6613.2.0
+WEBRTC_BUILD_VERSION=m129.6668.1.0
 BOOST_VERSION=1.86.0
 CLI11_VERSION=v2.4.2
 SDL2_VERSION=2.30.8

diff --git a/src/hwenc_v4l2/v4l2_h264_encoder.cpp b/src/hwenc_v4l2/v4l2_h264_encoder.cpp
@@ -262,7 +262,7 @@ int32_t V4L2H264Encoder::Encode(
       auto native_buffer = static_cast<V4L2NativeBuffer*>(frame_buffer.get());
       jpeg_decoder_->Decode(
           native_buffer->data().get(), native_buffer->size(),
-          input_frame.timestamp(),
+          input_frame.rtp_timestamp(),
           [this, force_key_frame, input_frame](
               rtc::scoped_refptr<webrtc::VideoFrameBuffer> buffer,
               int64_t timestamp_rtp) {
@@ -309,7 +309,7 @@ int32_t V4L2H264Encoder::SendFrame(const webrtc::VideoFrame& frame,
   encoded_image_._encodedHeight = frame.height();
   encoded_image_.capture_time_ms_ = frame.render_time_ms();
   encoded_image_.ntp_time_ms_ = frame.ntp_time_ms();
-  encoded_image_.SetRtpTimestamp(frame.timestamp());
+  encoded_image_.SetRtpTimestamp(frame.rtp_timestamp());
   encoded_image_.rotation_ = frame.rotation();
   encoded_image_.SetColorSpace(frame.color_space());
   encoded_image_._frameType = is_key_frame

diff --git a/src/sora-cpp-sdk/src/hwenc_jetson/jetson_video_encoder.cpp b/src/sora-cpp-sdk/src/hwenc_jetson/jetson_video_encoder.cpp
@@ -627,7 +627,7 @@ int32_t JetsonVideoEncoder::Encode(
     frame_params_.push(absl::make_unique<FrameParams>(
         frame_buffer->width(), frame_buffer->height(),
         input_frame.render_time_ms(), input_frame.ntp_time_ms(),
-        input_frame.timestamp_us(), input_frame.timestamp(),
+        input_frame.timestamp_us(), input_frame.rtp_timestamp(),
         input_frame.rotation(), input_frame.color_space(), decoder));
   }
 

diff --git a/src/sora-cpp-sdk/src/hwenc_nvcodec/nvcodec_video_encoder.cpp b/src/sora-cpp-sdk/src/hwenc_nvcodec/nvcodec_video_encoder.cpp
@@ -14,6 +14,7 @@
 
 // WebRTC
 #include <api/video/nv12_buffer.h>
+#include <api/video/video_frame.h>
 #include <common_video/h264/h264_bitstream_parser.h>
 #include <common_video/h265/h265_bitstream_parser.h>
 #include <common_video/include/bitrate_adjuster.h>
@@ -351,7 +352,7 @@ int32_t NvCodecVideoEncoderImpl::Encode(
             ? webrtc::VideoContentType::SCREENSHARE
             : webrtc::VideoContentType::UNSPECIFIED;
     encoded_image_.timing_.flags = webrtc::VideoSendTiming::kInvalid;
-    encoded_image_.SetRtpTimestamp(frame.timestamp());
+    encoded_image_.SetRtpTimestamp(frame.rtp_timestamp());
     encoded_image_.ntp_time_ms_ = frame.ntp_time_ms();
     encoded_image_.capture_time_ms_ = frame.render_time_ms();
     encoded_image_.rotation_ = frame.rotation();

diff --git a/src/sora-cpp-sdk/src/hwenc_vpl/vpl_video_encoder.cpp b/src/sora-cpp-sdk/src/hwenc_vpl/vpl_video_encoder.cpp
@@ -536,7 +536,7 @@ int32_t VplVideoEncoderImpl::Encode(
             ? webrtc::VideoContentType::SCREENSHARE
             : webrtc::VideoContentType::UNSPECIFIED;
     encoded_image_.timing_.flags = webrtc::VideoSendTiming::kInvalid;
-    encoded_image_.SetRtpTimestamp(frame.timestamp());
+    encoded_image_.SetRtpTimestamp(frame.rtp_timestamp());
     encoded_image_.ntp_time_ms_ = frame.ntp_time_ms();
     encoded_image_.capture_time_ms_ = frame.render_time_ms();
     encoded_image_.rotation_ = frame.rotation();