From 897bfb5aaaa57f0338a77fada1d5d3f9c3b38226 Mon Sep 17 00:00:00 2001 From: "vrk@google.com" Date: Mon, 2 Apr 2012 19:30:45 +0000 Subject: Move media/audio files into media namespace BUG=115187 TEST=compiles and runs without breaking audio tag; media_unittests, content_unittests Review URL: https://chromiumcodereview.appspot.com/9805001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130180 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/speech/speech_recognizer_impl.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'content/browser/speech/speech_recognizer_impl.cc') diff --git a/content/browser/speech/speech_recognizer_impl.cc b/content/browser/speech/speech_recognizer_impl.cc index 05f81e7..07bd75e 100644 --- a/content/browser/speech/speech_recognizer_impl.cc +++ b/content/browser/speech/speech_recognizer_impl.cc @@ -23,6 +23,7 @@ using content::SpeechRecognitionEventListener; using content::SpeechRecognitionResult; using content::SpeechRecognizer; using media::AudioInputController; +using media::AudioManager; namespace { @@ -137,13 +138,12 @@ void SpeechRecognizerImpl::StartRecognition() { endpointer_.SetEnvironmentEstimationMode(); AudioManager* audio_manager = (testing_audio_manager_ != NULL) ? - testing_audio_manager_ : - BrowserMainLoop::GetAudioManager(); + testing_audio_manager_ : BrowserMainLoop::GetAudioManager(); const int samples_per_packet = kAudioSampleRate * GoogleOneShotRemoteEngine::kAudioPacketIntervalMs / 1000; - AudioParameters params(AudioParameters::AUDIO_PCM_LINEAR, kChannelLayout, - kAudioSampleRate, kNumBitsPerAudioSample, - samples_per_packet); + media::AudioParameters params( + media::AudioParameters::AUDIO_PCM_LINEAR, kChannelLayout, + kAudioSampleRate, kNumBitsPerAudioSample, samples_per_packet); audio_controller_ = AudioInputController::Create(audio_manager, this, params); DCHECK(audio_controller_.get()); VLOG(1) << "SpeechRecognizer starting record."; -- cgit v1.1