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

Side by Side Diff: webrtc/media/engine/webrtcvideocapturer.cc

Issue 2668693008: Delete VideoCaptureCapability::codecType and related logic. (Closed)
Patch Set: Attempt to fix DeviceInfoImpl::GetBestMatchedCapability. 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/device_info_impl.cc » ('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 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
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->rawType = webrtc_type; 97 cap->rawType = webrtc_type;
98 cap->codecType = webrtc::kVideoCodecUnknown;
99 cap->interlaced = false; 98 cap->interlaced = false;
100 return true; 99 return true;
101 } 100 }
102 101
103 /////////////////////////////////////////////////////////////////////////// 102 ///////////////////////////////////////////////////////////////////////////
104 // Implementation of class WebRtcVideoCapturer 103 // Implementation of class WebRtcVideoCapturer
105 /////////////////////////////////////////////////////////////////////////// 104 ///////////////////////////////////////////////////////////////////////////
106 105
107 WebRtcVideoCapturer::WebRtcVideoCapturer() 106 WebRtcVideoCapturer::WebRtcVideoCapturer()
108 : factory_(new WebRtcVcmFactory), 107 : factory_(new WebRtcVcmFactory),
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 if (1 == captured_frames_) { 345 if (1 == captured_frames_) {
347 LOG(LS_INFO) << "Captured frame size " 346 LOG(LS_INFO) << "Captured frame size "
348 << sample.width() << "x" << sample.height() 347 << sample.width() << "x" << sample.height()
349 << ". Expected format " << GetCaptureFormat()->ToString(); 348 << ". Expected format " << GetCaptureFormat()->ToString();
350 } 349 }
351 350
352 VideoCapturer::OnFrame(sample, sample.width(), sample.height()); 351 VideoCapturer::OnFrame(sample, sample.width(), sample.height());
353 } 352 }
354 353
355 } // namespace cricket 354 } // namespace cricket
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/video_capture/device_info_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698