ChromeOS: enable pinning stream output routing for webapp request [extracted from 2516813002]

media/audio/cras/audio_manager_cras.cc

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 c4bef24ca7831fa65be82a67c51e8a0f131ccd2b..ea474ed3e2414fb7a14cfc8cfe624731ce1f2a40 100644
--- a/media/audio/cras/audio_manager_cras.cc
+++ b/media/audio/cras/audio_manager_cras.cc
@@ -159,7 +159,7 @@ void AudioManagerCras::GetAudioDeviceNamesImpl(bool is_input,
   if (is_input && mic_positions_.size() > 1)
     AddBeamformingDevices(device_names);
   else
-    device_names->push_back(media::AudioDeviceName::CreateDefault());
+    device_names->push_back(AudioDeviceName::CreateDefault());
 
   if (base::FeatureList::IsEnabled(features::kEnumerateAudioDevices)) {
     chromeos::AudioDeviceList devices;
@@ -236,17 +236,17 @@ AudioOutputStream* AudioManagerCras::MakeLinearOutputStream(
     const AudioParameters& params,
     const LogCallback& log_callback) {
   DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
-  return MakeOutputStream(params);
+  // (warx): pinning stream is not supported for MakeLinearOutputStream.

[tommi (sloooow) - chröme, 2017/01/25 22:05:28]

nit: as is this reads like it was meant to be a TODO, so I suggest to just
remove the "(warx):" part.

[Qiang(Joe) Xu, 2017/01/25 22:50:18]

Done.

+  return MakeOutputStream(params, AudioDeviceDescription::kDefaultDeviceId);
 }
 
 AudioOutputStream* AudioManagerCras::MakeLowLatencyOutputStream(
     const AudioParameters& params,
     const std::string& device_id,
     const LogCallback& log_callback) {
-  DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!";
   DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
   // TODO(dgreid): Open the correct input device for unified IO.
-  return MakeOutputStream(params);
+  return MakeOutputStream(params, device_id);
 }
 
 AudioInputStream* AudioManagerCras::MakeLinearInputStream(
@@ -268,8 +268,6 @@ AudioInputStream* AudioManagerCras::MakeLowLatencyInputStream(
 AudioParameters AudioManagerCras::GetPreferredOutputStreamParameters(
     const std::string& output_device_id,
     const AudioParameters& input_params) {
-  // TODO(tommi): Support |output_device_id|.
-  DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!";
   ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
   int sample_rate = kDefaultSampleRate;
   int buffer_size = kMinimumOutputBufferSize;
@@ -292,8 +290,9 @@ AudioParameters AudioManagerCras::GetPreferredOutputStreamParameters(
 }
 
 AudioOutputStream* AudioManagerCras::MakeOutputStream(
-    const AudioParameters& params) {
-  return new CrasUnifiedStream(params, this);
+    const AudioParameters& params,
+    const std::string& device_id) {
+  return new CrasUnifiedStream(params, this, device_id);
 }
 
 AudioInputStream* AudioManagerCras::MakeInputStream(
@@ -316,4 +315,12 @@ snd_pcm_format_t AudioManagerCras::BitsToFormat(int bits_per_sample) {
   }
 }
 
+bool AudioManagerCras::IsDefault(const std::string& device_id, bool is_input) {
+  AudioDeviceNames device_names;
+  GetAudioDeviceNamesImpl(is_input, &device_names);
+  DCHECK(!device_names.empty());
+  AudioDeviceName device_name = device_names.front();

[tommi (sloooow) - chröme, 2017/01/25 22:05:28]

nit: no need to copy to a new AudioDeviceName instance. Instead do:

const AudioDeviceName& device_name = device_names.front();

[Qiang(Joe) Xu, 2017/01/25 22:50:18]

Done.

+  return device_name.unique_id == device_id;
+}
+
 }  // namespace media