Re-land: Add localized default audio device names.

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 <algorithm>
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/logging.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/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
 
 namespace media {
 namespace {
 
 // Maximum number of output streams that can be open simultaneously.
 const int kMaxOutputStreams = 50;
 
 // Default sample rate for input and output streams.
 const int kDefaultSampleRate = 48000;
 
 // 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 kBeamformingOnUniqueId[] = "beamforming-on";
+const char kBeamformingOffUniqueId[] = "beamforming-off";
+
 void AddDefaultDevice(AudioDeviceNames* device_names) {
+  DCHECK(device_names->empty());
+
   // Cras will route audio from a proper physical device automatically.
-  device_names->push_back(
-      AudioDeviceName(AudioManagerBase::kDefaultDeviceName,
-                      AudioManagerBase::kDefaultDeviceId));
+  device_names->push_back(AudioDeviceName(AudioManager::GetDefaultDeviceName(),
+                                          AudioManagerBase::kDefaultDeviceId));
 }
 
-// Returns the AudioDeviceName of the virtual device with beamforming on.
-AudioDeviceName BeamformingOnDeviceName() {
-  // TODO(ajm): Replace these strings with properly localized ones.
-  // (crbug.com/497001)
-  static const char kBeamformingOnNameSuffix[] = " (pick up just one person)";
-  static const char kBeamformingOnIdSuffix[] = "-beamforming";
+// Adds the beamforming on and off devices to |device_names|.
+void AddBeamformingDevices(AudioDeviceNames* device_names) {
+  DCHECK(device_names->empty());
 
-  return AudioDeviceName(
-      std::string(AudioManagerBase::kDefaultDeviceName) +
-          kBeamformingOnNameSuffix,
-      std::string(AudioManagerBase::kDefaultDeviceId) + kBeamformingOnIdSuffix);
-}
-
-// Returns the AudioDeviceName of the virtual device with beamforming off.
-AudioDeviceName BeamformingOffDeviceName() {
-  static const char kBeamformingOffNameSuffix[] = " (pick up everything)";
-  return AudioDeviceName(std::string(AudioManagerBase::kDefaultDeviceName) +
-                             kBeamformingOffNameSuffix,
-                         AudioManagerBase::kDefaultDeviceId);
+  device_names->push_back(AudioDeviceName(
+      GetLocalizedStringUTF8(BEAMFORMING_ON_DEFAULT_AUDIO_INPUT_DEVICE_NAME),
+      kBeamformingOnUniqueId));
+  device_names->push_back(AudioDeviceName(
+      GetLocalizedStringUTF8(BEAMFORMING_OFF_DEFAULT_AUDIO_INPUT_DEVICE_NAME),
+      kBeamformingOffUniqueId));
 }
 
 // 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 15 matching lines @@
   chromeos::AudioDeviceList devices;
   chromeos::CrasAudioHandler::Get()->GetAudioDevices(&devices);
   for (size_t i = 0; i < devices.size(); ++i) {
     if (devices[i].is_input && devices[i].is_for_simple_usage())
       return true;
   }
   return false;
 }
 
 AudioManagerCras::AudioManagerCras(AudioLogFactory* audio_log_factory)
-    : AudioManagerBase(audio_log_factory),
-      has_keyboard_mic_(false),
-      beamforming_on_device_name_(BeamformingOnDeviceName()),
-      beamforming_off_device_name_(BeamformingOffDeviceName()) {
+    : AudioManagerBase(audio_log_factory), has_keyboard_mic_(false) {
   SetMaxOutputStreamsAllowed(kMaxOutputStreams);
 }
 
 AudioManagerCras::~AudioManagerCras() {
   Shutdown();
 }
 
 void AudioManagerCras::ShowAudioInputSettings() {
   NOTIMPLEMENTED();
 }
 
 void AudioManagerCras::GetAudioInputDeviceNames(
     AudioDeviceNames* device_names) {
   DCHECK(device_names->empty());
 
   mic_positions_ = ParsePointsFromString(MicPositions());
   // At least two mic positions indicates we have a beamforming capable mic
   // array. Add the virtual beamforming device to the list. When this device is
   // queried through GetInputStreamParameters, provide the cached mic positions.
-  if (mic_positions_.size() > 1) {
-    device_names->push_back(beamforming_on_device_name_);
-    device_names->push_back(beamforming_off_device_name_);
-  } else {
+  if (mic_positions_.size() > 1)
+    AddBeamformingDevices(device_names);
+  else
     AddDefaultDevice(device_names);
-  }
 }
 
 void AudioManagerCras::GetAudioOutputDeviceNames(
     AudioDeviceNames* device_names) {
-  DCHECK(device_names->empty());
-
   AddDefaultDevice(device_names);
 }
 
 AudioParameters AudioManagerCras::GetInputStreamParameters(
     const std::string& device_id) {
   DCHECK(GetTaskRunner()->BelongsToCurrentThread());
 
   int user_buffer_size = GetUserBufferSize();
   int buffer_size = user_buffer_size ?
       user_buffer_size : kDefaultInputBufferSize;
 
   // TODO(hshi): Fine-tune audio parameters based on |device_id|. The optimal
   // parameters for the loopback stream may differ from the default.
   AudioParameters params(AudioParameters::AUDIO_PCM_LOW_LATENCY,
                          CHANNEL_LAYOUT_STEREO, kDefaultSampleRate, 16,
                          buffer_size);
   if (has_keyboard_mic_)
     params.set_effects(AudioParameters::KEYBOARD_MIC);
-  if (device_id == beamforming_on_device_name_.unique_id)
+  if (device_id == kBeamformingOnUniqueId)
     params.set_mic_positions(mic_positions_);
   return params;
 }
 
 void AudioManagerCras::SetHasKeyboardMic() {
   DCHECK(GetTaskRunner()->BelongsToCurrentThread());
   has_keyboard_mic_ = true;
 }
 
 AudioOutputStream* AudioManagerCras::MakeLinearOutputStream(
@@ skipping 68 matching lines @@
     case 24:
       return SND_PCM_FORMAT_S24;
     case 32:
       return SND_PCM_FORMAT_S32;
     default:
       return SND_PCM_FORMAT_UNKNOWN;
   }
 }
 
 }  // namespace media