commit 5908c71128aea207e42f86468aedb0a6fce3cccb
author philipel <philipel@webrtc.org> Mon Dec 21 08:23:20 2015 -0800
committer Commit bot <commit-bot@chromium.org> Mon Dec 21 16:23:29 2015 +0000
tree 7ee8ead02e7623e14c6b5d2c14cd381038238c7e
parent f5b1abf5b002d74a61e43e80782a544446b27617

Lint fix for webrtc/modules/video_coding PART 3!

Trying to submit all changes at once proved impossible since there were
too many changes in too many files. The changes to PRESUBMIT.py
will be uploaded in the last CL.
(original CL: https://codereview.webrtc.org/1528503003/)

BUG=webrtc:5309
TBR=mflodman@webrtc.org

Review URL: https://codereview.webrtc.org/1540243002

Cr-Commit-Position: refs/heads/master@{#11105}

webrtc/modules/video_coding/test/test_util.cc

diff --git a/webrtc/modules/video_coding/test/test_util.cc b/webrtc/modules/video_coding/test/test_util.cc
index fc670ad..7ff663e 100644
--- a/webrtc/modules/video_coding/test/test_util.cc
+++ b/webrtc/modules/video_coding/test/test_util.cc
@@ -28,12 +28,12 @@
       rtt(0),
       inputFile(webrtc::test::ProjectRootPath() + "/resources/foreman_cif.yuv"),
       outputFile(webrtc::test::OutputPath() +
-          "video_coding_test_output_352x288.yuv") {
-}
+                 "video_coding_test_output_352x288.yuv") {}
 
 namespace {
 
-void SplitFilename(const std::string& filename, std::string* basename,
+void SplitFilename(const std::string& filename,
+                   std::string* basename,
                    std::string* extension) {
   assert(basename);
   assert(extension);
@@ -41,7 +41,7 @@
   std::string::size_type idx;
   idx = filename.rfind('.');
 
-  if(idx != std::string::npos) {
+  if (idx != std::string::npos) {
     *basename = filename.substr(0, idx);
     *extension = filename.substr(idx + 1);
   } else {
@@ -50,21 +50,24 @@
   }
 }
 
-std::string AppendWidthHeightCount(const std::string& filename, int width,
-                                   int height, int count) {
+std::string AppendWidthHeightCount(const std::string& filename,
+                                   int width,
+                                   int height,
+                                   int count) {
   std::string basename;
   std::string extension;
   SplitFilename(filename, &basename, &extension);
   std::stringstream ss;
-  ss << basename << "_" << count << "." <<  width << "_" << height << "." <<
-      extension;
+  ss << basename << "_" << count << "." << width << "_" << height << "."
+     << extension;
   return ss.str();
 }
 
 }  // namespace
 
 FileOutputFrameReceiver::FileOutputFrameReceiver(
-    const std::string& base_out_filename, uint32_t ssrc)
+    const std::string& base_out_filename,
+    uint32_t ssrc)
     : out_filename_(),
       out_file_(NULL),
       timing_file_(NULL),
@@ -80,8 +83,8 @@
     SplitFilename(base_out_filename, &basename, &extension);
   }
   std::stringstream ss;
-  ss << basename << "_" << std::hex << std::setw(8) << std::setfill('0') <<
-      ssrc << "." << extension;
+  ss << basename << "_" << std::hex << std::setw(8) << std::setfill('0') << ssrc
+     << "." << extension;
   out_filename_ = ss.str();
 }
 
@@ -113,8 +116,8 @@
     printf("New size: %dx%d\n", video_frame.width(), video_frame.height());
     width_ = video_frame.width();
     height_ = video_frame.height();
-    std::string filename_with_width_height = AppendWidthHeightCount(
-        out_filename_, width_, height_, count_);
+    std::string filename_with_width_height =
+        AppendWidthHeightCount(out_filename_, width_, height_, count_);
     ++count_;
     out_file_ = fopen(filename_with_width_height.c_str(), "wb");
     if (out_file_ == NULL) {
@@ -122,7 +125,7 @@
     }
   }
   fprintf(timing_file_, "%u, %u\n", video_frame.timestamp(),
-      webrtc::MaskWord64ToUWord32(video_frame.render_time_ms()));
+          webrtc::MaskWord64ToUWord32(video_frame.render_time_ms()));
   if (PrintVideoFrame(video_frame, out_file_) < 0) {
     return -1;
   }
@@ -130,7 +133,7 @@
 }
 
 webrtc::RtpVideoCodecTypes ConvertCodecType(const char* plname) {
-  if (strncmp(plname,"VP8" , 3) == 0) {
+  if (strncmp(plname, "VP8", 3) == 0) {
     return webrtc::kRtpVideoVp8;
   } else {
     // Default value.