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

Side by Side Diff: webrtc/media/engine/webrtcvideocapturer.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
« no previous file with comments | « no previous file | webrtc/modules/video_capture/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 break; 87 break;
88 } 88 }
89 } 89 }
90 if (webrtc_type == webrtc::kVideoUnknown) { 90 if (webrtc_type == webrtc::kVideoUnknown) {
91 return false; 91 return false;
92 } 92 }
93 93
94 cap->width = format.width; 94 cap->width = format.width;
95 cap->height = format.height; 95 cap->height = format.height;
96 cap->maxFPS = VideoFormat::IntervalToFps(format.interval); 96 cap->maxFPS = VideoFormat::IntervalToFps(format.interval);
97 cap->expectedCaptureDelay = 0;
98 cap->rawType = webrtc_type; 97 cap->rawType = webrtc_type;
99 cap->codecType = webrtc::kVideoCodecUnknown; 98 cap->codecType = webrtc::kVideoCodecUnknown;
100 cap->interlaced = false; 99 cap->interlaced = false;
101 return true; 100 return true;
102 } 101 }
103 102
104 /////////////////////////////////////////////////////////////////////////// 103 ///////////////////////////////////////////////////////////////////////////
105 // Implementation of class WebRtcVideoCapturer 104 // Implementation of class WebRtcVideoCapturer
106 /////////////////////////////////////////////////////////////////////////// 105 ///////////////////////////////////////////////////////////////////////////
107 106
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 if (1 == captured_frames_) { 346 if (1 == captured_frames_) {
348 LOG(LS_INFO) << "Captured frame size " 347 LOG(LS_INFO) << "Captured frame size "
349 << sample.width() << "x" << sample.height() 348 << sample.width() << "x" << sample.height()
350 << ". Expected format " << GetCaptureFormat()->ToString(); 349 << ". Expected format " << GetCaptureFormat()->ToString();
351 } 350 }
352 351
353 VideoCapturer::OnFrame(sample, sample.width(), sample.height()); 352 VideoCapturer::OnFrame(sample, sample.width(), sample.height());
354 } 353 }
355 354
356 } // namespace cricket 355 } // namespace cricket
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/video_capture/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698