From b11d82e170f4193964b1d9ac80dce863546c8c3a Mon Sep 17 00:00:00 2001
From: "xians@chromium.org"
<xians@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 5 Jun 2013 14:56:15 +0000
Subject: Removed the IsRecordingInProcess check for speech since it is not
needed. The check is wrong since other clients doing capturing should not
prevent speech start recording.
BUG=238800
TEST=goto www.corp.google.com/~dou/audio/audio_speech_crash/speech_input.html, the speech recognizer should work on ChromeOS
R=dalecurtis@chromium.org, joi@chromium.org, primiano@chromium.org
Review URL: https://codereview.chromium.org/16286010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204260 0039d316-1c4b-4281-b951-d872f2087c98
---
content/browser/speech/speech_recognition_manager_impl.cc | 4 ----
content/browser/speech/speech_recognition_manager_impl.h | 1 -
content/browser/speech/speech_recognizer_impl.cc | 5 -----
3 files changed, 10 deletions(-)
(limited to 'content/browser/speech')
diff --git a/content/browser/speech/speech_recognition_manager_impl.cc b/content/browser/speech/speech_recognition_manager_impl.cc
index 0b77003..c921ed2 100644
--- a/content/browser/speech/speech_recognition_manager_impl.cc
+++ b/content/browser/speech/speech_recognition_manager_impl.cc
@@ -655,10 +655,6 @@ bool SpeechRecognitionManagerImpl::HasAudioInputDevices() {
return BrowserMainLoop::GetAudioManager()->HasAudioInputDevices();
}
-bool SpeechRecognitionManagerImpl::IsCapturingAudio() {
- return BrowserMainLoop::GetAudioManager()->IsRecordingInProcess();
-}
-
string16 SpeechRecognitionManagerImpl::GetAudioInputDeviceModel() {
return BrowserMainLoop::GetAudioManager()->GetAudioInputDeviceModel();
}
diff --git a/content/browser/speech/speech_recognition_manager_impl.h b/content/browser/speech/speech_recognition_manager_impl.h
index 5f4a3d3..e9ea5a0 100644
--- a/content/browser/speech/speech_recognition_manager_impl.h
+++ b/content/browser/speech/speech_recognition_manager_impl.h
@@ -69,7 +69,6 @@ class CONTENT_EXPORT SpeechRecognitionManagerImpl :
int render_view_id,
int request_id) const OVERRIDE;
virtual bool HasAudioInputDevices() OVERRIDE;
- virtual bool IsCapturingAudio() OVERRIDE;
virtual string16 GetAudioInputDeviceModel() OVERRIDE;
virtual void ShowAudioInputSettings() OVERRIDE;
diff --git a/content/browser/speech/speech_recognizer_impl.cc b/content/browser/speech/speech_recognizer_impl.cc
index 9216478..65ec1fb 100644
--- a/content/browser/speech/speech_recognizer_impl.cc
+++ b/content/browser/speech/speech_recognizer_impl.cc
@@ -403,11 +403,6 @@ SpeechRecognizerImpl::StartRecording(const FSMEventArgs&) {
SPEECH_AUDIO_ERROR_DETAILS_NO_MIC));
}
- if (audio_manager->IsRecordingInProcess()) {
- return Abort(SpeechRecognitionError(SPEECH_RECOGNITION_ERROR_AUDIO,
- SPEECH_AUDIO_ERROR_DETAILS_IN_USE));
- }
-
const int samples_per_packet = (kAudioSampleRate *
recognition_engine_->GetDesiredAudioChunkDurationMs()) / 1000;
AudioParameters params(AudioParameters::AUDIO_PCM_LINEAR, kChannelLayout,
--
cgit v1.1