cros: Using virtual audio device label for internal device

media/audio/cras/audio_manager_cras.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/audio/cras/audio_manager_cras.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
@@ skipping 31 matching lines @@
 // Define bounds for the output buffer size.
 const int kMinimumOutputBufferSize = 512;
 const int kMaximumOutputBufferSize = 8192;
 
 // Default input buffer size.
 const int kDefaultInputBufferSize = 1024;
 
 const char kBeamformingOnDeviceId[] = "default-beamforming-on";
 const char kBeamformingOffDeviceId[] = "default-beamforming-off";
 
+const char kInternalInputDevice[] = "Built-in microphone";

[tommi (sloooow) - chröme, 2017/04/04 10:50:08]

I'd prefer names that are intentionally not like what could be used in UI, since
that should go through translation.
What about "built-in-mic" and "built-in-speaker"?

[Qiang(Joe) Xu, 2017/04/04 18:46:24]

If that is the concern, sgtm. I think 'b' should be capitalized to match the
styles of other labels. WDYT?

+const char kInternalOutputDevice[] = "Built-in speaker";
+
 enum CrosBeamformingDeviceState {
   BEAMFORMING_DEFAULT_ENABLED = 0,
   BEAMFORMING_USER_ENABLED,
   BEAMFORMING_DEFAULT_DISABLED,
   BEAMFORMING_USER_DISABLED,
   BEAMFORMING_STATE_MAX = BEAMFORMING_USER_DISABLED
 };
 
 void RecordBeamformingDeviceState(CrosBeamformingDeviceState state) {
   UMA_HISTOGRAM_ENUMERATION("Media.CrosBeamformingDeviceState", state,
@@ skipping 95 matching lines @@
   // array. Add the virtual beamforming device to the list. When this device is
   // queried through GetInputStreamParameters, provide the cached mic positions.
   if (is_input && mic_positions_.size() > 1)
     AddBeamformingDevices(device_names);
   else
     device_names->push_back(AudioDeviceName::CreateDefault());
 
   if (base::FeatureList::IsEnabled(features::kEnumerateAudioDevices)) {
     chromeos::AudioDeviceList devices;
     chromeos::CrasAudioHandler::Get()->GetAudioDevices(&devices);
+
+    int internal_input_dev_index = 0;
+    int internal_output_dev_index = 0;
+    for (const auto& device : devices) {
+      if (device.type == chromeos::AUDIO_TYPE_INTERNAL_MIC)
+        internal_input_dev_index = dev_index_of(device.id);
+      else if (device.type == chromeos::AUDIO_TYPE_INTERNAL_SPEAKER)
+        internal_output_dev_index = dev_index_of(device.id);
+    }
+
+    bool has_internal_input = false;
+    bool has_internal_output = false;
     for (const auto& device : devices) {
       if (device.is_input == is_input && device.is_for_simple_usage()) {
-        device_names->emplace_back(device.display_name,
-                                   base::Uint64ToString(device.id));
+        int dev_index = dev_index_of(device.id);
+        if (dev_index == internal_input_dev_index) {
+          if (!has_internal_input) {
+            device_names->emplace_back(kInternalInputDevice,
+                                       base::Uint64ToString(device.id));
+            has_internal_input = true;
+          }
+        } else if (dev_index == internal_output_dev_index) {
+          if (!has_internal_output) {
+            device_names->emplace_back(kInternalOutputDevice,
+                                       base::Uint64ToString(device.id));
+            has_internal_output = true;
+          }
+        } else {
+          device_names->emplace_back(device.display_name,
+                                     base::Uint64ToString(device.id));
+        }
       }
     }
   }
 }
 
 void AudioManagerCras::GetAudioInputDeviceNames(
     AudioDeviceNames* device_names) {
   mic_positions_ = ParsePointsFromString(MicPositions());
   GetAudioDeviceNamesImpl(true, device_names);
 }
@@ skipping 136 matching lines @@
 
 bool AudioManagerCras::IsDefault(const std::string& device_id, bool is_input) {
   AudioDeviceNames device_names;
   GetAudioDeviceNamesImpl(is_input, &device_names);
   DCHECK(!device_names.empty());
   const AudioDeviceName& device_name = device_names.front();
   return device_name.unique_id == device_id;
 }
 
 }  // namespace media