Revert of Enable video processing unittest to take video clips as param.

webrtc/modules/video_processing/test/video_processing_unittest.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 41 matching lines @@
                      double expected_psnr,
                      VideoProcessing* vpm);
 static bool CompareFrames(const webrtc::VideoFrame& frame1,
                           const webrtc::VideoFrame& frame2);
 static void WriteProcessedFrameForVisualInspection(const VideoFrame& source,
                                                    const VideoFrame& processed);
 
 VideoProcessingTest::VideoProcessingTest()
     : vp_(NULL),
       source_file_(NULL),
-      vtt_(GetParam()),
-      width_(vtt_.width),
+      width_(352),
       half_width_((width_ + 1) / 2),
-      height_(vtt_.height),
+      height_(288),
       size_y_(width_ * height_),
       size_uv_(half_width_ * ((height_ + 1) / 2)),
       frame_length_(CalcBufferSize(kI420, width_, height_)) {}
 
 void VideoProcessingTest::SetUp() {
   vp_ = VideoProcessing::Create();
   ASSERT_TRUE(vp_ != NULL);
+
   video_frame_.CreateEmptyFrame(width_, height_, width_,
                                 half_width_, half_width_);
   // Clear video frame so DrMemory/Valgrind will allow reads of the buffer.
   memset(video_frame_.buffer(kYPlane), 0, video_frame_.allocated_size(kYPlane));
   memset(video_frame_.buffer(kUPlane), 0, video_frame_.allocated_size(kUPlane));
   memset(video_frame_.buffer(kVPlane), 0, video_frame_.allocated_size(kVPlane));
-  source_file_ = fopen(vtt_.file_name.c_str(), "rb");
+  const std::string video_file =
+      webrtc::test::ResourcePath("foreman_cif", "yuv");
+  source_file_ = fopen(video_file.c_str(), "rb");
   ASSERT_TRUE(source_file_ != NULL)
-      << "Cannot read source file: " + vtt_.file_name + "\n";
+      << "Cannot read source file: " + video_file + "\n";
 }
 
 void VideoProcessingTest::TearDown() {
   if (source_file_ != NULL) {
     ASSERT_EQ(0, fclose(source_file_));
   }
   source_file_ = NULL;
   delete vp_;
   vp_ = NULL;
 }
 
 #if defined(WEBRTC_IOS)
-TEST_P(VideoProcessingTest, DISABLED_HandleNullBuffer) {
+TEST_F(VideoProcessingTest, DISABLED_HandleNullBuffer) {
 #else
-TEST_P(VideoProcessingTest, HandleNullBuffer) {
+TEST_F(VideoProcessingTest, HandleNullBuffer) {
 #endif
   // TODO(mikhal/stefan): Do we need this one?
   VideoProcessing::FrameStats stats;
   // Video frame with unallocated buffer.
   VideoFrame videoFrame;
 
   vp_->GetFrameStats(videoFrame, &stats);
   EXPECT_EQ(stats.num_pixels, 0u);
 
   EXPECT_EQ(-1, vp_->Deflickering(&videoFrame, &stats));
 
   EXPECT_EQ(-3, vp_->BrightnessDetection(videoFrame, stats));
 }
 
 #if defined(WEBRTC_IOS)
-TEST_P(VideoProcessingTest, DISABLED_HandleBadStats) {
+TEST_F(VideoProcessingTest, DISABLED_HandleBadStats) {
 #else
-TEST_P(VideoProcessingTest, HandleBadStats) {
+TEST_F(VideoProcessingTest, HandleBadStats) {
 #endif
   VideoProcessing::FrameStats stats;
   vp_->ClearFrameStats(&stats);
   std::unique_ptr<uint8_t[]> video_buffer(new uint8_t[frame_length_]);
   ASSERT_EQ(frame_length_,
             fread(video_buffer.get(), 1, frame_length_, source_file_));
   EXPECT_EQ(0, ConvertToI420(kI420, video_buffer.get(), 0, 0, width_, height_,
                              0, kVideoRotation_0, &video_frame_));
 
   EXPECT_EQ(-1, vp_->Deflickering(&video_frame_, &stats));
 
   EXPECT_EQ(-3, vp_->BrightnessDetection(video_frame_, stats));
 }
 
 #if defined(WEBRTC_IOS)
-TEST_P(VideoProcessingTest, DISABLED_IdenticalResultsAfterReset) {
+TEST_F(VideoProcessingTest, DISABLED_IdenticalResultsAfterReset) {
 #else
-TEST_P(VideoProcessingTest, IdenticalResultsAfterReset) {
+TEST_F(VideoProcessingTest, IdenticalResultsAfterReset) {
 #endif
   VideoFrame video_frame2;
   VideoProcessing::FrameStats stats;
   // Only testing non-static functions here.
   std::unique_ptr<uint8_t[]> video_buffer(new uint8_t[frame_length_]);
   ASSERT_EQ(frame_length_,
             fread(video_buffer.get(), 1, frame_length_, source_file_));
   EXPECT_EQ(0, ConvertToI420(kI420, video_buffer.get(), 0, 0, width_, height_,
                              0, kVideoRotation_0, &video_frame_));
   vp_->GetFrameStats(video_frame_, &stats);
@@ skipping 14 matching lines @@
   vp_->GetFrameStats(video_frame_, &stats);
   EXPECT_GT(stats.num_pixels, 0u);
   video_frame2.CopyFrame(video_frame_);
   ASSERT_EQ(0, vp_->BrightnessDetection(video_frame_, stats));
 
   ASSERT_EQ(0, vp_->BrightnessDetection(video_frame2, stats));
   EXPECT_TRUE(CompareFrames(video_frame_, video_frame2));
 }
 
 #if defined(WEBRTC_IOS)
-TEST_P(VideoProcessingTest, DISABLED_FrameStats) {
+TEST_F(VideoProcessingTest, DISABLED_FrameStats) {
 #else
-TEST_P(VideoProcessingTest, FrameStats) {
+TEST_F(VideoProcessingTest, FrameStats) {
 #endif
   VideoProcessing::FrameStats stats;
   vp_->ClearFrameStats(&stats);
   std::unique_ptr<uint8_t[]> video_buffer(new uint8_t[frame_length_]);
   ASSERT_EQ(frame_length_,
             fread(video_buffer.get(), 1, frame_length_, source_file_));
   EXPECT_EQ(0, ConvertToI420(kI420, video_buffer.get(), 0, 0, width_, height_,
                              0, kVideoRotation_0, &video_frame_));
 
   EXPECT_FALSE(vp_->ValidFrameStats(stats));
   vp_->GetFrameStats(video_frame_, &stats);
   EXPECT_GT(stats.num_pixels, 0u);
   EXPECT_TRUE(vp_->ValidFrameStats(stats));
 
   printf("\nFrameStats\n");
   printf("mean: %u\nnum_pixels: %u\nsubSamplFactor: %u\nsum: %u\n\n",
          static_cast<unsigned int>(stats.mean),
          static_cast<unsigned int>(stats.num_pixels),
          static_cast<unsigned int>(stats.sub_sampling_factor),
          static_cast<unsigned int>(stats.sum));
 
   vp_->ClearFrameStats(&stats);
   EXPECT_FALSE(vp_->ValidFrameStats(stats));
 }
 
 #if defined(WEBRTC_IOS)
-TEST_P(VideoProcessingTest, DISABLED_PreprocessorLogic) {
+TEST_F(VideoProcessingTest, DISABLED_PreprocessorLogic) {
 #else
-TEST_P(VideoProcessingTest, PreprocessorLogic) {
+TEST_F(VideoProcessingTest, PreprocessorLogic) {
 #endif
   // Disable temporal sampling (frame dropping).
   vp_->EnableTemporalDecimation(false);
   int resolution = 100;
   EXPECT_EQ(VPM_OK, vp_->SetTargetResolution(resolution, resolution, 15));
   EXPECT_EQ(VPM_OK, vp_->SetTargetResolution(resolution, resolution, 30));
   // Disable spatial sampling.
   vp_->SetInputFrameResampleMode(kNoRescaling);
   EXPECT_EQ(VPM_OK, vp_->SetTargetResolution(resolution, resolution, 30));
   VideoFrame* out_frame = NULL;
   // Set rescaling => output frame != NULL.
   vp_->SetInputFrameResampleMode(kFastRescaling);
   PreprocessFrameAndVerify(video_frame_, resolution, resolution, vp_,
                            out_frame);
   // No rescaling=> output frame = NULL.
   vp_->SetInputFrameResampleMode(kNoRescaling);
   EXPECT_TRUE(vp_->PreprocessFrame(video_frame_) != nullptr);
 }
 
 #if defined(WEBRTC_IOS)
-TEST_P(VideoProcessingTest, DISABLED_Resampler) {
+TEST_F(VideoProcessingTest, DISABLED_Resampler) {
 #else
-TEST_P(VideoProcessingTest, Resampler) {
+TEST_F(VideoProcessingTest, Resampler) {
 #endif
   enum { NumRuns = 1 };
 
   int64_t min_runtime = 0;
   int64_t total_runtime = 0;
 
   rewind(source_file_);
   ASSERT_TRUE(source_file_ != NULL) << "Cannot read input file \n";
 
   // CA not needed here
@@ skipping 66 matching lines @@
       min_runtime = runtime;
     }
     total_runtime += runtime;
   }
 
   printf("\nAverage run time = %d us / frame\n",
          static_cast<int>(total_runtime));
   printf("Min run time = %d us / frame\n\n", static_cast<int>(min_runtime));
 }
 
-INSTANTIATE_TEST_CASE_P(ForemanCif,
-                        VideoProcessingTest,
-                        ::testing::Values(VideoToTest(
-                            {webrtc::test::ResourcePath("foreman_cif", "yuv"),
-                             352, 288})));
-
 void PreprocessFrameAndVerify(const VideoFrame& source,
                               int target_width,
                               int target_height,
                               VideoProcessing* vpm,
                               const VideoFrame* out_frame) {
   ASSERT_EQ(VPM_OK, vpm->SetTargetResolution(target_width, target_height, 30));
   out_frame = vpm->PreprocessFrame(source);
   EXPECT_TRUE(out_frame != nullptr);
 
   // If no resizing is needed, expect the original frame.
@@ skipping 87 matching lines @@
   std::cout << "Watch " << filename.str() << " and verify that it is okay."
             << std::endl;
   FILE* stand_alone_file = fopen(filename.str().c_str(), "wb");
   if (PrintVideoFrame(processed, stand_alone_file) < 0)
     std::cerr << "Failed to write: " << filename.str() << std::endl;
   if (stand_alone_file)
     fclose(stand_alone_file);
 }
 
 }  // namespace webrtc