OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "content/browser/media/capture/video_capture_oracle.h" | 5 #include "content/browser/media/capture/video_capture_oracle.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/format_macros.h" | 9 #include "base/format_macros.h" |
10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
113 int VideoCaptureOracle::RecordCapture() { | 113 int VideoCaptureOracle::RecordCapture() { |
114 smoothing_sampler_.RecordSample(); | 114 smoothing_sampler_.RecordSample(); |
115 content_sampler_.RecordSample(GetFrameTimestamp(frame_number_)); | 115 content_sampler_.RecordSample(GetFrameTimestamp(frame_number_)); |
116 return frame_number_++; | 116 return frame_number_++; |
117 } | 117 } |
118 | 118 |
119 bool VideoCaptureOracle::CompleteCapture(int frame_number, | 119 bool VideoCaptureOracle::CompleteCapture(int frame_number, |
120 base::TimeTicks* frame_timestamp) { | 120 base::TimeTicks* frame_timestamp) { |
121 // Drop frame if previous frame number is higher. | 121 // Drop frame if previous frame number is higher. |
122 if (last_delivered_frame_number_ > frame_number) { | 122 if (last_delivered_frame_number_ > frame_number) { |
123 LOG(WARNING) << "Out of order frame delivery detected. Dropping frame."; | 123 LOG(WARNING) << "Out of order frame delivery detected (have #" |
| 124 << frame_number << ", last was #" |
| 125 << last_delivered_frame_number_ << "). Dropping frame."; |
124 return false; | 126 return false; |
125 } | 127 } |
126 last_delivered_frame_number_ = frame_number; | 128 last_delivered_frame_number_ = frame_number; |
127 | 129 |
128 *frame_timestamp = GetFrameTimestamp(frame_number); | 130 *frame_timestamp = GetFrameTimestamp(frame_number); |
129 | 131 |
130 // If enabled, log a measurement of how this frame timestamp has incremented | 132 // If enabled, log a measurement of how this frame timestamp has incremented |
131 // in relation to an ideal increment. | 133 // in relation to an ideal increment. |
132 if (VLOG_IS_ON(2) && frame_number > 0) { | 134 if (VLOG_IS_ON(2) && frame_number > 0) { |
133 const base::TimeDelta delta = | 135 const base::TimeDelta delta = |
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
418 if (borrowed_time_ >= min_capture_period_) { | 420 if (borrowed_time_ >= min_capture_period_) { |
419 borrowed_time_ -= min_capture_period_; | 421 borrowed_time_ -= min_capture_period_; |
420 frame_timestamp_ = base::TimeTicks(); | 422 frame_timestamp_ = base::TimeTicks(); |
421 } else { | 423 } else { |
422 sequence_offset_ += advancement; | 424 sequence_offset_ += advancement; |
423 frame_timestamp_ = timebase + sequence_offset_; | 425 frame_timestamp_ = timebase + sequence_offset_; |
424 } | 426 } |
425 } | 427 } |
426 | 428 |
427 } // namespace content | 429 } // namespace content |
OLD | NEW |