Initial VideoProcessing refactoring.

webrtc/modules/video_processing/test/deflickering_test.cc

Index: webrtc/modules/video_processing/test/deflickering_test.cc
diff --git a/webrtc/modules/video_processing/test/deflickering_test.cc b/webrtc/modules/video_processing/test/deflickering_test.cc
index 489f04720d9f311c23397410a73802d24c1e53e0..0622ed18bb0d0cdaadbdb2b2b77ed76cd1387496 100644
--- a/webrtc/modules/video_processing/test/deflickering_test.cc
+++ b/webrtc/modules/video_processing/test/deflickering_test.cc
@@ -20,8 +20,7 @@
 
 namespace webrtc {
 
-TEST_F(VideoProcessingModuleTest, DISABLED_ON_IOS(Deflickering))
-{
+TEST_F(VideoProcessingTest, DISABLED_ON_IOS(Deflickering)) {
     enum { NumRuns = 30 };
     uint32_t frameNum = 0;
     const uint32_t frame_rate = 15;
@@ -45,8 +44,7 @@ TEST_F(VideoProcessingModuleTest, DISABLED_ON_IOS(Deflickering))
 
     printf("\nRun time [us / frame]:\n");
     rtc::scoped_ptr<uint8_t[]> video_buffer(new uint8_t[frame_length_]);
-    for (uint32_t run_idx = 0; run_idx < NumRuns; run_idx++)
-    {
+    for (uint32_t run_idx = 0; run_idx < NumRuns; run_idx++) {
         TickTime t0;
         TickTime t1;
         TickInterval acc_ticks;
@@ -54,8 +52,7 @@ TEST_F(VideoProcessingModuleTest, DISABLED_ON_IOS(Deflickering))
 
         frameNum = 0;
         while (fread(video_buffer.get(), 1, frame_length_, source_file_) ==
-               frame_length_)
-        {
+               frame_length_) {
             frameNum++;
             EXPECT_EQ(
                 0, ConvertToI420(kI420, video_buffer.get(), 0, 0, width_,
@@ -63,14 +60,13 @@ TEST_F(VideoProcessingModuleTest, DISABLED_ON_IOS(Deflickering))
             video_frame_.set_timestamp(timeStamp);
 
             t0 = TickTime::Now();
-            VideoProcessingModule::FrameStats stats;
-            ASSERT_EQ(0, vpm_->GetFrameStats(&stats, video_frame_));
-            ASSERT_EQ(0, vpm_->Deflickering(&video_frame_, &stats));
+            VideoProcessing::FrameStats stats;
+            ASSERT_EQ(0, vp_->GetFrameStats(video_frame_, &stats));
+            ASSERT_EQ(0, vp_->Deflickering(&video_frame_, &stats));
             t1 = TickTime::Now();
             acc_ticks += (t1 - t0);
 
-            if (run_idx == 0)
-            {
+            if (run_idx == 0) {
               if (PrintVideoFrame(video_frame_, deflickerFile) < 0) {
                 return;
               }
@@ -80,8 +76,7 @@ TEST_F(VideoProcessingModuleTest, DISABLED_ON_IOS(Deflickering))
         ASSERT_NE(0, feof(source_file_)) << "Error reading source file";
 
         printf("%u\n", static_cast<int>(acc_ticks.Microseconds() / frameNum));
-        if (acc_ticks.Microseconds() < min_runtime || run_idx == 0)
-        {
+        if (acc_ticks.Microseconds() < min_runtime || run_idx == 0) {
             min_runtime = acc_ticks.Microseconds();
         }
         avg_runtime += acc_ticks.Microseconds();