On windows, create PCMWaveInAudioInputStream instance with correct device ID.

media/audio/win/audio_manager_win.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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/audio_io.h"
 
 #include <windows.h>
 #include <objbase.h>  // This has to be before initguid.h
 #include <initguid.h>
 #include <mmsystem.h>
 #include <setupapi.h>
@@ skipping 147 matching lines @@
 // Factory for the implementations of AudioInputStream.
 AudioInputStream* AudioManagerWin::MakeAudioInputStream(
     const AudioParameters& params, const std::string& device_id) {
   if (!params.IsValid() || (params.channels > kWinMaxInputChannels) ||
       device_id.empty())
     return NULL;
 
   if (params.format == AudioParameters::AUDIO_MOCK) {
     return FakeAudioInputStream::MakeFakeStream(params);
   } else if (params.format == AudioParameters::AUDIO_PCM_LINEAR) {
-    return new PCMWaveInAudioInputStream(this, params, kNumInputBuffers,
-                                         AudioManagerBase::kDefaultDeviceId);
+    return CreatePCMWaveInAudioInputStream(params, device_id);
   } else if (params.format == AudioParameters::AUDIO_PCM_LOW_LATENCY) {
     if (!media::IsWASAPISupported()) {
       // Fall back to Windows Wave implementation on Windows XP or lower.
       DLOG(INFO) << "Using WaveIn since WASAPI requires at least Vista.";
-      return new PCMWaveInAudioInputStream(this, params, kNumInputBuffers,
-                                           device_id);
+      return CreatePCMWaveInAudioInputStream(params, device_id);
     } else {
       return new WASAPIAudioInputStream(this, params, device_id);
     }
   }
   return NULL;
 }
 
 void AudioManagerWin::ReleaseOutputStream(AudioOutputStream* stream) {
   DCHECK(stream);
   num_output_streams_--;
@@ skipping 111 matching lines @@
 
   // Always add default device parameters as first element.
   if (!device_names->empty()) {
     media::AudioDeviceName name;
     name.device_name = AudioManagerBase::kDefaultDeviceName;
     name.unique_id = AudioManagerBase::kDefaultDeviceId;
     device_names->push_front(name);
   }
 }
 
+AudioInputStream* AudioManagerWin::CreatePCMWaveInAudioInputStream(
+    const AudioParameters& params,
+    const std::string& device_id) {
+  if (device_id != AudioManagerBase::kDefaultDeviceId &&
+      enumeration_type_ == kMMDeviceEnumeration) {
+    std::string xp_device_id = ConvertToWinXPDeviceId(device_id);
+    if (!xp_device_id.empty()) {
+      return new PCMWaveInAudioInputStream(this, params, kNumInputBuffers,
+                                           xp_device_id);
+    } else {
+      return NULL;

[no longer working on chromium, 2012/03/05 09:58:39]

It looks like an unexpected error to me, adding a DLOG?

[yzshen1, 2012/03/13 21:09:23]

Done.

+    }
+  }
+
+  return new PCMWaveInAudioInputStream(this, params, kNumInputBuffers,
+                                       device_id);

[no longer working on chromium, 2012/03/05 09:58:39]

Just a personal preference, feel free to ignore if you don't like the style. It
looks too many "return" in such a short function to me, what about doing it in
another way:

std::string new_device_id = device_id;
if (device_id != AudioManagerBase::kDefaultDeviceId ...) {
  new_device_id = ConvertToWinXPDeviceId(device_id);
  if (new_device_id.empty()) {
    DLOG()?
    return NULL;
  }
}
  return new PCMWaveInAudioInputStream(, , , new_device_id);

[yzshen1, 2012/03/13 21:09:23]

Done.

+}
+
 /// static
 AudioManager* CreateAudioManager() {
   return new AudioManagerWin();
 }