Chromium Code Reviews| OLD | NEW | 
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #ifndef CONTENT_RENDERER_SPEECH_RECOGNITION_DISPATCHER_H_ | 5 #ifndef CONTENT_RENDERER_SPEECH_RECOGNITION_DISPATCHER_H_ | 
| 6 #define CONTENT_RENDERER_SPEECH_RECOGNITION_DISPATCHER_H_ | 6 #define CONTENT_RENDERER_SPEECH_RECOGNITION_DISPATCHER_H_ | 
| 7 | 7 | 
| 8 #include <map> | 8 #include <map> | 
| 9 | 9 | 
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" | 
| 11 #include "base/memory/shared_memory.h" | |
| 12 #include "base/sync_socket.h" | |
| 11 #include "content/public/common/speech_recognition_result.h" | 13 #include "content/public/common/speech_recognition_result.h" | 
| 12 #include "content/public/renderer/render_view_observer.h" | 14 #include "content/public/renderer/render_view_observer.h" | 
| 15 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" | |
| 13 #include "third_party/WebKit/public/platform/WebVector.h" | 16 #include "third_party/WebKit/public/platform/WebVector.h" | 
| 14 #include "third_party/WebKit/public/web/WebSpeechRecognitionHandle.h" | 17 #include "third_party/WebKit/public/web/WebSpeechRecognitionHandle.h" | 
| 15 #include "third_party/WebKit/public/web/WebSpeechRecognizer.h" | 18 #include "third_party/WebKit/public/web/WebSpeechRecognizer.h" | 
| 16 | 19 | 
| 20 namespace media { | |
| 21 class AudioParameters; | |
| 22 } | |
| 23 | |
| 17 namespace content { | 24 namespace content { | 
| 18 class RenderViewImpl; | 25 class RenderViewImpl; | 
| 26 class SpeechRecognitionAudioSourceProvider; | |
| 19 struct SpeechRecognitionError; | 27 struct SpeechRecognitionError; | 
| 20 struct SpeechRecognitionResult; | 28 struct SpeechRecognitionResult; | 
| 21 | 29 | 
| 22 // SpeechRecognitionDispatcher is a delegate for methods used by WebKit for | 30 // SpeechRecognitionDispatcher is a delegate for methods used by WebKit for | 
| 23 // scripted JS speech APIs. It's the complement of | 31 // scripted JS speech APIs. It's the complement of | 
| 24 // SpeechRecognitionDispatcherHost (owned by RenderViewHost). | 32 // SpeechRecognitionDispatcherHost (owned by RenderViewHost). | 
| 25 class SpeechRecognitionDispatcher : public RenderViewObserver, | 33 class SpeechRecognitionDispatcher : public RenderViewObserver, | 
| 26 public blink::WebSpeechRecognizer { | 34 public blink::WebSpeechRecognizer { | 
| 27 public: | 35 public: | 
| 28 explicit SpeechRecognitionDispatcher(RenderViewImpl* render_view); | 36 explicit SpeechRecognitionDispatcher(RenderViewImpl* render_view); | 
| (...skipping 17 matching lines...) Expand all Loading... | |
| 46 | 54 | 
| 47 void OnRecognitionStarted(int request_id); | 55 void OnRecognitionStarted(int request_id); | 
| 48 void OnAudioStarted(int request_id); | 56 void OnAudioStarted(int request_id); | 
| 49 void OnSoundStarted(int request_id); | 57 void OnSoundStarted(int request_id); | 
| 50 void OnSoundEnded(int request_id); | 58 void OnSoundEnded(int request_id); | 
| 51 void OnAudioEnded(int request_id); | 59 void OnAudioEnded(int request_id); | 
| 52 void OnErrorOccurred(int request_id, const SpeechRecognitionError& error); | 60 void OnErrorOccurred(int request_id, const SpeechRecognitionError& error); | 
| 53 void OnRecognitionEnded(int request_id); | 61 void OnRecognitionEnded(int request_id); | 
| 54 void OnResultsRetrieved(int request_id, | 62 void OnResultsRetrieved(int request_id, | 
| 55 const SpeechRecognitionResults& result); | 63 const SpeechRecognitionResults& result); | 
| 64 // Called by IPC. | |
| 
 
jamesr
2014/09/23 23:31:39
this comment is not helpful.  All of the On...() f
 
burnik
2014/09/24 09:04:37
Done.
 
 | |
| 65 void OnAudioTrackReady(int session_id, const media::AudioParameters& params, | |
| 66 base::SharedMemoryHandle handle, | |
| 67 base::SyncSocket::TransitDescriptor socket); | |
| 68 // Called By |audio_source_provider_|. | |
| 
 
jamesr
2014/09/23 23:31:39
not a very useful comment either and not really tr
 
burnik
2014/09/24 09:04:37
How does this sound?
  // Callback for SpeechReco
 
 | |
| 69 void OnAudioTrackStopped(); | |
| 56 | 70 | 
| 57 int GetOrCreateIDForHandle(const blink::WebSpeechRecognitionHandle& handle); | 71 int GetOrCreateIDForHandle(const blink::WebSpeechRecognitionHandle& handle); | 
| 58 bool HandleExists(const blink::WebSpeechRecognitionHandle& handle); | 72 bool HandleExists(const blink::WebSpeechRecognitionHandle& handle); | 
| 59 const blink::WebSpeechRecognitionHandle& GetHandleFromID(int handle_id); | 73 const blink::WebSpeechRecognitionHandle& GetHandleFromID(int handle_id); | 
| 60 | 74 | 
| 61 // The WebKit client class that we use to send events back to the JS world. | 75 // The WebKit client class that we use to send events back to the JS world. | 
| 62 blink::WebSpeechRecognizerClient* recognizer_client_; | 76 blink::WebSpeechRecognizerClient* recognizer_client_; | 
| 63 | 77 | 
| 78 // Media stream audio track that the speech recognition connects to. | |
| 79 // Accessed on the render thread. | |
| 80 blink::WebMediaStreamTrack audio_track_; | |
| 81 | |
| 82 // Audio sink used to provide audio from the track. | |
| 83 scoped_ptr<SpeechRecognitionAudioSourceProvider> audio_source_provider_; | |
| 84 | |
| 64 typedef std::map<int, blink::WebSpeechRecognitionHandle> HandleMap; | 85 typedef std::map<int, blink::WebSpeechRecognitionHandle> HandleMap; | 
| 65 HandleMap handle_map_; | 86 HandleMap handle_map_; | 
| 66 int next_id_; | 87 int next_id_; | 
| 67 | 88 | 
| 68 DISALLOW_COPY_AND_ASSIGN(SpeechRecognitionDispatcher); | 89 DISALLOW_COPY_AND_ASSIGN(SpeechRecognitionDispatcher); | 
| 69 }; | 90 }; | 
| 70 | 91 | 
| 71 } // namespace content | 92 } // namespace content | 
| 72 | 93 | 
| 73 #endif // CONTENT_RENDERER_SPEECH_RECOGNITION_DISPATCHER_H_ | 94 #endif // CONTENT_RENDERER_SPEECH_RECOGNITION_DISPATCHER_H_ | 
| OLD | NEW |