Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "remoting/protocol/webrtc_frame_scheduler_simple.h" | 5 #include "remoting/protocol/webrtc_frame_scheduler_simple.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "remoting/protocol/frame_stats.h" | 9 #include "remoting/protocol/frame_stats.h" |
| 10 #include "remoting/protocol/webrtc_dummy_video_encoder.h" | 10 #include "remoting/protocol/webrtc_dummy_video_encoder.h" |
| (...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 171 } | 171 } |
| 172 } | 172 } |
| 173 | 173 |
| 174 bool WebrtcFrameSchedulerSimple::OnFrameCaptured( | 174 bool WebrtcFrameSchedulerSimple::OnFrameCaptured( |
| 175 const webrtc::DesktopFrame* frame, | 175 const webrtc::DesktopFrame* frame, |
| 176 WebrtcVideoEncoder::FrameParams* params_out) { | 176 WebrtcVideoEncoder::FrameParams* params_out) { |
| 177 DCHECK(thread_checker_.CalledOnValidThread()); | 177 DCHECK(thread_checker_.CalledOnValidThread()); |
| 178 | 178 |
| 179 base::TimeTicks now = base::TimeTicks::Now(); | 179 base::TimeTicks now = base::TimeTicks::Now(); |
| 180 | 180 |
| 181 if ((!frame || frame->updated_region().is_empty()) && !top_off_is_active_ && | 181 if ((!frame || frame->updated_region().is_empty())) { |
| 182 !key_frame_request_) { | 182 bool resend_last_frame = |
| 183 frame_pending_ = false; | 183 captured_first_frame_ && (top_off_is_active_ || key_frame_request_); |
| 184 ScheduleNextFrame(now); | 184 if (!resend_last_frame) { |
|
Jamie
2017/03/18 01:53:26
This is pretty complicated logic. I think it would
Sergey Ulanov
2017/03/20 18:24:14
Done.
| |
| 185 return false; | 185 frame_pending_ = false; |
| 186 ScheduleNextFrame(now); | |
| 187 return false; | |
| 188 } | |
| 186 } | 189 } |
| 187 | 190 |
| 188 if (frame) { | 191 if (frame) { |
| 192 captured_first_frame_ = true; | |
| 189 encoder_bitrate_.SetFrameSize(frame->size()); | 193 encoder_bitrate_.SetFrameSize(frame->size()); |
| 190 } | 194 } |
| 191 | 195 |
| 192 params_out->bitrate_kbps = encoder_bitrate_.GetTargetBitrateKbps(); | 196 params_out->bitrate_kbps = encoder_bitrate_.GetTargetBitrateKbps(); |
| 193 params_out->duration = kTargetFrameInterval; | 197 params_out->duration = kTargetFrameInterval; |
| 194 params_out->key_frame = key_frame_request_; | 198 params_out->key_frame = key_frame_request_; |
| 195 key_frame_request_ = false; | 199 key_frame_request_ = false; |
| 196 | 200 |
| 197 params_out->vpx_min_quantizer = 10; | 201 params_out->vpx_min_quantizer = 10; |
| 198 | 202 |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 296 void WebrtcFrameSchedulerSimple::CaptureNextFrame() { | 300 void WebrtcFrameSchedulerSimple::CaptureNextFrame() { |
| 297 DCHECK(thread_checker_.CalledOnValidThread()); | 301 DCHECK(thread_checker_.CalledOnValidThread()); |
| 298 DCHECK(!frame_pending_); | 302 DCHECK(!frame_pending_); |
| 299 last_capture_started_time_ = base::TimeTicks::Now(); | 303 last_capture_started_time_ = base::TimeTicks::Now(); |
| 300 frame_pending_ = true; | 304 frame_pending_ = true; |
| 301 capture_callback_.Run(); | 305 capture_callback_.Run(); |
| 302 } | 306 } |
| 303 | 307 |
| 304 } // namespace protocol | 308 } // namespace protocol |
| 305 } // namespace remoting | 309 } // namespace remoting |
| OLD | NEW |