From d0ce5842906396cc8e033e8f5ff5afd764b07a38 Mon Sep 17 00:00:00 2001 From: torikizi Date: Wed, 2 Oct 2024 18:22:18 +0900 Subject: [PATCH 1/5] =?UTF-8?q?m129.6668.1.0=20=E3=81=AB=E4=B8=8A=E3=81=92?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index a55ab238..758e8d70 100644 --- 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 From 72f2a91335da300202472e34d258ed6249c2d6e0 Mon Sep 17 00:00:00 2001 From: torikizi Date: Wed, 2 Oct 2024 18:56:00 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sora-cpp-sdk/src/hwenc_nvcodec/nvcodec_video_encoder.cpp | 1 + src/sora-cpp-sdk/src/hwenc_vpl/vpl_video_encoder.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 index 3ac6a6ad..c67651fe 100644 --- 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 +#include #include #include #include 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 index 94ea603d..e2b1154e 100644 --- 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(); From 7e69acb22c4f64d15204a44c9be0907970c40ac5 Mon Sep 17 00:00:00 2001 From: torikizi Date: Wed, 2 Oct 2024 20:40:39 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=E5=AF=BE=E5=BF=9C=E3=81=8C=E4=B8=8D?= =?UTF-8?q?=E8=B6=B3=E3=81=97=E3=81=A6=E3=81=84=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hwenc_v4l2/v4l2_h264_encoder.cpp | 2 +- src/sora-cpp-sdk/src/hwenc_nvcodec/nvcodec_video_encoder.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hwenc_v4l2/v4l2_h264_encoder.cpp b/src/hwenc_v4l2/v4l2_h264_encoder.cpp index 8b164943..5b33eea0 100644 --- a/src/hwenc_v4l2/v4l2_h264_encoder.cpp +++ b/src/hwenc_v4l2/v4l2_h264_encoder.cpp @@ -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_nvcodec/nvcodec_video_encoder.cpp b/src/sora-cpp-sdk/src/hwenc_nvcodec/nvcodec_video_encoder.cpp index c67651fe..2e09078b 100644 --- a/src/sora-cpp-sdk/src/hwenc_nvcodec/nvcodec_video_encoder.cpp +++ b/src/sora-cpp-sdk/src/hwenc_nvcodec/nvcodec_video_encoder.cpp @@ -352,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(); From 2aafa936d2aaa100ad82ae7206606432063e41dd Mon Sep 17 00:00:00 2001 From: torikizi Date: Thu, 3 Oct 2024 10:09:17 +0900 Subject: [PATCH 4/5] =?UTF-8?q?v4l2=20=E3=81=A8=20jetson=20=E3=81=AE=20enc?= =?UTF-8?q?oder=20=E3=82=82=E5=AF=BE=E8=B1=A1=E3=81=A0=E3=81=A3=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hwenc_v4l2/v4l2_h264_encoder.cpp | 2 +- src/sora-cpp-sdk/src/hwenc_jetson/jetson_video_encoder.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hwenc_v4l2/v4l2_h264_encoder.cpp b/src/hwenc_v4l2/v4l2_h264_encoder.cpp index 5b33eea0..4db30087 100644 --- 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(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 buffer, int64_t timestamp_rtp) { 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 index 9f5c66b8..dec3209c 100644 --- 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( 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)); } From 79a110d3d585ec95fa6b0759535f3ee01df82f85 Mon Sep 17 00:00:00 2001 From: torikizi <51085972+torikizi@users.noreply.github.com> Date: Mon, 16 Dec 2024 12:24:10 +0900 Subject: [PATCH 5/5] =?UTF-8?q?CHANGES=20=E3=82=92=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index b283fee9..437262b0 100644 --- 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 + - [UPDATE] SDL を 2.30.8 に上げる - @torikizi