| Index: chrome/browser/speech/speech_recognizer.h
|
| diff --git a/chrome/browser/speech/speech_recognizer.h b/chrome/browser/speech/speech_recognizer.h
|
| index cafba287f57fea63a0f3b691f93e15cca79a0ffd..5e8511f596e8c26fcc52649d23916c70bdec79a9 100644
|
| --- a/chrome/browser/speech/speech_recognizer.h
|
| +++ b/chrome/browser/speech/speech_recognizer.h
|
| @@ -11,14 +11,13 @@
|
|
|
| #include "base/ref_counted.h"
|
| #include "base/scoped_ptr.h"
|
| +#include "chrome/browser/speech/audio_encoder.h"
|
| #include "chrome/browser/speech/endpointer/endpointer.h"
|
| #include "chrome/browser/speech/speech_recognition_request.h"
|
| #include "media/audio/audio_input_controller.h"
|
|
|
| namespace speech_input {
|
|
|
| -class SpeexEncoder;
|
| -
|
| // Records audio, sends recorded audio to server and translates server response
|
| // to recognition result.
|
| class SpeechRecognizer
|
| @@ -128,13 +127,10 @@ class SpeechRecognizer
|
| std::string grammar_;
|
| std::string hardware_info_;
|
|
|
| - // Buffer holding the recorded audio. Owns the strings inside the list.
|
| - typedef std::list<std::string*> AudioBufferQueue;
|
| - AudioBufferQueue audio_buffers_;
|
| -
|
| scoped_ptr<SpeechRecognitionRequest> request_;
|
| scoped_refptr<media::AudioInputController> audio_controller_;
|
| - scoped_ptr<SpeexEncoder> encoder_;
|
| + AudioEncoder::Codec codec_;
|
| + scoped_ptr<AudioEncoder> encoder_;
|
| Endpointer endpointer_;
|
| int num_samples_recorded_;
|
| float audio_level_;
|
|
|