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..75e17b7d87a3236535d085caed107b743b0554bf 100644
--- a/content/renderer/speech_recognition_dispatcher.h
+++ b/content/renderer/speech_recognition_dispatcher.h
@@ -8,14 +8,22 @@
 #include <map>
 
 #include "base/basictypes.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;
+class SpeechRecognitionAudioSourceProvider;
 struct SpeechRecognitionError;
 struct SpeechRecognitionResult;
 
@@ -53,6 +61,12 @@ class SpeechRecognitionDispatcher : public RenderViewObserver,
   void OnRecognitionEnded(int request_id);
   void OnResultsRetrieved(int request_id,
                           const SpeechRecognitionResults& result);
+  // Called by IPC.

[jamesr, 2014/09/23 23:31:39]

this comment is not helpful.  All of the On...() functions are IPC handlers,
that naming convention is enough

[burnik, 2014/09/24 09:04:37]

Done.

+  void OnAudioTrackReady(int session_id, const media::AudioParameters& params,
+                         base::SharedMemoryHandle handle,
+                         base::SyncSocket::TransitDescriptor socket);
+  // Called By |audio_source_provider_|.

[jamesr, 2014/09/23 23:31:39]

not a very useful comment either and not really true, since we're doing the bind
call audio_source_provider_ doesn't link against this.

You should give this a different name (so it doesn't look like an IPC handler)
and put a blank line between this and the ipc handlers

[burnik, 2014/09/24 09:04:37]

How does this sound?

  // Callback for SpeechRecognitionAudioSourceProvider::OnStoppedCB.
  void AudioTrackStopped();

+  void OnAudioTrackStopped();
 
   int GetOrCreateIDForHandle(const blink::WebSpeechRecognitionHandle& handle);
   bool HandleExists(const blink::WebSpeechRecognitionHandle& handle);
@@ -61,6 +75,13 @@ class SpeechRecognitionDispatcher : public RenderViewObserver,
   // The WebKit client class that we use to send events back to the JS world.
   blink::WebSpeechRecognizerClient* recognizer_client_;
 
+  // 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<SpeechRecognitionAudioSourceProvider> audio_source_provider_;
+
   typedef std::map<int, blink::WebSpeechRecognitionHandle> HandleMap;
   HandleMap handle_map_;
   int next_id_;