Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(725)

Side by Side Diff: webrtc/modules/video_capture/video_capture_impl.cc

Issue 2665113006: Delete DeviceInfoImpl::GetExpectedCaptureDelay and related declarations. (Closed)
Patch Set: Drop include of video_capture_delay.h, and definition of WindowsCaptureDelays. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 case kVideoRotation_270: 75 case kVideoRotation_270:
76 *degrees = 270; 76 *degrees = 270;
77 return 0; 77 return 0;
78 } 78 }
79 return -1; 79 return -1;
80 } 80 }
81 81
82 VideoCaptureImpl::VideoCaptureImpl() 82 VideoCaptureImpl::VideoCaptureImpl()
83 : _deviceUniqueId(NULL), 83 : _deviceUniqueId(NULL),
84 _apiCs(*CriticalSectionWrapper::CreateCriticalSection()), 84 _apiCs(*CriticalSectionWrapper::CreateCriticalSection()),
85 _captureDelay(0),
86 _requestedCapability(), 85 _requestedCapability(),
87 _lastProcessTimeNanos(rtc::TimeNanos()), 86 _lastProcessTimeNanos(rtc::TimeNanos()),
88 _lastFrameRateCallbackTimeNanos(rtc::TimeNanos()), 87 _lastFrameRateCallbackTimeNanos(rtc::TimeNanos()),
89 _dataCallBack(NULL), 88 _dataCallBack(NULL),
90 _lastProcessFrameTimeNanos(rtc::TimeNanos()), 89 _lastProcessFrameTimeNanos(rtc::TimeNanos()),
91 _rotateFrame(kVideoRotation_0), 90 _rotateFrame(kVideoRotation_0),
92 apply_rotation_(false) { 91 apply_rotation_(false) {
93 _requestedCapability.width = kDefaultWidth; 92 _requestedCapability.width = kDefaultWidth;
94 _requestedCapability.height = kDefaultHeight; 93 _requestedCapability.height = kDefaultHeight;
95 _requestedCapability.maxFPS = 30; 94 _requestedCapability.maxFPS = 30;
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 if (diff > 0) 260 if (diff > 0)
262 { 261 {
263 return uint32_t((nrOfFrames * 1000.0f / diff) + 0.5f); 262 return uint32_t((nrOfFrames * 1000.0f / diff) + 0.5f);
264 } 263 }
265 } 264 }
266 265
267 return nrOfFrames; 266 return nrOfFrames;
268 } 267 }
269 } // namespace videocapturemodule 268 } // namespace videocapturemodule
270 } // namespace webrtc 269 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_capture/video_capture_impl.h ('k') | webrtc/modules/video_capture/windows/device_info_ds.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698