diff options
author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-21 21:51:26 +0000 |
---|---|---|
committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-21 21:51:26 +0000 |
commit | b95d214c45196772f97d544dd80993f2810fb855 (patch) | |
tree | 959c5426c7a898c27399a4255e3a8bb3be555d7e | |
parent | 9a89e8c6f672fbf9254d9febacd1f07e05541f4e (diff) | |
download | chromium_src-b95d214c45196772f97d544dd80993f2810fb855.zip chromium_src-b95d214c45196772f97d544dd80993f2810fb855.tar.gz chromium_src-b95d214c45196772f97d544dd80993f2810fb855.tar.bz2 |
Convert LOG(INFO) to VLOG(1) - chrome/browser/speech/.
Also sets svn:eol-style on some files.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/4001001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63426 0039d316-1c4b-4281-b951-d872f2087c98
6 files changed, 40 insertions, 42 deletions
diff --git a/chrome/browser/speech/endpointer/energy_endpointer.cc b/chrome/browser/speech/endpointer/energy_endpointer.cc index fd72b3f..85d4a29 100644 --- a/chrome/browser/speech/endpointer/energy_endpointer.cc +++ b/chrome/browser/speech/endpointer/energy_endpointer.cc @@ -239,7 +239,7 @@ void EnergyEndpointer::ProcessAudioFrame(int64 time_us, if ((endpointer_time_us_ - user_input_start_time_us_) < Secs2Usecs(params_.contamination_rejection_period())) { decision = false; - DLOG(INFO) << "decision: forced to false, time: " << endpointer_time_us_; + DVLOG(1) << "decision: forced to false, time: " << endpointer_time_us_; } else { decision = (rms > decision_threshold_); } @@ -327,9 +327,9 @@ void EnergyEndpointer::ProcessAudioFrame(int64 time_us, ++frame_counter_; if (rms_out) { - *rms_out = -120.0;
- if ((noise_level_ > 0.0) && ((rms / noise_level_ ) > 0.000001))
- *rms_out = static_cast<float>(20.0 * log10(rms / noise_level_));
+ *rms_out = -120.0; + if ((noise_level_ > 0.0) && ((rms / noise_level_ ) > 0.000001)) + *rms_out = static_cast<float>(20.0 * log10(rms / noise_level_)); } } @@ -342,8 +342,8 @@ void EnergyEndpointer::UpdateLevels(float rms) { float alpha = static_cast<float>(frame_counter_) / static_cast<float>(fast_update_frames_); noise_level_ = (alpha * noise_level_) + ((1 - alpha) * rms); - DLOG(INFO) << "FAST UPDATE, frame_counter_ " << frame_counter_ - << "fast_update_frames_ " << fast_update_frames_; + DVLOG(1) << "FAST UPDATE, frame_counter_ " << frame_counter_ + << ", fast_update_frames_ " << fast_update_frames_; } else { // Update Noise level. The noise level adapts quickly downward, but // slowly upward. The noise_level_ parameter is not currently used diff --git a/chrome/browser/speech/speech_input_browsertest.cc b/chrome/browser/speech/speech_input_browsertest.cc index b8c0e7f..2f428ce 100644 --- a/chrome/browser/speech/speech_input_browsertest.cc +++ b/chrome/browser/speech/speech_input_browsertest.cc @@ -43,7 +43,7 @@ class FakeSpeechInputManager : public SpeechInputManager { int render_process_id, int render_view_id, const gfx::Rect& element_rect) { - LOG(INFO) << "StartRecognition invoked."; + VLOG(1) << "StartRecognition invoked."; EXPECT_EQ(0, caller_id_); EXPECT_EQ(NULL, delegate_); caller_id_ = caller_id; @@ -53,13 +53,13 @@ class FakeSpeechInputManager : public SpeechInputManager { &FakeSpeechInputManager::SetFakeRecognitionResult)); } void CancelRecognition(int caller_id) { - LOG(INFO) << "CancelRecognition invoked."; + VLOG(1) << "CancelRecognition invoked."; EXPECT_EQ(caller_id_, caller_id); caller_id_ = 0; delegate_ = NULL; } void StopRecording(int caller_id) { - LOG(INFO) << "StopRecording invoked."; + VLOG(1) << "StopRecording invoked."; EXPECT_EQ(caller_id_, caller_id); // Nothing to do here since we aren't really recording. } @@ -67,14 +67,14 @@ class FakeSpeechInputManager : public SpeechInputManager { private: void SetFakeRecognitionResult() { if (caller_id_) { // Do a check in case we were cancelled.. - LOG(INFO) << "Setting fake recognition result."; + VLOG(1) << "Setting fake recognition result."; delegate_->DidCompleteRecording(caller_id_); delegate_->SetRecognitionResult(caller_id_, ASCIIToUTF16(kTestResult)); delegate_->DidCompleteRecognition(caller_id_); caller_id_ = 0; delegate_ = NULL; - LOG(INFO) << "Finished setting fake recognition result."; + VLOG(1) << "Finished setting fake recognition result."; } } @@ -114,7 +114,7 @@ IN_PROC_BROWSER_TEST_F(SpeechInputBrowserTest, FLAKY_TestBasicRecognition) { GURL test_url = testUrl(FILE_PATH_LITERAL("basic_recognition.html")); ui_test_utils::NavigateToURL(browser(), test_url); std::string coords = browser()->GetSelectedTabContents()->GetURL().ref(); - LOG(INFO) << "Coordinates given by script: " << coords; + VLOG(1) << "Coordinates given by script: " << coords; int comma_pos = coords.find(','); ASSERT_NE(-1, comma_pos); int x = 0; diff --git a/chrome/browser/speech/speech_input_bubble_controller_unittest.cc b/chrome/browser/speech/speech_input_bubble_controller_unittest.cc index 84ba989..2ed1f1b 100644 --- a/chrome/browser/speech/speech_input_bubble_controller_unittest.cc +++ b/chrome/browser/speech/speech_input_bubble_controller_unittest.cc @@ -23,13 +23,13 @@ class MockSpeechInputBubble : public SpeechInputBubbleBase { }; MockSpeechInputBubble(TabContents*, Delegate* delegate, const gfx::Rect&) { - LOG(INFO) << "MockSpeechInputBubble created"; + VLOG(1) << "MockSpeechInputBubble created"; MessageLoop::current()->PostTask( FROM_HERE, NewRunnableFunction(&InvokeDelegate, delegate)); } static void InvokeDelegate(Delegate* delegate) { - LOG(INFO) << "MockSpeechInputBubble invoking delegate for type " << type_; + VLOG(1) << "MockSpeechInputBubble invoking delegate for type " << type_; switch (type_) { case BUBBLE_TEST_FOCUS_CHANGED: delegate->InfoBubbleFocusChanged(); @@ -84,7 +84,7 @@ class SpeechInputBubbleControllerTest // SpeechInputBubbleControllerDelegate methods. virtual void InfoBubbleButtonClicked(int caller_id, SpeechInputBubble::Button button) { - LOG(INFO) << "Received InfoBubbleButtonClicked for button " << button; + VLOG(1) << "Received InfoBubbleButtonClicked for button " << button; EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO)); if (button == SpeechInputBubble::BUTTON_CANCEL) { cancel_clicked_ = true; @@ -95,7 +95,7 @@ class SpeechInputBubbleControllerTest } virtual void InfoBubbleFocusChanged(int caller_id) { - LOG(INFO) << "Received InfoBubbleFocusChanged"; + VLOG(1) << "Received InfoBubbleFocusChanged"; EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO)); focus_changed_ = true; MessageLoop::current()->Quit(); diff --git a/chrome/browser/speech/speech_input_dispatcher_host.cc b/chrome/browser/speech/speech_input_dispatcher_host.cc index bd35b13..d9f22ee 100644 --- a/chrome/browser/speech/speech_input_dispatcher_host.cc +++ b/chrome/browser/speech/speech_input_dispatcher_host.cc @@ -175,7 +175,7 @@ void SpeechInputDispatcherHost::SendMessageToRenderView(IPC::Message* message, void SpeechInputDispatcherHost::SetRecognitionResult(int caller_id, const string16& result) { - LOG(INFO) << "SpeechInputDispatcherHost::SetRecognitionResult enter"; + VLOG(1) << "SpeechInputDispatcherHost::SetRecognitionResult enter"; DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); int caller_render_view_id = callers_->render_view_id(caller_id); int caller_request_id = callers_->request_id(caller_id); @@ -184,11 +184,11 @@ void SpeechInputDispatcherHost::SetRecognitionResult(int caller_id, caller_request_id, result), caller_render_view_id); - LOG(INFO) << "SpeechInputDispatcherHost::SetRecognitionResult exit"; + VLOG(1) << "SpeechInputDispatcherHost::SetRecognitionResult exit"; } void SpeechInputDispatcherHost::DidCompleteRecording(int caller_id) { - LOG(INFO) << "SpeechInputDispatcherHost::DidCompleteRecording enter"; + VLOG(1) << "SpeechInputDispatcherHost::DidCompleteRecording enter"; DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); int caller_render_view_id = callers_->render_view_id(caller_id); int caller_request_id = callers_->request_id(caller_id); @@ -196,11 +196,11 @@ void SpeechInputDispatcherHost::DidCompleteRecording(int caller_id) { new ViewMsg_SpeechInput_RecordingComplete(caller_render_view_id, caller_request_id), caller_render_view_id); - LOG(INFO) << "SpeechInputDispatcherHost::DidCompleteRecording exit"; + VLOG(1) << "SpeechInputDispatcherHost::DidCompleteRecording exit"; } void SpeechInputDispatcherHost::DidCompleteRecognition(int caller_id) { - LOG(INFO) << "SpeechInputDispatcherHost::DidCompleteRecognition enter"; + VLOG(1) << "SpeechInputDispatcherHost::DidCompleteRecognition enter"; DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); int caller_render_view_id = callers_->render_view_id(caller_id); int caller_request_id = callers_->request_id(caller_id); @@ -209,7 +209,7 @@ void SpeechInputDispatcherHost::DidCompleteRecognition(int caller_id) { caller_request_id), caller_render_view_id); callers_->RemoveId(caller_id); // Request sequence ended, so remove mapping. - LOG(INFO) << "SpeechInputDispatcherHost::DidCompleteRecognition exit"; + VLOG(1) << "SpeechInputDispatcherHost::DidCompleteRecognition exit"; } } // namespace speech_input diff --git a/chrome/browser/speech/speech_recognition_request.cc b/chrome/browser/speech/speech_recognition_request.cc index 1bb2efe..4da62ef 100644 --- a/chrome/browser/speech/speech_recognition_request.cc +++ b/chrome/browser/speech/speech_recognition_request.cc @@ -21,25 +21,23 @@ bool ParseServerResponse(const std::string& response_body, string16* value) { DCHECK(value); if (response_body.empty()) { - LOG(WARNING) << "ParseServerResponse: Response was empty.\n"; + LOG(WARNING) << "ParseServerResponse: Response was empty."; return false; } - DLOG(INFO) << "ParseServerResponse: Parsing response " - << response_body << ".\n"; + DVLOG(1) << "ParseServerResponse: Parsing response " << response_body; // Parse the response, ignoring comments. std::string error_msg; scoped_ptr<Value> response_value(base::JSONReader::ReadAndReturnError( response_body, false, NULL, &error_msg)); if (response_value == NULL) { - LOG(WARNING) << "ParseServerResponse: JSONReader failed : " - << error_msg << ".\n"; + LOG(WARNING) << "ParseServerResponse: JSONReader failed : " << error_msg; return false; } if (!response_value->IsType(Value::TYPE_DICTIONARY)) { - LOG(INFO) << "ParseServerResponse: Unexpected response type " - << response_value->GetType() << ".\n"; + VLOG(1) << "ParseServerResponse: Unexpected response type " + << response_value->GetType(); return false; } const DictionaryValue* response_object = @@ -48,36 +46,36 @@ bool ParseServerResponse(const std::string& response_body, string16* value) { // Get the hypotheses Value* hypotheses_value = NULL; if (!response_object->Get(kHypothesesString, &hypotheses_value)) { - LOG(INFO) << "ParseServerResponse: Missing hypotheses attribute.\n"; + VLOG(1) << "ParseServerResponse: Missing hypotheses attribute."; return false; } DCHECK(hypotheses_value); if (!hypotheses_value->IsType(Value::TYPE_LIST)) { - LOG(INFO) << "ParseServerResponse: Unexpected hypotheses type " - << hypotheses_value->GetType() << ".\n"; + VLOG(1) << "ParseServerResponse: Unexpected hypotheses type " + << hypotheses_value->GetType(); return false; } const ListValue* hypotheses_list = static_cast<ListValue*>(hypotheses_value); if (hypotheses_list->GetSize() == 0) { - LOG(INFO) << "ParseServerResponse: hypotheses list is empty.\n"; + VLOG(1) << "ParseServerResponse: hypotheses list is empty."; return false; } Value* first_hypotheses = NULL; if (!hypotheses_list->Get(0, &first_hypotheses)) { - LOG(INFO) << "ParseServerResponse: Unable to read hypotheses value.\n"; + LOG(WARNING) << "ParseServerResponse: Unable to read hypotheses value."; return false; } DCHECK(first_hypotheses); if (!first_hypotheses->IsType(Value::TYPE_DICTIONARY)) { - LOG(INFO) << "ParseServerResponse: Unexpected value type " - << first_hypotheses->GetType() << ".\n"; + LOG(WARNING) << "ParseServerResponse: Unexpected value type " + << first_hypotheses->GetType(); return false; } const DictionaryValue* first_hypotheses_value = static_cast<DictionaryValue*>(first_hypotheses); if (!first_hypotheses_value->GetString(kUtteranceString, value)) { - LOG(INFO) << "ParseServerResponse: Missing utterance value.\n"; + LOG(WARNING) << "ParseServerResponse: Missing utterance value."; return false; } @@ -134,7 +132,7 @@ void SpeechRecognitionRequest::OnURLFetchComplete( error = !ParseServerResponse(data, &value); url_fetcher_.reset(); - DLOG(INFO) << "SpeechRecognitionRequest: Invoking delegate with result."; + DVLOG(1) << "SpeechRecognitionRequest: Invoking delegate with result."; delegate_->SetRecognitionResult(error, value); } diff --git a/chrome/browser/speech/speech_recognizer.cc b/chrome/browser/speech/speech_recognizer.cc index a6913d4..8ad4590 100644 --- a/chrome/browser/speech/speech_recognizer.cc +++ b/chrome/browser/speech/speech_recognizer.cc @@ -150,7 +150,7 @@ bool SpeechRecognizer::StartRecording() { audio_controller_ = AudioInputController::Create(this, params, samples_per_packet); DCHECK(audio_controller_.get()); - LOG(INFO) << "SpeechRecognizer starting record."; + VLOG(1) << "SpeechRecognizer starting record."; num_samples_recorded_ = 0; audio_controller_->Record(); @@ -163,12 +163,12 @@ void SpeechRecognizer::CancelRecognition() { // Stop recording if required. if (audio_controller_.get()) { - LOG(INFO) << "SpeechRecognizer stopping record."; + VLOG(1) << "SpeechRecognizer stopping record."; audio_controller_->Close(); audio_controller_ = NULL; // Releases the ref ptr. } - LOG(INFO) << "SpeechRecognizer canceling recognition."; + VLOG(1) << "SpeechRecognizer canceling recognition."; ReleaseAudioBuffers(); request_.reset(); } @@ -181,7 +181,7 @@ void SpeechRecognizer::StopRecording() { if (!audio_controller_.get()) return; - LOG(INFO) << "SpeechRecognizer stopping record."; + VLOG(1) << "SpeechRecognizer stopping record."; audio_controller_->Close(); audio_controller_ = NULL; // Releases the ref ptr. |