From 3690a8b55885449cf5c003a5546cf70091b6d09b Mon Sep 17 00:00:00 2001 From: enm10k Date: Mon, 27 Nov 2023 12:09:29 +0900 Subject: [PATCH] =?UTF-8?q?hwenc=5Fjetson=20=E3=82=82=20webrtc::EncodedIma?= =?UTF-8?q?ge=20=E3=81=AE=20API=20=E3=81=AE=E5=A4=89=E6=9B=B4=E3=81=AE?= =?UTF-8?q?=E8=BF=BD=E5=BE=93=E3=81=8C=E5=BF=85=E8=A6=81=E3=81=A0=E3=81=A3?= =?UTF-8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hwenc_jetson/jetson_video_decoder.cpp | 6 +++--- src/hwenc_jetson/jetson_video_encoder.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/hwenc_jetson/jetson_video_decoder.cpp b/src/hwenc_jetson/jetson_video_decoder.cpp index e37c95f8..4bb9d805 100644 --- a/src/hwenc_jetson/jetson_video_decoder.cpp +++ b/src/hwenc_jetson/jetson_video_decoder.cpp @@ -125,16 +125,16 @@ int32_t JetsonVideoDecoder::Decode(const webrtc::EncodedImage& input_image, v4l2_buf.flags |= V4L2_BUF_FLAG_TIMESTAMP_COPY; v4l2_buf.timestamp.tv_sec = - input_image.Timestamp() / rtc::kNumMicrosecsPerSec; + input_image.RtpTimestamp() / rtc::kNumMicrosecsPerSec; v4l2_buf.timestamp.tv_usec = - input_image.Timestamp() % rtc::kNumMicrosecsPerSec; + input_image.RtpTimestamp() % rtc::kNumMicrosecsPerSec; if (decoder_->output_plane.qBuffer(v4l2_buf, nullptr) < 0) { RTC_LOG(LS_ERROR) << "Failed to qBuffer at encoder output_plane"; return WEBRTC_VIDEO_CODEC_ERROR; } - RTC_LOG(LS_INFO) << __FUNCTION__ << " timestamp:" << input_image.Timestamp() + RTC_LOG(LS_INFO) << __FUNCTION__ << " timestamp:" << input_image.RtpTimestamp() << " bytesused:" << buffer->planes[0].bytesused; return WEBRTC_VIDEO_CODEC_OK; } diff --git a/src/hwenc_jetson/jetson_video_encoder.cpp b/src/hwenc_jetson/jetson_video_encoder.cpp index 4d27e23a..bbf8c582 100644 --- a/src/hwenc_jetson/jetson_video_encoder.cpp +++ b/src/hwenc_jetson/jetson_video_encoder.cpp @@ -776,7 +776,7 @@ int32_t JetsonVideoEncoder::SendFrame( return WEBRTC_VIDEO_CODEC_UNINITIALIZED; } - encoded_image_.SetTimestamp(params->timestamp_rtp); + encoded_image_.SetRtpTimestamp(params->timestamp_rtp); encoded_image_.SetColorSpace(params->color_space); encoded_image_._encodedWidth = params->width; encoded_image_._encodedHeight = params->height;