hwenc_jetson も webrtc::EncodedImage の API の変更の追従が必要だった

shiguredo · Dec 7, 2023 · 3690a8b · 3690a8b
1 parent bd9853a
commit 3690a8b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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;