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

content/browser/speech/speech_recognizer.cc

Index: content/browser/speech/speech_recognizer.cc
diff --git a/content/browser/speech/speech_recognizer.cc b/content/browser/speech/speech_recognizer.cc
index edd34195b2ef5600b05ecd612b2d16280d3e79b6..bba155e9f8128b99398c12a026c8b45cb65213d4 100644
--- a/content/browser/speech/speech_recognizer.cc
+++ b/content/browser/speech/speech_recognizer.cc
@@ -141,34 +141,31 @@ void SpeechRecognizer::StopRecording() {
   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) {
@@ -214,7 +211,6 @@ void SpeechRecognizer::HandleOnData(string* data) {
   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);
@@ -222,6 +218,20 @@ void SpeechRecognizer::HandleOnData(string* data) {
   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.