| 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 |
| 132 // Contains properties that match directly with those with the same name | 137 // Contains properties that match directly with those with the same name |
| 133 // in media::AudioParameters. | 138 // in media::AudioParameters. |
| 134 // TODO(ajm): Remove this type and use media::AudioParameters directly. | 139 // TODO(ajm): Remove this type and use media::AudioParameters directly. |
| 135 struct CONTENT_EXPORT AudioDeviceParameters { | 140 struct CONTENT_EXPORT AudioDeviceParameters { |
| 136 AudioDeviceParameters(); | 141 AudioDeviceParameters(); |
| 137 AudioDeviceParameters(int sample_rate, | 142 AudioDeviceParameters(int sample_rate, |
| 138 int channel_layout, | 143 int channel_layout, |
| 139 int frames_per_buffer); | 144 int frames_per_buffer); |
| 140 AudioDeviceParameters(const AudioDeviceParameters& other); | 145 AudioDeviceParameters(const AudioDeviceParameters& other); |
| 141 | 146 |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 266 | 271 |
| 267 // Callback used return results of media access requests. | 272 // Callback used return results of media access requests. |
| 268 typedef base::Callback<void(const MediaStreamDevices& devices, | 273 typedef base::Callback<void(const MediaStreamDevices& devices, |
| 269 content::MediaStreamRequestResult result, | 274 content::MediaStreamRequestResult result, |
| 270 std::unique_ptr<MediaStreamUI> ui)> | 275 std::unique_ptr<MediaStreamUI> ui)> |
| 271 MediaResponseCallback; | 276 MediaResponseCallback; |
| 272 | 277 |
| 273 } // namespace content | 278 } // namespace content |
| 274 | 279 |
| 275 #endif // CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_ | 280 #endif // CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_ |
| OLD | NEW |