Refactor AudioInputController and related interfaces.

content/browser/speech/speech_recognizer_impl.h

 // Copyright (c) 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.
 
 #ifndef CONTENT_BROWSER_SPEECH_SPEECH_RECOGNIZER_IMPL_H_
 #define CONTENT_BROWSER_SPEECH_SPEECH_RECOGNIZER_IMPL_H_
 
 #include <memory>
 
 #include "base/macros.h"
@@ skipping 14 matching lines @@
 namespace content {
 
 class SpeechRecognitionEventListener;
 
 // Handles speech recognition for a session (identified by |session_id|), taking
 // care of audio capture, silence detection/endpointer and interaction with the
 // SpeechRecognitionEngine.
 class CONTENT_EXPORT SpeechRecognizerImpl
     : public SpeechRecognizer,
       public media::AudioInputController::EventHandler,
+      public media::AudioInputController::SyncWriter,
       public NON_EXPORTED_BASE(SpeechRecognitionEngine::Delegate) {
  public:
   static const int kAudioSampleRate;
   static const media::ChannelLayout kChannelLayout;
   static const int kNumBitsPerAudioSample;
   static const int kNoSpeechTimeoutMs;
   static const int kEndpointerEstimationTimeMs;
 
   static void SetAudioManagerForTesting(media::AudioManager* audio_manager);
 
@@ skipping 82 matching lines @@
 
   void CloseAudioControllerAsynchronously();
 
   // Callback called on IO thread by audio_controller->Close().
   void OnAudioClosed(media::AudioInputController*);
 
   // AudioInputController::EventHandler methods.
   void OnCreated(media::AudioInputController* controller) override {}
   void OnError(media::AudioInputController* controller,
                media::AudioInputController::ErrorCode error_code) override;
-  void OnData(media::AudioInputController* controller,
-              const media::AudioBus* data) override;
   void OnLog(media::AudioInputController* controller,
              const std::string& message) override {}
 
+  // AudioInputController::SyncWriter methods.
+  void Write(const media::AudioBus* data,
+             double volume,
+             bool key_pressed,
+             uint32_t hardware_delay_bytes) override;
+  void Close() override;
+
   // SpeechRecognitionEngineDelegate methods.
   void OnSpeechRecognitionEngineResults(
       const SpeechRecognitionResults& results) override;
   void OnSpeechRecognitionEngineEndOfUtterance() override;
   void OnSpeechRecognitionEngineError(
       const SpeechRecognitionError& error) override;
 
   static media::AudioManager* audio_manager_for_tests_;
 
   std::unique_ptr<SpeechRecognitionEngine> recognition_engine_;
@@ skipping 13 matching lines @@
   // Converts data between native input format and a WebSpeech specific
   // output format.
   std::unique_ptr<SpeechRecognizerImpl::OnDataConverter> audio_converter_;
 
   DISALLOW_COPY_AND_ASSIGN(SpeechRecognizerImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_SPEECH_SPEECH_RECOGNIZER_IMPL_H_