OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "media/video/capture/video_capture_device.h" | 5 #include "media/video/capture/video_capture_device.h" |
6 | 6 |
7 #include "base/i18n/timezone.h" | 7 #include "base/i18n/timezone.h" |
8 #include "base/strings/string_util.h" | 8 #include "base/strings/string_util.h" |
9 | 9 |
10 namespace media { | 10 namespace media { |
(...skipping 10 matching lines...) Expand all Loading... |
21 | 21 |
22 VideoCaptureDevice::Name::Name() {} | 22 VideoCaptureDevice::Name::Name() {} |
23 | 23 |
24 VideoCaptureDevice::Name::Name(const std::string& name, const std::string& id) | 24 VideoCaptureDevice::Name::Name(const std::string& name, const std::string& id) |
25 : device_name_(name), unique_id_(id) {} | 25 : device_name_(name), unique_id_(id) {} |
26 | 26 |
27 #if defined(OS_WIN) | 27 #if defined(OS_WIN) |
28 VideoCaptureDevice::Name::Name(const std::string& name, | 28 VideoCaptureDevice::Name::Name(const std::string& name, |
29 const std::string& id, | 29 const std::string& id, |
30 const CaptureApiType api_type) | 30 const CaptureApiType api_type) |
31 : device_name_(name), unique_id_(id), capture_api_class_(api_type) {} | 31 : device_name_(name), |
| 32 unique_id_(id), |
| 33 capture_api_class_(api_type), |
| 34 capabilities_unique_id_(id) {} |
32 #endif | 35 #endif |
33 | 36 |
34 #if defined(OS_MACOSX) | 37 #if defined(OS_MACOSX) |
35 VideoCaptureDevice::Name::Name(const std::string& name, | 38 VideoCaptureDevice::Name::Name(const std::string& name, |
36 const std::string& id, | 39 const std::string& id, |
37 const CaptureApiType api_type) | 40 const CaptureApiType api_type) |
38 : device_name_(name), | 41 : device_name_(name), |
39 unique_id_(id), | 42 unique_id_(id), |
40 capture_api_class_(api_type), | 43 capture_api_class_(api_type), |
41 transport_type_(OTHER_TRANSPORT), | 44 transport_type_(OTHER_TRANSPORT), |
(...skipping 28 matching lines...) Expand all Loading... |
70 const char** countries_using_60Hz_end = | 73 const char** countries_using_60Hz_end = |
71 countries_using_60Hz + arraysize(countries_using_60Hz); | 74 countries_using_60Hz + arraysize(countries_using_60Hz); |
72 if (std::find(countries_using_60Hz, countries_using_60Hz_end, | 75 if (std::find(countries_using_60Hz, countries_using_60Hz_end, |
73 current_country) == countries_using_60Hz_end) { | 76 current_country) == countries_using_60Hz_end) { |
74 return kPowerLine50Hz; | 77 return kPowerLine50Hz; |
75 } | 78 } |
76 return kPowerLine60Hz; | 79 return kPowerLine60Hz; |
77 } | 80 } |
78 | 81 |
79 } // namespace media | 82 } // namespace media |
OLD | NEW |