| 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 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 { | 28 { |
| 29 directShowCapabilityIndex = 0; | 29 directShowCapabilityIndex = 0; |
| 30 supportFrameRateControl = false; | 30 supportFrameRateControl = false; |
| 31 } | 31 } |
| 32 }; | 32 }; |
| 33 | 33 |
| 34 class DeviceInfoDS: public DeviceInfoImpl | 34 class DeviceInfoDS: public DeviceInfoImpl |
| 35 { | 35 { |
| 36 public: | 36 public: |
| 37 // Factory function. | 37 // Factory function. |
| 38 static DeviceInfoDS* Create(const int32_t id); | 38 static DeviceInfoDS* Create(); |
| 39 | 39 |
| 40 DeviceInfoDS(const int32_t id); | 40 DeviceInfoDS(); |
| 41 virtual ~DeviceInfoDS(); | 41 virtual ~DeviceInfoDS(); |
| 42 | 42 |
| 43 int32_t Init(); | 43 int32_t Init(); |
| 44 virtual uint32_t NumberOfDevices(); | 44 virtual uint32_t NumberOfDevices(); |
| 45 | 45 |
| 46 /* | 46 /* |
| 47 * Returns the available capture devices. | 47 * Returns the available capture devices. |
| 48 */ | 48 */ |
| 49 virtual int32_t | 49 virtual int32_t |
| 50 GetDeviceName(uint32_t deviceNumber, | 50 GetDeviceName(uint32_t deviceNumber, |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 | 97 |
| 98 private: | 98 private: |
| 99 ICreateDevEnum* _dsDevEnum; | 99 ICreateDevEnum* _dsDevEnum; |
| 100 IEnumMoniker* _dsMonikerDevEnum; | 100 IEnumMoniker* _dsMonikerDevEnum; |
| 101 bool _CoUninitializeIsRequired; | 101 bool _CoUninitializeIsRequired; |
| 102 std::vector<VideoCaptureCapabilityWindows> _captureCapabilitiesWindows; | 102 std::vector<VideoCaptureCapabilityWindows> _captureCapabilitiesWindows; |
| 103 }; | 103 }; |
| 104 } // namespace videocapturemodule | 104 } // namespace videocapturemodule |
| 105 } // namespace webrtc | 105 } // namespace webrtc |
| 106 #endif // WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_DEVICE_INFO_DS_H_ | 106 #endif // WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_DEVICE_INFO_DS_H_ |
| OLD | NEW |