| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 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 |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 148 _lastProcessTime(TickTime::Now()), | 148 _lastProcessTime(TickTime::Now()), |
| 149 _lastFrameRateCallbackTime(TickTime::Now()), | 149 _lastFrameRateCallbackTime(TickTime::Now()), |
| 150 _frameRateCallBack(false), | 150 _frameRateCallBack(false), |
| 151 _noPictureAlarmCallBack(false), | 151 _noPictureAlarmCallBack(false), |
| 152 _captureAlarm(Cleared), | 152 _captureAlarm(Cleared), |
| 153 _setCaptureDelay(0), | 153 _setCaptureDelay(0), |
| 154 _dataCallBack(NULL), | 154 _dataCallBack(NULL), |
| 155 _captureCallBack(NULL), | 155 _captureCallBack(NULL), |
| 156 _lastProcessFrameCount(TickTime::Now()), | 156 _lastProcessFrameCount(TickTime::Now()), |
| 157 _rotateFrame(kVideoRotation_0), | 157 _rotateFrame(kVideoRotation_0), |
| 158 apply_rotation_(true) { | 158 apply_rotation_(false) { |
| 159 _requestedCapability.width = kDefaultWidth; | 159 _requestedCapability.width = kDefaultWidth; |
| 160 _requestedCapability.height = kDefaultHeight; | 160 _requestedCapability.height = kDefaultHeight; |
| 161 _requestedCapability.maxFPS = 30; | 161 _requestedCapability.maxFPS = 30; |
| 162 _requestedCapability.rawType = kVideoI420; | 162 _requestedCapability.rawType = kVideoI420; |
| 163 _requestedCapability.codecType = kVideoCodecUnknown; | 163 _requestedCapability.codecType = kVideoCodecUnknown; |
| 164 memset(_incomingFrameTimes, 0, sizeof(_incomingFrameTimes)); | 164 memset(_incomingFrameTimes, 0, sizeof(_incomingFrameTimes)); |
| 165 } | 165 } |
| 166 | 166 |
| 167 VideoCaptureImpl::~VideoCaptureImpl() | 167 VideoCaptureImpl::~VideoCaptureImpl() |
| 168 { | 168 { |
| (...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 382 if (diff > 0) | 382 if (diff > 0) |
| 383 { | 383 { |
| 384 return uint32_t((nrOfFrames * 1000.0f / diff) + 0.5f); | 384 return uint32_t((nrOfFrames * 1000.0f / diff) + 0.5f); |
| 385 } | 385 } |
| 386 } | 386 } |
| 387 | 387 |
| 388 return nrOfFrames; | 388 return nrOfFrames; |
| 389 } | 389 } |
| 390 } // namespace videocapturemodule | 390 } // namespace videocapturemodule |
| 391 } // namespace webrtc | 391 } // namespace webrtc |
| OLD | NEW |