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

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

Issue 9805001: Move media/audio files into media namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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_recognizer_impl.cc
diff --git a/content/browser/speech/speech_recognizer_impl.cc b/content/browser/speech/speech_recognizer_impl.cc
index 05f81e7bbba3908bf2f64e67222132aa91db694c..07bd75e1be7bea5f54be4ed4948ecd4a7fb6a74e 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.";
« no previous file with comments | « content/browser/speech/speech_recognizer_impl.h ('k') | content/browser/speech/speech_recognizer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698