| Index: webrtc/video/vie_encoder.cc
|
| diff --git a/webrtc/video/vie_encoder.cc b/webrtc/video/vie_encoder.cc
|
| index 63b1c80fefbe9b0f0f8afaf95a83dd0f140a3540..f1245ecb5b823c92bbf134bcc0194a87874af5a0 100644
|
| --- a/webrtc/video/vie_encoder.cc
|
| +++ b/webrtc/video/vie_encoder.cc
|
| @@ -622,7 +622,14 @@ void ViEEncoder::OnFrame(const VideoFrame& video_frame) {
|
| VideoFrame incoming_frame = video_frame;
|
|
|
| // Local time in webrtc time base.
|
| - int64_t current_time_ms = clock_->TimeInMilliseconds();
|
| + int64_t current_time_us = clock_->TimeInMicroseconds();
|
| + int64_t current_time_ms = current_time_us / rtc::kNumMicrosecsPerMillisec;
|
| + // In some cases, e.g., when the frame from decoder is fed to encoder,
|
| + // the timestamp may be set to the future. As the encoding pipeline assumes
|
| + // capture time to be less than present time, we should reset the capture
|
| + // timestamps here. Otherwise there may be issues with RTP send stream.
|
| + if (incoming_frame.timestamp_us() > current_time_us)
|
| + incoming_frame.set_timestamp_us(current_time_us);
|
|
|
| // Capture time may come from clock with an offset and drift from clock_.
|
| int64_t capture_ntp_time_ms;
|
|
|