New helper function test::ReadI420Buffer, refactor FrameReader to use it.

webrtc/modules/video_processing/test/denoiser_test.cc

 /*
  *  Copyright (c) 2015 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 107 matching lines @@
     }
   }
   memset(dst, 0, 16 * 16);
   DenoiserDecision decision =
       df_c->MbDenoise(running_src, 16, dst, 16, src, 16, 0, 1);
   EXPECT_EQ(COPY_BLOCK, decision);
   decision = df_sse_neon->MbDenoise(running_src, 16, dst, 16, src, 16, 0, 1);
   EXPECT_EQ(COPY_BLOCK, decision);
 }
 
+// TODO(nisse): Refactor to not use test fixture. Can use some static
+// helper method to open the input file.
 TEST_F(VideoProcessingTest, Denoiser) {
   // Used in swap buffer.
   int denoised_frame_toggle = 0;
   // Create pure C denoiser.
   VideoDenoiser denoiser_c(false);
   // Create SSE or NEON denoiser.
   VideoDenoiser denoiser_sse_neon(true);
   rtc::scoped_refptr<I420Buffer> denoised_frame_c;
   rtc::scoped_refptr<I420Buffer> denoised_frame_prev_c;
   rtc::scoped_refptr<I420Buffer> denoised_frame_sse_neon;
   rtc::scoped_refptr<I420Buffer> denoised_frame_prev_sse_neon;
 
-  std::unique_ptr<uint8_t[]> video_buffer(new uint8_t[frame_length_]);
-  while (fread(video_buffer.get(), 1, frame_length_, source_file_) ==
-         frame_length_) {
-    // Using ConvertToI420 to add stride to the image.
-    rtc::scoped_refptr<webrtc::I420Buffer> input_buffer =
-        I420Buffer::Create(width_, height_, width_, half_width_, half_width_);
-    EXPECT_EQ(0, ConvertToI420(kI420, video_buffer.get(), 0, 0, width_, height_,
-                               0, kVideoRotation_0, input_buffer.get()));
+  for (;;) {
+    rtc::scoped_refptr<VideoFrameBuffer> video_frame_buffer(
+        test::ReadI420Buffer(width_, height_, source_file_));
+    if (!video_frame_buffer)
+      break;
 
     rtc::scoped_refptr<I420Buffer>* p_denoised_c = &denoised_frame_c;
     rtc::scoped_refptr<I420Buffer>* p_denoised_prev_c = &denoised_frame_prev_c;
     rtc::scoped_refptr<I420Buffer>* p_denoised_sse_neon =
         &denoised_frame_sse_neon;
     rtc::scoped_refptr<I420Buffer>* p_denoised_prev_sse_neon =
         &denoised_frame_prev_sse_neon;
     // Swap the buffer to save one memcpy in DenoiseFrame.
     if (denoised_frame_toggle) {
       p_denoised_c = &denoised_frame_prev_c;
       p_denoised_prev_c = &denoised_frame_c;
       p_denoised_sse_neon = &denoised_frame_prev_sse_neon;
       p_denoised_prev_sse_neon = &denoised_frame_sse_neon;
     }
-    denoiser_c.DenoiseFrame(input_buffer, p_denoised_c, p_denoised_prev_c,
+    denoiser_c.DenoiseFrame(video_frame_buffer,
+                            p_denoised_c, p_denoised_prev_c,
                             false);
-    denoiser_sse_neon.DenoiseFrame(input_buffer, p_denoised_sse_neon,
+    denoiser_sse_neon.DenoiseFrame(video_frame_buffer,
+                                   p_denoised_sse_neon,
                                    p_denoised_prev_sse_neon, false);
     // Invert the flag.
     denoised_frame_toggle ^= 1;
     // Denoising results should be the same for C and SSE/NEON denoiser.
     ASSERT_TRUE(test::FrameBufsEqual(*p_denoised_c, *p_denoised_sse_neon));
   }
   ASSERT_NE(0, feof(source_file_)) << "Error reading source file";
 }
 
 }  // namespace webrtc