Convert LOG(INFO) to VLOG(1) - media/.

Also, remove some extra {}s, remove "else" after "return", eliminate a "using".

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3912001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63140 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 24 insertions, 34 deletions

diff --git a/media/tools/mfdecoder/main.cc b/media/tools/mfdecoder/main.cc
index 1ede4af..ed9220b 100644
--- a/media/tools/mfdecoder/main.cc
+++ b/media/tools/mfdecoder/main.cc
@@ -446,7 +446,7 @@ int main(int argc, char** argv) {
     usage();
     return -1;
   }
-  LOG(INFO) << "use_dxva2: " << use_dxva2;
+  VLOG(1) << "use_dxva2: " << use_dxva2;
 
   g_render_to_window = false;
   g_render_asap = false;
@@ -462,8 +462,8 @@ int main(int argc, char** argv) {
     usage();
     return -1;
   }
-  LOG(INFO) << "g_render_to_window: " << g_render_to_window;
-  LOG(INFO) << "g_render_asap: " << g_render_asap;
+  VLOG(1) << "g_render_to_window: " << g_render_to_window
+          << "\ng_render_asap: " << g_render_asap;
 
   scoped_array<wchar_t> file_name(ConvertASCIIStringToUnicode(argv[argc-1]));
   if (file_name.get() == NULL) {
@@ -528,8 +528,8 @@ int main(int argc, char** argv) {
   }
   base::Time start(base::Time::Now());
   printf("Decoding started\n");
-  LOG(INFO) << "Decoding " << file_name.get()
-            << " started at " << start.ToTimeT();
+  VLOG(1) << "Decoding " << file_name.get()
+          << " started at " << start.ToTimeT();
 
   base::AtExitManager exit_manager;
   MessageLoopForUI message_loop;
@@ -544,19 +544,15 @@ int main(int argc, char** argv) {
 
   printf("Decoding finished\n");
   base::Time end(base::Time::Now());
-  LOG(INFO) << "Decoding finished at " << end.ToTimeT();
-  LOG(INFO) << "Took " << (end-start).InMilliseconds() << "ms";
-  LOG(INFO) << "Number of frames processed: " << g_num_frames;
-  LOG(INFO) << "Decode time: " << g_decode_time->InMilliseconds() << "ms";
-  LOG(INFO) << "Average decode time: "
-            << (g_num_frames == 0 ?
-                0 :
-                g_decode_time->InMillisecondsF() / g_num_frames);
-  LOG(INFO) << "Render time: " << g_render_time->InMilliseconds() << "ms";
-  LOG(INFO) << "Average render time: "
-            << (g_num_frames == 0 ?
-                0 :
-                g_render_time->InMillisecondsF() / g_num_frames);
+  VLOG(1) << "Decoding finished at " << end.ToTimeT()
+          << "\nTook " << (end-start).InMilliseconds() << "ms"
+          << "\nNumber of frames processed: " << g_num_frames
+          << "\nDecode time: " << g_decode_time->InMilliseconds() << "ms"
+          << "\nAverage decode time: " << ((g_num_frames == 0) ?
+              0 : (g_decode_time->InMillisecondsF() / g_num_frames))
+          << "\nRender time: " << g_render_time->InMilliseconds() << "ms"
+          << "\nAverage render time: " << ((g_num_frames == 0) ?
+              0 : (g_render_time->InMillisecondsF() / g_num_frames));
   printf("Normal termination\n");
   delete g_decode_time;
   delete g_render_time;
diff --git a/media/tools/mfdecoder/mfdecoder.cc b/media/tools/mfdecoder/mfdecoder.cc
index e629a4a..a2b3ba97 100644
--- a/media/tools/mfdecoder/mfdecoder.cc
+++ b/media/tools/mfdecoder/mfdecoder.cc
@@ -1,6 +1,6 @@
-// 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.
+// 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.
 
 #ifdef WINVER
 #undef WINVER
@@ -111,7 +111,7 @@ IMFSample* MFDecoder::ReadVideoSample() {
       return NULL;
     }
     if (output_flags & MF_SOURCE_READERF_ENDOFSTREAM) {
-      LOG(INFO) << "Video sample reading has reached the end of stream";
+      VLOG(1) << "Video sample reading has reached the end of stream";
       end_of_stream_ = true;
       return NULL;
     }
@@ -167,7 +167,7 @@ bool MFDecoder::InitSourceReader(const wchar_t* source_url,
     LOG(ERROR) << "Failed to create source reader";
     return false;
   }
-  LOG(INFO) << "Source reader created";
+  VLOG(1) << "Source reader created";
   return true;
 }
 
@@ -226,7 +226,7 @@ bool MFDecoder::SelectVideoStreamOnly() {
           return false;
         }
         video_stream_index_ = stream_index;
-        LOG(INFO) << "Video stream is at " << video_stream_index_;
+        VLOG(1) << "Video stream is at " << video_stream_index_;
       }
     } else if (hr == MF_E_INVALIDSTREAMNUMBER) {
       break;  // No more streams, quit.
@@ -253,22 +253,17 @@ bool MFDecoder::InitVideoInfo(IDirect3DDeviceManager9* dev_manager) {
   if (FAILED(hr)) {
     LOG(ERROR) << "Failed to determine video subtype";
     return false;
-  } else {
-    if (video_subtype == MFVideoFormat_H264) {
-      LOG(INFO) << "Video subtype is H.264";
-    } else {
-      LOG(INFO) << "Video subtype is NOT H.264";
-    }
   }
+  VLOG(1) << "Video subtype is "
+          << ((video_subtype == MFVideoFormat_H264) ? "" : "NOT ") << "H.264";
   hr = MFGetAttributeSize(video_type, MF_MT_FRAME_SIZE,
                           reinterpret_cast<UINT32*>(&width_),
                           reinterpret_cast<UINT32*>(&height_));
   if (FAILED(hr)) {
     LOG(ERROR) << "Failed to determine frame size";
     return false;
-  } else {
-    LOG(INFO) << "Video width: " << width_ << ", height: " << height_;
   }
+  VLOG(1) << "Video width: " << width_ << ", height: " << height_;
 
   // Try to change to YV12 output format.
   const GUID kOutputVideoSubtype = MFVideoFormat_YV12;
@@ -300,9 +295,8 @@ bool MFDecoder::InitVideoInfo(IDirect3DDeviceManager9* dev_manager) {
   if (FAILED(hr)) {
     LOG(ERROR) << "Failed to change output video format and determine stride";
     return false;
-  } else {
-    LOG(INFO) << "IMFMediaBuffer stride: " << mfbuffer_stride_;
   }
+  VLOG(1) << "IMFMediaBuffer stride: " << mfbuffer_stride_;
 
   // Send a message to the decoder to tell it to use DXVA2.
   if (use_dxva2_) {