Cleanup of webrtc::VideoFrame.

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.
  */
 
 #include <string.h>
 
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 #include "webrtc/modules/video_processing/include/video_processing.h"
 #include "webrtc/modules/video_processing/test/video_processing_unittest.h"
 #include "webrtc/modules/video_processing/video_denoiser.h"
 
+namespace {
+// Duplicated in i420_video_frame_unittest.cc

[pbos-webrtc, 2016/02/09 15:18:14]

Put this somewhere common, even if it's only test code. webrtc/test might have
something that you can use in both test targets.

[nisse-webrtc, 2016/02/09 15:31:33]

I see no obvious place. Any suggestion for file (and namespace?) to put it in?

A new file webrtc/test/frame_utils.h? Is it good enough with only a header file
including the implementation?

[pbos-webrtc, 2016/02/09 15:36:10]

I'll come over and sync with you.

+bool EqualPlane(const uint8_t* data1,
+                const uint8_t* data2,
+                int stride,
+                int width,
+                int height) {
+  for (int y = 0; y < height; ++y) {
+    if (memcmp(data1, data2, width) != 0)
+      return false;
+    data1 += stride;
+    data2 += stride;
+  }
+  return true;
+}
+bool FramesEqual(const webrtc::VideoFrame& f1, const webrtc::VideoFrame& f2) {
+  if (f1.width() != f2.width() || f1.height() != f2.height() ||
+      f1.stride(webrtc::kYPlane) != f2.stride(webrtc::kYPlane) ||
+      f1.stride(webrtc::kUPlane) != f2.stride(webrtc::kUPlane) ||
+      f1.stride(webrtc::kVPlane) != f2.stride(webrtc::kVPlane) ||
+      f1.timestamp() != f2.timestamp() ||
+      f1.ntp_time_ms() != f2.ntp_time_ms() ||
+      f1.render_time_ms() != f2.render_time_ms()) {
+    return false;
+  }
+  const int half_width = (f1.width() + 1) / 2;
+  const int half_height = (f1.height() + 1) / 2;
+  return EqualPlane(f1.buffer(webrtc::kYPlane), f2.buffer(webrtc::kYPlane),
+                    f1.stride(webrtc::kYPlane), f1.width(), f1.height()) &&
+         EqualPlane(f1.buffer(webrtc::kUPlane), f2.buffer(webrtc::kUPlane),
+                    f1.stride(webrtc::kUPlane), half_width, half_height) &&
+         EqualPlane(f1.buffer(webrtc::kVPlane), f2.buffer(webrtc::kVPlane),
+                    f1.stride(webrtc::kVPlane), half_width, half_height);
+}
+
+}
+
 namespace webrtc {
 
 TEST_F(VideoProcessingTest, CopyMem) {
   rtc::scoped_ptr<DenoiserFilter> df_c(DenoiserFilter::Create(false));
   rtc::scoped_ptr<DenoiserFilter> df_sse_neon(DenoiserFilter::Create(true));
   uint8_t src[16 * 16], dst[16 * 16];
   for (int i = 0; i < 16; ++i) {
     for (int j = 0; j < 16; ++j) {
       src[i * 16 + j] = i * 16 + j;
     }
@@ skipping 113 matching lines @@
   while (fread(video_buffer.get(), 1, frame_length_, source_file_) ==
          frame_length_) {
     // Using ConvertToI420 to add stride to the image.
     EXPECT_EQ(0, ConvertToI420(kI420, video_buffer.get(), 0, 0, width_, height_,
                                0, kVideoRotation_0, &video_frame_));
 
     denoiser_c.DenoiseFrame(video_frame_, &denoised_frame_c);
     denoiser_sse_neon.DenoiseFrame(video_frame_, &denoised_frame_sse_neon);
 
     // Denoising results should be the same for C and SSE/NEON denoiser.
-    ASSERT_EQ(true, denoised_frame_c.EqualsFrame(denoised_frame_sse_neon));
+    ASSERT_EQ(true, FramesEqual(denoised_frame_c, denoised_frame_sse_neon));
   }
   ASSERT_NE(0, feof(source_file_)) << "Error reading source file";
 }
 
 }  // namespace webrtc