Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(612)

Unified Diff: content/browser/speech/speech_recognition_dispatcher_host.cc

Issue 10273006: Introduced SpeechRecognitionDispatcher(Host) classes, handling dispatch of IPC messages for continu… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Test fixed + Satish nits. Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/speech/speech_recognition_dispatcher_host.cc
diff --git a/content/browser/speech/speech_recognition_dispatcher_host.cc b/content/browser/speech/speech_recognition_dispatcher_host.cc
new file mode 100644
index 0000000000000000000000000000000000000000..443c3914fb6a9e6582d5aaaeb81dbb650d4ebd19
--- /dev/null
+++ b/content/browser/speech/speech_recognition_dispatcher_host.cc
@@ -0,0 +1,194 @@
+// Copyright (c) 2012 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.
+
+#include "content/browser/speech/speech_recognition_dispatcher_host.h"
+
+#include "base/bind.h"
+#include "base/command_line.h"
+#include "base/lazy_instance.h"
+#include "content/common/speech_recognition_messages.h"
+#include "content/public/browser/speech_recognition_manager.h"
+#include "content/public/browser/speech_recognition_preferences.h"
+#include "content/public/browser/speech_recognition_session_config.h"
+#include "content/public/browser/speech_recognition_session_context.h"
+#include "content/public/common/content_switches.h"
+
+using content::BrowserThread;
+using content::SpeechRecognitionManager;
+using content::SpeechRecognitionSessionConfig;
+using content::SpeechRecognitionSessionContext;
+
+namespace speech {
+SpeechRecognitionManager* SpeechRecognitionDispatcherHost::manager_for_tests_;
+
+void SpeechRecognitionDispatcherHost::SetManagerForTests(
+ SpeechRecognitionManager* manager) {
+ manager_for_tests_ = manager;
+}
+
+SpeechRecognitionDispatcherHost::SpeechRecognitionDispatcherHost(
+ int render_process_id,
+ net::URLRequestContextGetter* context_getter,
+ content::SpeechRecognitionPreferences* recognition_preferences)
+ : render_process_id_(render_process_id),
+ context_getter_(context_getter),
+ recognition_preferences_(recognition_preferences) {
+ // Do not add any non-trivial initialization here, instead do it lazily when
+ // required (e.g. see the method |manager()|) or add an Init() method.
+}
+
+SpeechRecognitionDispatcherHost::~SpeechRecognitionDispatcherHost() {
+ if (SpeechRecognitionManager* sr_manager = manager())
+ sr_manager->AbortAllSessionsForListener(this);
+}
+
+SpeechRecognitionManager* SpeechRecognitionDispatcherHost::manager() {
+ if (manager_for_tests_)
+ return manager_for_tests_;
+
+ const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+ if (command_line.HasSwitch(switches::kEnableScriptedSpeech))
+ return SpeechRecognitionManager::GetInstance();
+
+ return NULL;
+}
+
+bool SpeechRecognitionDispatcherHost::OnMessageReceived(
+ const IPC::Message& message, bool* message_was_ok) {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
jam 2012/05/23 15:41:24 nit: this dcheck, and all the ones below in messag
Primiano Tucci (use gerrit) 2012/05/23 17:11:56 Done.
+ bool handled = true;
+ IPC_BEGIN_MESSAGE_MAP_EX(SpeechRecognitionDispatcherHost, message,
+ *message_was_ok)
+ IPC_MESSAGE_HANDLER(SpeechRecognitionHostMsg_StartRequest,
+ OnStartRequest)
+ IPC_MESSAGE_HANDLER(SpeechRecognitionHostMsg_AbortRequest,
+ OnAbortRequest)
+ IPC_MESSAGE_HANDLER(SpeechRecognitionHostMsg_StopCaptureRequest,
+ OnStopCaptureRequest)
+ IPC_MESSAGE_UNHANDLED(handled = false)
+ IPC_END_MESSAGE_MAP()
+ return handled;
+}
+
+void SpeechRecognitionDispatcherHost::OnStartRequest(
+ const SpeechRecognitionHostMsg_StartRequest_Params& params) {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+
+ SpeechRecognitionSessionContext context;
+ context.render_process_id = render_process_id_;
+ context.render_view_id = params.render_view_id;
+ context.request_id = params.request_id;
+
+ SpeechRecognitionSessionConfig config;
+ config.is_one_shot = params.is_one_shot;
+ config.language = params.language;
+ config.grammars = params.grammars;
+ config.origin_url = params.origin_url;
+ config.initial_context = context;
+ config.url_request_context_getter = context_getter_.get();
+ config.filter_profanities = recognition_preferences_->FilterProfanities();
+ config.event_listener = this;
+
+ int session_id = manager()->CreateSession(config);
+ DCHECK_NE(session_id, content::SpeechRecognitionManager::kSessionIDInvalid);
+ manager()->StartSession(session_id);
+}
+
+void SpeechRecognitionDispatcherHost::OnAbortRequest(int render_view_id,
+ int request_id) {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ int session_id = manager()->GetSession(render_process_id_,
+ render_view_id,
+ request_id);
+ if (session_id != content::SpeechRecognitionManager::kSessionIDInvalid)
+ manager()->AbortSession(session_id);
+}
+
+void SpeechRecognitionDispatcherHost::OnStopCaptureRequest(
+ int render_view_id, int request_id) {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ int session_id = manager()->GetSession(render_process_id_,
+ render_view_id,
+ request_id);
+ if (session_id != content::SpeechRecognitionManager::kSessionIDInvalid)
+ manager()->StopAudioCaptureForSession(session_id);
+}
+
+// -------- SpeechRecognitionEventListener interface implementation -----------
+
+void SpeechRecognitionDispatcherHost::OnRecognitionStart(int session_id) {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ const SpeechRecognitionSessionContext& context =
+ manager()->GetSessionContext(session_id);
+ Send(new SpeechRecognitionMsg_Started(context.render_view_id,
+ context.request_id));
+}
+
+void SpeechRecognitionDispatcherHost::OnAudioStart(int session_id) {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ const SpeechRecognitionSessionContext& context =
+ manager()->GetSessionContext(session_id);
+ Send(new SpeechRecognitionMsg_AudioStarted(context.render_view_id,
+ context.request_id));
+}
+
+void SpeechRecognitionDispatcherHost::OnSoundStart(int session_id) {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ const SpeechRecognitionSessionContext& context =
+ manager()->GetSessionContext(session_id);
jam 2012/05/23 15:41:24 nit: here and below, 4 spaces instead of 6
Primiano Tucci (use gerrit) 2012/05/23 17:11:56 Done.
+ Send(new SpeechRecognitionMsg_SoundStarted(context.render_view_id,
+ context.request_id));
+}
+
+void SpeechRecognitionDispatcherHost::OnSoundEnd(int session_id) {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ const SpeechRecognitionSessionContext& context =
+ manager()->GetSessionContext(session_id);
+ Send(new SpeechRecognitionMsg_SoundEnded(context.render_view_id,
+ context.request_id));
+}
+
+void SpeechRecognitionDispatcherHost::OnAudioEnd(int session_id) {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ const SpeechRecognitionSessionContext& context =
+ manager()->GetSessionContext(session_id);
+ Send(new SpeechRecognitionMsg_AudioEnded(context.render_view_id,
+ context.request_id));
+}
+
+void SpeechRecognitionDispatcherHost::OnRecognitionEnd(int session_id) {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ const SpeechRecognitionSessionContext& context =
+ manager()->GetSessionContext(session_id);
+ Send(new SpeechRecognitionMsg_Ended(context.render_view_id,
+ context.request_id));
+}
+
+void SpeechRecognitionDispatcherHost::OnRecognitionResult(
+ int session_id, const content::SpeechRecognitionResult& result) {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ const SpeechRecognitionSessionContext& context =
+ manager()->GetSessionContext(session_id);
+ Send(new SpeechRecognitionMsg_ResultRetrieved(context.render_view_id,
+ context.request_id,
+ result));
+}
+
+void SpeechRecognitionDispatcherHost::OnRecognitionError(
+ int session_id, const content::SpeechRecognitionError& error) {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ const SpeechRecognitionSessionContext& context =
+ manager()->GetSessionContext(session_id);
+ Send(new SpeechRecognitionMsg_ErrorOccurred(context.render_view_id,
+ context.request_id,
+ error));
+}
+
+// The events below are currently not used by speech JS APIs implementation.
+void SpeechRecognitionDispatcherHost::OnAudioLevelsChange(
+ int session_id, float volume, float noise_volume) {}
+void SpeechRecognitionDispatcherHost::OnEnvironmentEstimationComplete(
+ int session_id) {}
+
+} // namespace speech

Powered by Google App Engine
This is Rietveld 408576698