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_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_ | 5 #ifndef CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_ |
6 #define CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_ | 6 #define CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_ |
7 | 7 |
8 #include <stddef.h> | 8 #include <stddef.h> |
9 | 9 |
10 #include <map> | 10 #include <map> |
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
122 // The facing mode for video capture device. | 122 // The facing mode for video capture device. |
123 VideoFacingMode video_facing; | 123 VideoFacingMode video_facing; |
124 | 124 |
125 // The device id of a matched output device if any (otherwise empty). | 125 // The device id of a matched output device if any (otherwise empty). |
126 // Only applicable to audio devices. | 126 // Only applicable to audio devices. |
127 std::string matched_output_device_id; | 127 std::string matched_output_device_id; |
128 | 128 |
129 // The device's "friendly" name. Not guaranteed to be unique. | 129 // The device's "friendly" name. Not guaranteed to be unique. |
130 std::string name; | 130 std::string name; |
131 | 131 |
132 // A unique identifier for the physical device this device is part of. | |
133 // Will be hashed before being sent to renderer. | |
134 // TODO(maxmorin): Add support for video devices as well. | |
135 std::string group_id; | |
136 | |
137 // Contains properties that match directly with those with the same name | 132 // Contains properties that match directly with those with the same name |
138 // in media::AudioParameters. | 133 // in media::AudioParameters. |
139 // TODO(ajm): Remove this type and use media::AudioParameters directly. | 134 // TODO(ajm): Remove this type and use media::AudioParameters directly. |
140 struct CONTENT_EXPORT AudioDeviceParameters { | 135 struct CONTENT_EXPORT AudioDeviceParameters { |
141 AudioDeviceParameters(); | 136 AudioDeviceParameters(); |
142 AudioDeviceParameters(int sample_rate, | 137 AudioDeviceParameters(int sample_rate, |
143 int channel_layout, | 138 int channel_layout, |
144 int frames_per_buffer); | 139 int frames_per_buffer); |
145 AudioDeviceParameters(const AudioDeviceParameters& other); | 140 AudioDeviceParameters(const AudioDeviceParameters& other); |
146 | 141 |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
271 | 266 |
272 // Callback used return results of media access requests. | 267 // Callback used return results of media access requests. |
273 typedef base::Callback<void(const MediaStreamDevices& devices, | 268 typedef base::Callback<void(const MediaStreamDevices& devices, |
274 content::MediaStreamRequestResult result, | 269 content::MediaStreamRequestResult result, |
275 std::unique_ptr<MediaStreamUI> ui)> | 270 std::unique_ptr<MediaStreamUI> ui)> |
276 MediaResponseCallback; | 271 MediaResponseCallback; |
277 | 272 |
278 } // namespace content | 273 } // namespace content |
279 | 274 |
280 #endif // CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_ | 275 #endif // CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_ |
OLD | NEW |