| 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 | 
| 11 #import "webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info_objc.h" | 11 #import "webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info_objc.h" | 
| 12 #include "webrtc/modules/video_capture/include/video_capture.h" | 12 #include "webrtc/modules/video_capture/include/video_capture.h" | 
| 13 #include "webrtc/modules/video_capture/video_capture_config.h" | 13 #include "webrtc/modules/video_capture/video_capture_config.h" | 
| 14 #include "webrtc/system_wrappers/interface/trace.h" | 14 #include "webrtc/system_wrappers/include/trace.h" | 
| 15 | 15 | 
| 16 namespace webrtc | 16 namespace webrtc | 
| 17 { | 17 { | 
| 18 namespace videocapturemodule | 18 namespace videocapturemodule | 
| 19 { | 19 { | 
| 20 | 20 | 
| 21 VideoCaptureMacQTKitInfo::VideoCaptureMacQTKitInfo(const int32_t id) : | 21 VideoCaptureMacQTKitInfo::VideoCaptureMacQTKitInfo(const int32_t id) : | 
| 22     DeviceInfoImpl(id) | 22     DeviceInfoImpl(id) | 
| 23 { | 23 { | 
| 24     _captureInfo = [[VideoCaptureMacQTKitInfoObjC alloc] init]; | 24     _captureInfo = [[VideoCaptureMacQTKitInfoObjC alloc] init]; | 
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 116 { | 116 { | 
| 117     // Not implemented. Mac doesn't use discrete steps in capabilities, rather | 117     // Not implemented. Mac doesn't use discrete steps in capabilities, rather | 
| 118     // "analog". QTKit will do it's best to convert frames to what ever format | 118     // "analog". QTKit will do it's best to convert frames to what ever format | 
| 119     // you ask for. | 119     // you ask for. | 
| 120     WEBRTC_TRACE(webrtc::kTraceInfo, webrtc::kTraceVideoCapture, _id, | 120     WEBRTC_TRACE(webrtc::kTraceInfo, webrtc::kTraceVideoCapture, _id, | 
| 121                  "NumberOfCapabilities is not supported on the Mac platform."); | 121                  "NumberOfCapabilities is not supported on the Mac platform."); | 
| 122      return -1; | 122      return -1; | 
| 123 } | 123 } | 
| 124 }  // namespace videocapturemodule | 124 }  // namespace videocapturemodule | 
| 125 }  // namespace webrtc | 125 }  // namespace webrtc | 
| OLD | NEW | 
|---|