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

media/audio/audio_input_controller.h

 // 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.
 
 #ifndef MEDIA_AUDIO_AUDIO_INPUT_CONTROLLER_H_
 #define MEDIA_AUDIO_AUDIO_INPUT_CONTROLLER_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread.h"
+#include "base/timer.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_manager.h"
 
 // An AudioInputController controls an AudioInputStream and records data
 // from this input stream. It has an important function that it executes
 // audio operations like record, pause, stop, etc. on a separate thread.
 //
 // All the public methods of AudioInputController are non-blocking except
 // close, the actual operations are performed on the audio input controller
 // thread.
@@ skipping 71 matching lines @@
       EventHandler* event_handler,
       AudioParameters params,
       // External synchronous reader for audio controller.
       SyncWriter* sync_writer);
 
   // Sets the factory used by the static method Create. AudioInputController
   // does not take ownership of |factory|. A value of NULL results in an
   // AudioInputController being created directly.
 #if defined(UNIT_TEST)
   static void set_factory(Factory* factory) { factory_ = factory; }
+  AudioInputStream* stream() { return stream_; }
 #endif
 
   // Starts recording in this audio input stream.
   virtual void Record();
 
   // Closes the audio input stream and shutdown the audio input controller
   // thread. This method returns only after all operations are completed. This
   // input controller cannot be used after this method is called.
   //
   // It is safe to call this method more than once. Calls after the first one
@@ skipping 18 matching lines @@
     kError
   };
 
   AudioInputController(EventHandler* handler, SyncWriter* sync_writer);
 
   // The following methods are executed on the audio controller thread.
   void DoCreate(AudioParameters params);
   void DoRecord();
   void DoClose();
   void DoReportError(int code);
+  void DoReportTimeoutError();
+  void DoTimerReset();
 
   EventHandler* handler_;
   AudioInputStream* stream_;
 
+  // |timer_| is used to call DoReportTimeoutError when we stop receiving
+  // OnData calls without an OnClose call. This can occur when an audio input
+  // device is unplugged whilst recording on Windows.
+  // See http://crbug.com/79936 for details.
+  base::DelayTimer<AudioInputController> timer_;

[Satish, 2011/06/15 10:23:27]

'timer_' and 'DoTimerReset' seem very generic names. Could you use a more
specific name which indicates the purpose of the timer?

[allanwoj, 2011/06/15 11:11:17]

Done.

+
   // |state_| is written on the audio input controller thread and is read on
   // the hardware audio thread. These operations need to be locked. But lock
   // is not required for reading on the audio input controller thread.
   State state_;
 
   base::Lock lock_;
 
   // The audio input controller thread that this object runs on.
   base::Thread thread_;
 
   // SyncWriter is used only in low latency mode for synchronous writing.
   SyncWriter* sync_writer_;
 
   static Factory* factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioInputController);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_AUDIO_AUDIO_INPUT_CONTROLLER_H_