Binding media stream audio track to speech recognition [renderer]

content/renderer/speech_recognition_dispatcher.h

Index: content/renderer/speech_recognition_dispatcher.h
diff --git a/content/renderer/speech_recognition_dispatcher.h b/content/renderer/speech_recognition_dispatcher.h
index bae0e5d92a484cbd706533010a8ffd28e3f9e5fa..59aa0c5dedb5f006c9e5650fc0e97d9d1e1df239 100644
--- a/content/renderer/speech_recognition_dispatcher.h
+++ b/content/renderer/speech_recognition_dispatcher.h
@@ -8,14 +8,25 @@
 #include <map>
 
 #include "base/basictypes.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/memory/shared_memory.h"
+#include "base/sync_socket.h"
 #include "content/public/common/speech_recognition_result.h"
 #include "content/public/renderer/render_view_observer.h"
+#include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/public/web/WebSpeechRecognitionHandle.h"
 #include "third_party/WebKit/public/web/WebSpeechRecognizer.h"
 
+namespace media {
+class AudioParameters;
+}
+
 namespace content {
 class RenderViewImpl;
+#if defined(ENABLE_WEBRTC)
+class SpeechRecognitionAudioSink;
+#endif
 struct SpeechRecognitionError;
 struct SpeechRecognitionResult;
 
@@ -33,16 +44,16 @@ class SpeechRecognitionDispatcher : public RenderViewObserver,
 
  private:
   // RenderViewObserver implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
   // blink::WebSpeechRecognizer implementation.
   virtual void start(const blink::WebSpeechRecognitionHandle&,
                      const blink::WebSpeechRecognitionParams&,
-                     blink::WebSpeechRecognizerClient*) OVERRIDE;
+                     blink::WebSpeechRecognizerClient*) override;

[jamesr, 2014/10/08 19:14:11]

not lgtm, you should never use override for cross-repository implementations and
the blink:: interface is in the Blink repository. if you do, changing the
interface becomes nearly impossible since you can't atomically update the
interface and implementations in the same patch. 

[burnik, 2014/10/09 07:35:08]

Done.

   virtual void stop(const blink::WebSpeechRecognitionHandle&,
-                    blink::WebSpeechRecognizerClient*) OVERRIDE;
+                    blink::WebSpeechRecognizerClient*) override;
   virtual void abort(const blink::WebSpeechRecognitionHandle&,
-                     blink::WebSpeechRecognizerClient*) OVERRIDE;
+                     blink::WebSpeechRecognizerClient*) override;
 
   void OnRecognitionStarted(int request_id);
   void OnAudioStarted(int request_id);
@@ -53,6 +64,12 @@ class SpeechRecognitionDispatcher : public RenderViewObserver,
   void OnRecognitionEnded(int request_id);
   void OnResultsRetrieved(int request_id,
                           const SpeechRecognitionResults& result);
+  void OnSharedAudioBusReady(int session_id,
+                             const media::AudioParameters& params,
+                             const base::SharedMemoryHandle handle,
+                             const base::SyncSocket::TransitDescriptor socket);
+
+  void ResetAudioSink();
 
   int GetOrCreateIDForHandle(const blink::WebSpeechRecognitionHandle& handle);
   bool HandleExists(const blink::WebSpeechRecognitionHandle& handle);
@@ -61,6 +78,15 @@ class SpeechRecognitionDispatcher : public RenderViewObserver,
   // The WebKit client class that we use to send events back to the JS world.
   blink::WebSpeechRecognizerClient* recognizer_client_;
 
+#if defined(ENABLE_WEBRTC)
+  // Media stream audio track that the speech recognition connects to.
+  // Accessed on the render thread.
+  blink::WebMediaStreamTrack audio_track_;
+
+  // Audio sink used to provide audio from the track.
+  scoped_ptr<SpeechRecognitionAudioSink> speech_audio_sink_;
+#endif
+
   typedef std::map<int, blink::WebSpeechRecognitionHandle> HandleMap;
   HandleMap handle_map_;
   int next_id_;