Add a noise indicator to the speech bubble volume indicator.

content/browser/speech/speech_recognizer_unittest.cc

 // Copyright (c) 2011 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 <vector>
 
+#include "base/rand_util.h"
 #include "chrome/common/net/test_url_fetcher_factory.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/speech/speech_recognizer.h"
 #include "media/audio/test_audio_input_controller_factory.h"
 #include "net/url_request/url_request_status.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using media::AudioInputController;
 using media::TestAudioInputController;
 using media::TestAudioInputControllerFactory;
@@ skipping 38 matching lines @@
   }
 
   virtual void DidCompleteEnvironmentEstimation(int caller_id) {
   }
 
   virtual void OnRecognizerError(int caller_id,
                                  SpeechRecognizer::ErrorCode error) {
     error_ = error;
   }
 
-  virtual void SetInputVolume(int caller_id, float volume) {
+  virtual void SetInputVolume(int caller_id, float volume, float noise_volume) {
     volume_ = volume;
+    noise_volume_ = noise_volume;
   }
 
   // testing::Test methods.
   virtual void SetUp() {
     URLFetcher::set_factory(&url_fetcher_factory_);
     AudioInputController::set_factory(&audio_input_controller_factory_);
   }
 
   virtual void TearDown() {
     URLFetcher::set_factory(NULL);
     AudioInputController::set_factory(NULL);
   }
 
   void FillPacketWithTestWaveform() {
     // Fill the input with a simple pattern, a 125Hz sawtooth waveform.
     for (size_t i = 0; i < audio_packet_.size(); ++i)
       audio_packet_[i] = static_cast<uint8>(i);
   }
 
+  void FillPacketWithNoise() {
+    for (size_t i = 0; i < audio_packet_.size(); ++i)
+      audio_packet_[i] = static_cast<uint8>(base::RandInt(0, 50));

[Satish, 2011/03/01 16:44:17]

Please ignore this part, I should be hardcoding the values here with some
calculations instead of using base::RandInt(), because there is no way to seed
it with the same initial value and on each test run this generates different
values (hence the test fails).

[bulach, 2011/03/01 17:39:04]

yay for deterministic tests! :)

+  }
+
  protected:
   MessageLoopForIO message_loop_;
   BrowserThread io_thread_;
   scoped_refptr<SpeechRecognizer> recognizer_;
   bool recording_complete_;
   bool recognition_complete_;
   bool result_received_;
   SpeechRecognizer::ErrorCode error_;
   TestURLFetcherFactory url_fetcher_factory_;
   TestAudioInputControllerFactory audio_input_controller_factory_;
   std::vector<uint8> audio_packet_;
   float volume_;
+  float noise_volume_;
 };
 
 TEST_F(SpeechRecognizerTest, StopNoData) {
   // Check for callbacks when stopping record before any audio gets recorded.
   EXPECT_TRUE(recognizer_->StartRecording());
   recognizer_->CancelRecognition();
   EXPECT_FALSE(recording_complete_);
   EXPECT_FALSE(recognition_complete_);
   EXPECT_FALSE(result_received_);
   EXPECT_EQ(SpeechRecognizer::RECOGNIZER_NO_ERROR, error_);
@@ skipping 157 matching lines @@
   EXPECT_TRUE(recognizer_->StartRecording());
   TestAudioInputController* controller =
       audio_input_controller_factory_.controller();
   ASSERT_TRUE(controller);
   controller = audio_input_controller_factory_.controller();
   ASSERT_TRUE(controller);
 
   // Feed some samples to begin with for the endpointer to do noise estimation.
   int num_packets = SpeechRecognizer::kEndpointerEstimationTimeMs /
                     SpeechRecognizer::kAudioPacketIntervalMs;
+  FillPacketWithNoise();
   for (int i = 0; i < num_packets; ++i) {
     controller->event_handler()->OnData(controller, &audio_packet_[0],
                                         audio_packet_.size());
   }
   MessageLoop::current()->RunAllPending();
   EXPECT_EQ(-1.0f, volume_);  // No audio volume set yet.
 
   // The vector is already filled with zero value samples on create.
   controller->event_handler()->OnData(controller, &audio_packet_[0],
                                       audio_packet_.size());
   MessageLoop::current()->RunAllPending();
   EXPECT_EQ(0, volume_);
 
   FillPacketWithTestWaveform();
   controller->event_handler()->OnData(controller, &audio_packet_[0],
                                       audio_packet_.size());
   MessageLoop::current()->RunAllPending();
-  EXPECT_FLOAT_EQ(0.9f, volume_);
+  EXPECT_FLOAT_EQ(0.81907868f, volume_);
+  EXPECT_FLOAT_EQ(0.36962864f, noise_volume_);

[hans, 2011/03/01 17:25:25]

maybe make these magic numbers into constant variables?

 
   EXPECT_EQ(SpeechRecognizer::RECOGNIZER_NO_ERROR, error_);
   EXPECT_FALSE(recording_complete_);
   EXPECT_FALSE(recognition_complete_);
   recognizer_->CancelRecognition();
 }
 
 }  // namespace speech_input