Delete webrtc::VideoFrame methods buffer and stride.

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.
  */
 
 #include "webrtc/modules/video_processing/test/video_processing_unittest.h"
 
 #include <gflags/gflags.h>
 
 #include <memory>
 #include <string>
 
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 #include "webrtc/system_wrappers/include/tick_util.h"
+#include "webrtc/test/frame_utils.h"
 #include "webrtc/test/testsupport/fileutils.h"
 
 namespace webrtc {
 
 namespace {
 
 // Define command line flag 'gen_files' (default value: false).
 DEFINE_bool(gen_files, false, "Output files for visual inspection.");
 
 }  // namespace
@@ skipping 14 matching lines @@
 // The |source_data| is cropped and scaled to |target_width| x |target_height|,
 // and then scaled back to the expected cropped size. |expected_psnr| is used to
 // verify basic quality, and is set to be ~0.1/0.05dB lower than actual PSNR
 // verified under the same conditions.
 static void TestSize(const VideoFrame& source_frame,
                      const VideoFrame& cropped_source_frame,
                      int target_width,
                      int target_height,
                      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),
       width_(352),
       half_width_((width_ + 1) / 2),
       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));
+  memset(video_frame_.video_frame_buffer()->MutableDataY(), 0,
+         video_frame_.allocated_size(kYPlane));
+  memset(video_frame_.video_frame_buffer()->MutableDataU(), 0,
+         video_frame_.allocated_size(kUPlane));
+  memset(video_frame_.video_frame_buffer()->MutableDataV(), 0,
+         video_frame_.allocated_size(kVPlane));
   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: " + video_file + "\n";
 }
 
 void VideoProcessingTest::TearDown() {
   if (source_file_ != NULL) {
     ASSERT_EQ(0, fclose(source_file_));
@@ skipping 54 matching lines @@
                              0, kVideoRotation_0, &video_frame_));
   vp_->GetFrameStats(video_frame_, &stats);
   EXPECT_GT(stats.num_pixels, 0u);
   video_frame2.CopyFrame(video_frame_);
   ASSERT_EQ(0, vp_->Deflickering(&video_frame_, &stats));
 
   // Retrieve frame stats again in case Deflickering() has zeroed them.
   vp_->GetFrameStats(video_frame2, &stats);
   EXPECT_GT(stats.num_pixels, 0u);
   ASSERT_EQ(0, vp_->Deflickering(&video_frame2, &stats));
-  EXPECT_TRUE(CompareFrames(video_frame_, video_frame2));
+  EXPECT_TRUE(webrtc::test::FramesEqual(video_frame_, video_frame2));
 
   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);
   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));
+  EXPECT_TRUE(webrtc::test::FramesEqual(video_frame_, video_frame2));
 }
 
 #if defined(WEBRTC_IOS)
 TEST_F(VideoProcessingTest, DISABLED_FrameStats) {
 #else
 TEST_F(VideoProcessingTest, FrameStats) {
 #endif
   VideoProcessing::FrameStats stats;
   vp_->ClearFrameStats(&stats);
   std::unique_ptr<uint8_t[]> video_buffer(new uint8_t[frame_length_]);
@@ skipping 195 matching lines @@
   // Compute PSNR against the cropped source frame and check expectation.
   double psnr = I420PSNR(&cropped_source_frame, out_frame);
   EXPECT_GT(psnr, expected_psnr);
   printf(
       "PSNR: %f. PSNR is between source of size %d %d, and a modified "
       "source which is scaled down/up to: %d %d, and back to source size \n",
       psnr, source_frame.width(), source_frame.height(), target_width,
       target_height);
 }
 
-bool CompareFrames(const webrtc::VideoFrame& frame1,
-                   const webrtc::VideoFrame& frame2) {
-  for (int plane = 0; plane < webrtc::kNumOfPlanes; plane++) {
-    webrtc::PlaneType plane_type = static_cast<webrtc::PlaneType>(plane);
-    int allocated_size1 = frame1.allocated_size(plane_type);
-    int allocated_size2 = frame2.allocated_size(plane_type);
-    if (allocated_size1 != allocated_size2)
-      return false;
-    const uint8_t* plane_buffer1 = frame1.buffer(plane_type);
-    const uint8_t* plane_buffer2 = frame2.buffer(plane_type);
-    if (memcmp(plane_buffer1, plane_buffer2, allocated_size1))
-      return false;
-  }
-  return true;
-}
-
 void WriteProcessedFrameForVisualInspection(const VideoFrame& source,
                                             const VideoFrame& processed) {
   // Skip if writing to files is not enabled.
   if (!FLAGS_gen_files)
     return;
   // Write the processed frame to file for visual inspection.
   std::ostringstream filename;
   filename << webrtc::test::OutputPath() << "Resampler_from_" << source.width()
            << "x" << source.height() << "_to_" << processed.width() << "x"
            << processed.height() << "_30Hz_P420.yuv";
   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