| Index: webrtc/video/video_capture_input.cc
|
| diff --git a/webrtc/video/video_capture_input.cc b/webrtc/video/video_capture_input.cc
|
| index 8f574e21154d7abddca59dcf46b28d476866d5dc..5523159640656f31369761832cc16d5229866dff 100644
|
| --- a/webrtc/video/video_capture_input.cc
|
| +++ b/webrtc/video/video_capture_input.cc
|
| @@ -44,11 +44,6 @@ VideoCaptureInput::~VideoCaptureInput() {
|
| }
|
|
|
| void VideoCaptureInput::IncomingCapturedFrame(const VideoFrame& video_frame) {
|
| - // TODO(pbos): Remove local rendering, it should be handled by the client code
|
| - // if required.
|
| - if (local_renderer_)
|
| - local_renderer_->OnFrame(video_frame);
|
| -
|
| stats_proxy_->OnIncomingFrame(video_frame.width(), video_frame.height());
|
|
|
| VideoFrame incoming_frame = video_frame;
|
| @@ -73,6 +68,11 @@ void VideoCaptureInput::IncomingCapturedFrame(const VideoFrame& video_frame) {
|
| incoming_frame.set_timestamp(
|
| kMsToRtpTimestamp * static_cast<uint32_t>(incoming_frame.ntp_time_ms()));
|
|
|
| + // TODO(pbos): Remove local rendering, it should be handled by the client code
|
| + // if required.
|
| + if (local_renderer_)
|
| + local_renderer_->OnFrame(incoming_frame);
|
| +
|
| rtc::CritScope lock(&crit_);
|
| if (incoming_frame.ntp_time_ms() <= last_captured_timestamp_) {
|
| // We don't allow the same capture time for two frames, drop this one.
|
|
|