| Index: media/audio/cras/audio_manager_cras.cc
|
| diff --git a/media/audio/cras/audio_manager_cras.cc b/media/audio/cras/audio_manager_cras.cc
|
| index 3401cc5f62310cd41b423084013c9f30e2a0827f..9565ebd8bdeb0ed31ecf8f5a7a65e0559cfd48ab 100644
|
| --- a/media/audio/cras/audio_manager_cras.cc
|
| +++ b/media/audio/cras/audio_manager_cras.cc
|
| @@ -10,15 +10,18 @@
|
| #include "base/nix/xdg_util.h"
|
| #include "base/process_util.h"
|
| #include "base/stl_util.h"
|
| -#include "media/audio/audio_util.h"
|
| #include "media/audio/cras/cras_input.h"
|
| #include "media/audio/cras/cras_output.h"
|
| +#include "media/base/channel_layout.h"
|
|
|
| namespace media {
|
|
|
| // Maximum number of output streams that can be open simultaneously.
|
| static const int kMaxOutputStreams = 50;
|
|
|
| +// Default sample rate for input and output streams.
|
| +static const int kDefaultSampleRate = 48000;
|
| +
|
| static const char kCrasAutomaticDeviceName[] = "Automatic";
|
| static const char kCrasAutomaticDeviceId[] = "automatic";
|
|
|
| @@ -49,6 +52,23 @@ void AudioManagerCras::GetAudioInputDeviceNames(
|
| return;
|
| }
|
|
|
| +AudioParameters AudioManagerCras::GetDefaultOutputStreamParameters() {
|
| + static const int kDefaultOutputBufferSize = 512;
|
| +
|
| + return AudioParameters(
|
| + AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
|
| + kDefaultSampleRate, 16, kDefaultOutputBufferSize);
|
| +}
|
| +
|
| +AudioParameters AudioManagerCras::GetDefaultInputStreamParameters(
|
| + const std::string& device_id) {
|
| + static const int kDefaultInputBufferSize = 1024;
|
| +
|
| + return AudioParameters(
|
| + AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
|
| + kDefaultSampleRate, 16, kDefaultInputBufferSize);
|
| +}
|
| +
|
| void AudioManagerCras::GetCrasAudioInputDevices(
|
| media::AudioDeviceNames* device_names) {
|
| // Cras will route audio from a proper physical device automatically.
|
|
|