| Index: content/public/common/media_stream_request.h
|
| diff --git a/content/public/common/media_stream_request.h b/content/public/common/media_stream_request.h
|
| index b60835ee04b71aec95d53e2eb859432fdb52c62b..61cf8813d6b7b42ec60a00b0a66c2e6c43312ec9 100644
|
| --- a/content/public/common/media_stream_request.h
|
| +++ b/content/public/common/media_stream_request.h
|
| @@ -13,6 +13,7 @@
|
| #include "base/callback_forward.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "content/common/content_export.h"
|
| +#include "media/audio/audio_parameters.h"
|
| #include "ui/gfx/native_widget_types.h"
|
| #include "url/gurl.h"
|
|
|
| @@ -125,18 +126,14 @@ struct CONTENT_EXPORT MediaStreamDevice {
|
|
|
| // Contains properties that match directly with those with the same name
|
| // in media::AudioParameters.
|
| + // TODO(ajm): Remove this type and use media::AudioParameters directly.
|
| struct AudioDeviceParameters {
|
| - AudioDeviceParameters()
|
| - : sample_rate(), channel_layout(), frames_per_buffer(), effects() {
|
| - }
|
| -
|
| - AudioDeviceParameters(int sample_rate, int channel_layout,
|
| - int frames_per_buffer)
|
| - : sample_rate(sample_rate),
|
| - channel_layout(channel_layout),
|
| - frames_per_buffer(frames_per_buffer),
|
| - effects() {
|
| - }
|
| + AudioDeviceParameters();
|
| + AudioDeviceParameters(int sample_rate,
|
| + int channel_layout,
|
| + int frames_per_buffer);
|
| +
|
| + ~AudioDeviceParameters();
|
|
|
| // Preferred sample rate in samples per second for the device.
|
| int sample_rate;
|
| @@ -154,6 +151,8 @@ struct CONTENT_EXPORT MediaStreamDevice {
|
|
|
| // See media::AudioParameters::PlatformEffectsMask.
|
| int effects;
|
| +
|
| + std::vector<media::Point> mic_positions;
|
| };
|
|
|
| // These below two member variables are valid only when the type of device is
|
|
|