| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 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 296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 307 if (formats.empty()) { | 307 if (formats.empty()) { |
| 308 if (video_capturer_->IsScreencast()) { | 308 if (video_capturer_->IsScreencast()) { |
| 309 // The screen capturer can accept any resolution and we will derive the | 309 // The screen capturer can accept any resolution and we will derive the |
| 310 // format from the constraints if any. | 310 // format from the constraints if any. |
| 311 // Note that this only affects tab capturing, not desktop capturing, | 311 // Note that this only affects tab capturing, not desktop capturing, |
| 312 // since the desktop capturer does not respect the VideoFormat passed in. | 312 // since the desktop capturer does not respect the VideoFormat passed in. |
| 313 formats.push_back(cricket::VideoFormat(kDefaultFormat)); | 313 formats.push_back(cricket::VideoFormat(kDefaultFormat)); |
| 314 } else { | 314 } else { |
| 315 // The VideoCapturer implementation doesn't support capability | 315 // The VideoCapturer implementation doesn't support capability |
| 316 // enumeration. We need to guess what the camera supports. | 316 // enumeration. We need to guess what the camera supports. |
| 317 for (int i = 0; i < arraysize(kVideoFormats); ++i) { | 317 for (uint32_t i = 0; i < arraysize(kVideoFormats); ++i) { |
| 318 formats.push_back(cricket::VideoFormat(kVideoFormats[i])); | 318 formats.push_back(cricket::VideoFormat(kVideoFormats[i])); |
| 319 } | 319 } |
| 320 } | 320 } |
| 321 } | 321 } |
| 322 | 322 |
| 323 if (constraints) { | 323 if (constraints) { |
| 324 MediaConstraintsInterface::Constraints mandatory_constraints = | 324 MediaConstraintsInterface::Constraints mandatory_constraints = |
| 325 constraints->GetMandatory(); | 325 constraints->GetMandatory(); |
| 326 MediaConstraintsInterface::Constraints optional_constraints; | 326 MediaConstraintsInterface::Constraints optional_constraints; |
| 327 optional_constraints = constraints->GetOptional(); | 327 optional_constraints = constraints->GetOptional(); |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 400 capture_state)); | 400 capture_state)); |
| 401 return; | 401 return; |
| 402 } | 402 } |
| 403 | 403 |
| 404 if (capturer == video_capturer_.get()) { | 404 if (capturer == video_capturer_.get()) { |
| 405 SetState(GetReadyState(capture_state)); | 405 SetState(GetReadyState(capture_state)); |
| 406 } | 406 } |
| 407 } | 407 } |
| 408 | 408 |
| 409 } // namespace webrtc | 409 } // namespace webrtc |
| OLD | NEW |