Moving device description utils from AudioManager[Base] into AudioDeviceDescription; to be shared b…

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>
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/nix/xdg_util.h"
 #include "base/stl_util.h"
 #include "chromeos/audio/audio_device.h"
 #include "chromeos/audio/cras_audio_handler.h"
+#include "media/audio/audio_device_description.h"
 #include "media/audio/cras/cras_input.h"
 #include "media/audio/cras/cras_unified.h"
 #include "media/base/channel_layout.h"
 #include "media/base/media_resources.h"
 
 // cras_util.h headers pull in min/max macros...
 // TODO(dgreid): Fix headers such that these aren't imported.
 #undef min
 #undef max
 
@@ skipping 31 matching lines @@
 
 bool IsBeamformingDefaultEnabled() {
   return base::FieldTrialList::FindFullName("ChromebookBeamforming") ==
          "Enabled";
 }
 
 void AddDefaultDevice(AudioDeviceNames* device_names) {
   DCHECK(device_names->empty());
 
   // Cras will route audio from a proper physical device automatically.
-  device_names->push_back(AudioDeviceName(AudioManager::GetDefaultDeviceName(),
-                                          AudioManagerBase::kDefaultDeviceId));
+  device_names->push_back(AudioDeviceName::CreateDefault());
 }
 
 // Returns a mic positions string if the machine has a beamforming capable
 // internal mic and otherwise an empty string.
 std::string MicPositions() {
   // Get the list of devices from CRAS. An internal mic with a non-empty
   // positions field indicates the machine has a beamforming capable mic array.
   chromeos::AudioDeviceList devices;
   chromeos::CrasAudioHandler::Get()->GetAudioDevices(&devices);
   for (const auto& device : devices) {
@@ skipping 11 matching lines @@
 void AudioManagerCras::AddBeamformingDevices(AudioDeviceNames* device_names) {
   DCHECK(device_names->empty());
   const std::string beamforming_on_name =
       GetLocalizedStringUTF8(BEAMFORMING_ON_DEFAULT_AUDIO_INPUT_DEVICE_NAME);
   const std::string beamforming_off_name =
       GetLocalizedStringUTF8(BEAMFORMING_OFF_DEFAULT_AUDIO_INPUT_DEVICE_NAME);
 
   if (IsBeamformingDefaultEnabled()) {
     // The first device in the list is expected to have a "default" device ID.
     // Web apps may depend on this behavior.
-    beamforming_on_device_id_ = AudioManagerBase::kDefaultDeviceId;
+    beamforming_on_device_id_ = AudioDeviceDescription::kDefaultDeviceId;
     beamforming_off_device_id_ = kBeamformingOffDeviceId;
 
     // Users in the experiment will have the "beamforming on" device appear
     // first in the list. This causes it to be selected by default.
     device_names->push_back(
         AudioDeviceName(beamforming_on_name, beamforming_on_device_id_));
     device_names->push_back(
         AudioDeviceName(beamforming_off_name, beamforming_off_device_id_));
   } else {
-    beamforming_off_device_id_ = AudioManagerBase::kDefaultDeviceId;
+    beamforming_off_device_id_ = AudioDeviceDescription::kDefaultDeviceId;
     beamforming_on_device_id_ = kBeamformingOnDeviceId;
 
     device_names->push_back(
         AudioDeviceName(beamforming_off_name, beamforming_off_device_id_));
     device_names->push_back(
         AudioDeviceName(beamforming_on_name, beamforming_on_device_id_));
   }
 }
 
 bool AudioManagerCras::HasAudioOutputDevices() {
@@ skipping 165 matching lines @@
     case 24:
       return SND_PCM_FORMAT_S24;
     case 32:
       return SND_PCM_FORMAT_S32;
     default:
       return SND_PCM_FORMAT_UNKNOWN;
   }
 }
 
 }  // namespace media