| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| 11 #include "webrtc/base/checks.h" | 11 #include "webrtc/base/checks.h" |
| 12 #include "webrtc/modules/video_processing/main/interface/video_processing.h" | 12 #include "webrtc/modules/video_processing/include/video_processing.h" |
| 13 #include "webrtc/modules/video_processing/main/source/video_decimator.h" | 13 #include "webrtc/modules/video_processing/video_decimator.h" |
| 14 #include "webrtc/system_wrappers/include/tick_util.h" | 14 #include "webrtc/system_wrappers/include/tick_util.h" |
| 15 | 15 |
| 16 #define VD_MIN(a, b) ((a) < (b)) ? (a) : (b) | 16 #define VD_MIN(a, b) ((a) < (b)) ? (a) : (b) |
| 17 | 17 |
| 18 namespace webrtc { | 18 namespace webrtc { |
| 19 | 19 |
| 20 VPMVideoDecimator::VPMVideoDecimator() { | 20 VPMVideoDecimator::VPMVideoDecimator() { |
| 21 Reset(); | 21 Reset(); |
| 22 } | 22 } |
| 23 | 23 |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 incoming_frame_rate_ = 1.0; | 137 incoming_frame_rate_ = 1.0; |
| 138 if (diff > 0) { | 138 if (diff > 0) { |
| 139 incoming_frame_rate_ = nrOfFrames * 1000.0f / static_cast<float>(diff); | 139 incoming_frame_rate_ = nrOfFrames * 1000.0f / static_cast<float>(diff); |
| 140 } | 140 } |
| 141 } else { | 141 } else { |
| 142 incoming_frame_rate_ = static_cast<float>(nrOfFrames); | 142 incoming_frame_rate_ = static_cast<float>(nrOfFrames); |
| 143 } | 143 } |
| 144 } | 144 } |
| 145 | 145 |
| 146 } // namespace webrtc | 146 } // namespace webrtc |
| OLD | NEW |