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

Side by Side Diff: content/browser/speech/speech_recognizer_impl.h

Issue 9826023: Merge AudioRendererImpl and AudioRendererBase; add NullAudioSink (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase ToT + address CR comments Created 8 years, 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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_BROWSER_SPEECH_SPEECH_RECOGNIZER_IMPL_H_ 5 #ifndef CONTENT_BROWSER_SPEECH_SPEECH_RECOGNIZER_IMPL_H_
6 #define CONTENT_BROWSER_SPEECH_SPEECH_RECOGNIZER_IMPL_H_ 6 #define CONTENT_BROWSER_SPEECH_SPEECH_RECOGNIZER_IMPL_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "content/browser/speech/endpointer/endpointer.h" 11 #include "content/browser/speech/endpointer/endpointer.h"
12 #include "content/browser/speech/speech_recognition_engine.h" 12 #include "content/browser/speech/speech_recognition_engine.h"
13 #include "content/public/browser/speech_recognizer.h" 13 #include "content/public/browser/speech_recognizer.h"
14 #include "content/public/common/speech_recognition_error.h" 14 #include "content/public/common/speech_recognition_error.h"
15 #include "media/audio/audio_input_controller.h" 15 #include "media/audio/audio_input_controller.h"
16 #include "net/url_request/url_request_context_getter.h" 16 #include "net/url_request/url_request_context_getter.h"
17 17
18 namespace content { 18 namespace content {
19 class SpeechRecognitionEventListener; 19 class SpeechRecognitionEventListener;
20 struct SpeechRecognitionResult; 20 struct SpeechRecognitionResult;
21 } 21 }
22 22
23 namespace media { 23 namespace media {
24 class AudioInputController; 24 class AudioInputController;
25 class AudioManager; 25 class AudioManager;
26 } 26 }
27 27
28 namespace media {
29 class AudioManager;
30 }
31
28 namespace speech { 32 namespace speech {
29 33
30 // Records audio, sends recorded audio to server and translates server response 34 // Records audio, sends recorded audio to server and translates server response
31 // to recognition result. 35 // to recognition result.
32 class CONTENT_EXPORT SpeechRecognizerImpl 36 class CONTENT_EXPORT SpeechRecognizerImpl
33 : public NON_EXPORTED_BASE(content::SpeechRecognizer), 37 : public NON_EXPORTED_BASE(content::SpeechRecognizer),
34 public media::AudioInputController::EventHandler, 38 public media::AudioInputController::EventHandler,
35 public NON_EXPORTED_BASE(SpeechRecognitionEngineDelegate) { 39 public NON_EXPORTED_BASE(SpeechRecognitionEngineDelegate) {
36 public: 40 public:
37 static const int kAudioSampleRate; 41 static const int kAudioSampleRate;
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 std::string origin_url_; 112 std::string origin_url_;
109 int num_samples_recorded_; 113 int num_samples_recorded_;
110 float audio_level_; 114 float audio_level_;
111 115
112 DISALLOW_COPY_AND_ASSIGN(SpeechRecognizerImpl); 116 DISALLOW_COPY_AND_ASSIGN(SpeechRecognizerImpl);
113 }; 117 };
114 118
115 } // namespace speech 119 } // namespace speech
116 120
117 #endif // CONTENT_BROWSER_SPEECH_SPEECH_RECOGNIZER_IMPL_H_ 121 #endif // CONTENT_BROWSER_SPEECH_SPEECH_RECOGNIZER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698