| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #ifndef CONTENT_COMMON_MEDIA_MEDIA_STREAM_OPTIONS_H_ | 5 #ifndef CONTENT_COMMON_MEDIA_MEDIA_STREAM_OPTIONS_H_ |
| 6 #define CONTENT_COMMON_MEDIA_MEDIA_STREAM_OPTIONS_H_ | 6 #define CONTENT_COMMON_MEDIA_MEDIA_STREAM_OPTIONS_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 struct CONTENT_EXPORT StreamControls { | 50 struct CONTENT_EXPORT StreamControls { |
| 51 public: | 51 public: |
| 52 StreamControls(); | 52 StreamControls(); |
| 53 StreamControls(bool request_audio, bool request_video); | 53 StreamControls(bool request_audio, bool request_video); |
| 54 ~StreamControls(); | 54 ~StreamControls(); |
| 55 TrackControls audio; | 55 TrackControls audio; |
| 56 TrackControls video; | 56 TrackControls video; |
| 57 // Hotword functionality (chromeos only) | 57 // Hotword functionality (chromeos only) |
| 58 // See crbug.com/564574 for discussion on possibly #ifdef'ing this out. | 58 // See crbug.com/564574 for discussion on possibly #ifdef'ing this out. |
| 59 bool hotword_enabled; // kMediaStreamAudioHotword = "googHotword"; | 59 bool hotword_enabled; // kMediaStreamAudioHotword = "googHotword"; |
| 60 bool disable_local_echo; |
| 60 }; | 61 }; |
| 61 | 62 |
| 62 // StreamDeviceInfo describes information about a device. | 63 // StreamDeviceInfo describes information about a device. |
| 63 struct CONTENT_EXPORT StreamDeviceInfo { | 64 struct CONTENT_EXPORT StreamDeviceInfo { |
| 64 static const int kNoId; | 65 static const int kNoId; |
| 65 | 66 |
| 66 StreamDeviceInfo(); | 67 StreamDeviceInfo(); |
| 67 StreamDeviceInfo(MediaStreamType service_param, | 68 StreamDeviceInfo(MediaStreamType service_param, |
| 68 const std::string& name_param, | 69 const std::string& name_param, |
| 69 const std::string& device_param); | 70 const std::string& device_param); |
| (...skipping 15 matching lines...) Expand all Loading... |
| 85 | 86 |
| 86 // Id for this capture session. Unique for all sessions of the same type. | 87 // Id for this capture session. Unique for all sessions of the same type. |
| 87 int session_id; | 88 int session_id; |
| 88 }; | 89 }; |
| 89 | 90 |
| 90 typedef std::vector<StreamDeviceInfo> StreamDeviceInfoArray; | 91 typedef std::vector<StreamDeviceInfo> StreamDeviceInfoArray; |
| 91 | 92 |
| 92 } // namespace content | 93 } // namespace content |
| 93 | 94 |
| 94 #endif // CONTENT_COMMON_MEDIA_MEDIA_STREAM_OPTIONS_H_ | 95 #endif // CONTENT_COMMON_MEDIA_MEDIA_STREAM_OPTIONS_H_ |
| OLD | NEW |