Revert 277794 "Modifies AudioInputCallback::OnData and use media..."

trunk/src/content/browser/speech/speech_recognizer_impl.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/speech/speech_recognizer_impl.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/time/time.h"
 #include "content/browser/browser_main_loop.h"
@@ skipping 19 matching lines @@
 // Private class which encapsulates the audio converter and the
 // AudioConverter::InputCallback. It handles resampling, buffering and
 // channel mixing between input and output parameters.
 class SpeechRecognizerImpl::OnDataConverter
     : public media::AudioConverter::InputCallback {
  public:
   OnDataConverter(const AudioParameters& input_params,
                   const AudioParameters& output_params);
   virtual ~OnDataConverter();
 
-  // Converts input audio |data| bus into an AudioChunk where the input format
+  // Converts input |data| buffer into an AudioChunk where the input format
   // is given by |input_parameters_| and the output format by
   // |output_parameters_|.
-  scoped_refptr<AudioChunk> Convert(const AudioBus* data);
+  scoped_refptr<AudioChunk> Convert(const uint8* data, size_t size);
 
  private:
   // media::AudioConverter::InputCallback implementation.
   virtual double ProvideInput(AudioBus* dest,
                               base::TimeDelta buffer_delay) OVERRIDE;
 
   // Handles resampling, buffering, and channel mixing between input and output
   // parameters.
   AudioConverter audio_converter_;
 
@@ skipping 71 matching lines @@
   audio_converter_.AddInput(this);
 }
 
 SpeechRecognizerImpl::OnDataConverter::~OnDataConverter() {
   // It should now be safe to unregister the converter since no more OnData()
   // callbacks are outstanding at this point.
   audio_converter_.RemoveInput(this);
 }
 
 scoped_refptr<AudioChunk> SpeechRecognizerImpl::OnDataConverter::Convert(
-    const AudioBus* data) {
-  CHECK_EQ(data->frames(), input_parameters_.frames_per_buffer());
+    const uint8* data, size_t size) {
+  CHECK_EQ(size, static_cast<size_t>(input_parameters_.GetBytesPerBuffer()));
 
-  data->CopyTo(input_bus_.get());
+  input_bus_->FromInterleaved(
+      data, input_bus_->frames(), input_parameters_.bits_per_sample() / 8);
 
   waiting_for_input_ = true;
   audio_converter_.Convert(output_bus_.get());
 
   output_bus_->ToInterleaved(
       output_bus_->frames(), output_parameters_.bits_per_sample() / 8,
       converted_data_.get());
 
   // TODO(primiano): Refactor AudioChunk to avoid the extra-copy here
   // (see http://crbug.com/249316 for details).
@@ skipping 115 matching lines @@
 // Invoked in the audio thread.
 void SpeechRecognizerImpl::OnError(AudioInputController* controller,
     media::AudioInputController::ErrorCode error_code) {
   FSMEventArgs event_args(EVENT_AUDIO_ERROR);
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                           base::Bind(&SpeechRecognizerImpl::DispatchEvent,
                                      this, event_args));
 }
 
 void SpeechRecognizerImpl::OnData(AudioInputController* controller,
-                                  const AudioBus* data) {
+                                  const uint8* data, uint32 size) {
+  if (size == 0)  // This could happen when audio capture stops and is normal.
+    return;
+
   // Convert audio from native format to fixed format used by WebSpeech.
   FSMEventArgs event_args(EVENT_AUDIO_DATA);
-  event_args.audio_data = audio_converter_->Convert(data);
+  event_args.audio_data = audio_converter_->Convert(data, size);
 
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                           base::Bind(&SpeechRecognizerImpl::DispatchEvent,
                                      this, event_args));
 }
 
 void SpeechRecognizerImpl::OnAudioClosed(AudioInputController*) {}
 
 void SpeechRecognizerImpl::OnSpeechRecognitionEngineResults(
     const SpeechRecognitionResults& results) {
@@ skipping 520 matching lines @@
 SpeechRecognizerImpl::FSMEventArgs::FSMEventArgs(FSMEvent event_value)
     : event(event_value),
       audio_data(NULL),
       engine_error(SPEECH_RECOGNITION_ERROR_NONE) {
 }
 
 SpeechRecognizerImpl::FSMEventArgs::~FSMEventArgs() {
 }
 
 }  // namespace content