Stream speech audio to server as it gets recorded, instead of waiting until end of recording.

content/browser/speech/speech_recognizer.cc

 // Copyright (c) 2010 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.h"
 
 #include "base/time.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/net/url_request_context_getter.h"
 #include "content/browser/browser_thread.h"
@@ skipping 123 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // If audio recording has already stopped and we are in recognition phase,
   // silently ignore any more calls to stop recording.
   if (!audio_controller_.get())
     return;
 
   VLOG(1) << "SpeechRecognizer stopping record.";
   audio_controller_->Close();
   audio_controller_ = NULL;  // Releases the ref ptr.
-  encoder_->Flush();
 
   delegate_->DidCompleteRecording(caller_id_);
 
-  // Since the http request takes a single string as POST data, allocate
-  // one and copy over bytes from the audio buffers to the string.
-  // And If we haven't got any audio yet end the recognition sequence here.
-  string mime_type = encoder_->mime_type();
-  string data;
-  encoder_->GetEncodedData(&data);
+  // UploadAudioChunk requires a non-empty buffer. So we encode a packet of

[bulach, 2011/03/04 12:41:08]

maybe: non-empty final buffer

+  // silence in case encoder had no data already.
+  int num_samples = (kAudioSampleRate * kAudioPacketIntervalMs) / 1000;
+  scoped_ptr<short> samples(new short[num_samples]);
+  memset(samples.get(), 0, sizeof(short) * num_samples);

[bulach, 2011/03/04 12:41:08]

would this work?

vector<short> sample((kAudioSampleRate * kAudioPacketIntervalMs) / 1000);
encoder_->Encode(sample.data(), sample.size());

+  encoder_->Encode(samples.get(), num_samples);
+  encoder_->Flush();
+  string encoded_data;
+  encoder_->GetEncodedDataAndClear(&encoded_data);
+  DCHECK(!encoded_data.empty());
   encoder_.reset();
 
-  if (data.empty()) {
+  // If we haven't got any audio yet end the recognition sequence here.
+  if (request_ == NULL) {
     // Guard against the delegate freeing us until we finish our job.
     scoped_refptr<SpeechRecognizer> me(this);
     delegate_->DidCompleteRecognition(caller_id_);
   } else {
-    DCHECK(!request_.get());
-    request_.reset(new SpeechRecognitionRequest(
-        Profile::GetDefaultRequestContext(), this));
-    request_->Send(language_, grammar_, hardware_info_, origin_url_,
-                   mime_type, data);
+    request_->UploadAudioChunk(encoded_data, true);

[bulach, 2011/03/04 12:41:08]

nit: true /* final */

   }
 }
 
-void SpeechRecognizer::ReleaseAudioBuffers() {
-}
-
 // Invoked in the audio thread.
 void SpeechRecognizer::OnError(AudioInputController* controller,
                                int error_code) {
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                          NewRunnableMethod(this,
                                            &SpeechRecognizer::HandleOnError,
                                            error_code));
 }
 
 void SpeechRecognizer::HandleOnError(int error_code) {
@@ skipping 25 matching lines @@
   // recording might have been stopped after this buffer was posted to the queue
   // by |OnData|.
   if (!audio_controller_.get()) {
     delete data;
     return;
   }
 
   const short* samples = reinterpret_cast<const short*>(data->data());
   DCHECK((data->length() % sizeof(short)) == 0);
   int num_samples = data->length() / sizeof(short);
-
   encoder_->Encode(samples, num_samples);
   float rms;
   endpointer_.ProcessAudio(samples, num_samples, &rms);
   bool did_clip = Clipping(samples, num_samples);
   delete data;
   num_samples_recorded_ += num_samples;
 
+  if (request_ == NULL) {
+    // This was the first audio packet recorded, so start a request to the
+    // server to send the data.
+    request_.reset(new SpeechRecognitionRequest(
+        Profile::GetDefaultRequestContext(), this));
+    request_->Start(language_, grammar_, hardware_info_, origin_url_,
+                    encoder_->mime_type());
+  }
+
+  string encoded_data;
+  encoder_->GetEncodedDataAndClear(&encoded_data);
+  DCHECK(!encoded_data.empty());
+  request_->UploadAudioChunk(encoded_data, false);

[bulach, 2011/03/04 12:41:08]

nit: false /* final */

+
   if (endpointer_.IsEstimatingEnvironment()) {
     // Check if we have gathered enough audio for the endpointer to do
     // environment estimation and should move on to detect speech/end of speech.
     if (num_samples_recorded_ >= (kEndpointerEstimationTimeMs *
                                   kAudioSampleRate) / 1000) {
       endpointer_.SetUserInputMode();
       delegate_->DidCompleteEnvironmentEstimation(caller_id_);
     }
     return;  // No more processing since we are still estimating environment.
   }
@@ skipping 48 matching lines @@
 
 void SpeechRecognizer::InformErrorAndCancelRecognition(ErrorCode error) {
   CancelRecognition();
 
   // Guard against the delegate freeing us until we finish our job.
   scoped_refptr<SpeechRecognizer> me(this);
   delegate_->OnRecognizerError(caller_id_, error);
 }
 
 }  // namespace speech_input