Fix bug when unplugging an audio input device whilst using speech input.

media/audio/win/wavein_input_win.cc

 // Copyright (c) 2011 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/win/wavein_input_win.h"
 
 #include <windows.h>
 #include <mmsystem.h>
 #pragma comment(lib, "winmm.lib")
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_util.h"
 #include "media/audio/win/audio_manager_win.h"
 
+namespace {
+const int kCallbackTimeout = 1000; // One second.

[Satish, 2011/06/14 14:28:04]

rename to kStopInputStreamCallbackTimeout to be more specific? Also could
increase to a couple more seconds to reduce false positives

[allanwoj, 2011/06/14 15:03:12]

Done.

+}
+
 // Our sound buffers are allocated once and kept in a linked list using the
 // the WAVEHDR::dwUser variable. The last buffer points to the first buffer.
 static WAVEHDR* GetNextBuffer(WAVEHDR* current) {
   return reinterpret_cast<WAVEHDR*>(current->dwUser);
 }
 
 PCMWaveInAudioInputStream::PCMWaveInAudioInputStream(
     AudioManagerWin* manager, AudioParameters params, int num_buffers,
     UINT device_id)
     : state_(kStateEmpty),
@@ skipping 96 matching lines @@
 
 // Stopping is tricky. First, no buffer should be locked by the audio driver
 // or else the waveInReset() will deadlock and secondly, the callback should
 // not be inside the AudioInputCallback's OnData because waveInReset()
 // forcefully kills the callback thread.
 void PCMWaveInAudioInputStream::Stop() {
   if (state_ != kStateRecording)
     return;
   state_ = kStateStopping;
   // Wait for the callback to finish, it will signal us when ready to be reset.
-  if (WAIT_OBJECT_0 != ::WaitForSingleObject(stopped_event_, INFINITE)) {
+  if (WAIT_OBJECT_0 !=
+      ::WaitForSingleObject(stopped_event_, kCallbackTimeout)) {
     HandleError(::GetLastError());
     return;
   }
   state_ = kStateStopped;
   MMRESULT res = ::waveInReset(wavein_);
   if (res != MMSYSERR_NOERROR) {
     state_ = kStateRecording;
     HandleError(res);
     return;
   }
@@ skipping 59 matching lines @@
       // waveInPrepareHeader.
       obj->QueueNextPacket(buffer);
     }
   } else if (msg == WIM_CLOSE) {
     // We can be closed before calling Start, so it is possible to have a
     // null callback at this point.
     if (obj->callback_)
       obj->callback_->OnClose(obj);
   }
 }