Revert of Delete webrtc::VideoFrame methods buffer and stride.

webrtc/modules/video_capture/test/video_capture_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 <stdio.h>
 
 #include <map>
 #include <memory>
 #include <sstream>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/base/timeutils.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 #include "webrtc/modules/utility/include/process_thread.h"
 #include "webrtc/modules/video_capture/video_capture.h"
 #include "webrtc/modules/video_capture/video_capture_factory.h"
 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
 #include "webrtc/system_wrappers/include/sleep.h"
-#include "webrtc/test/frame_utils.h"
 #include "webrtc/video_frame.h"
 
 using webrtc::CriticalSectionWrapper;
 using webrtc::CriticalSectionScoped;
 using webrtc::SleepMs;
 using webrtc::VideoCaptureAlarm;
 using webrtc::VideoCaptureCapability;
 using webrtc::VideoCaptureDataCallback;
 using webrtc::VideoCaptureFactory;
 using webrtc::VideoCaptureFeedBack;
@@ skipping 16 matching lines @@
     WAIT_(ex, timeout, res); \
     if (!res) EXPECT_TRUE(ex); \
   } while (0)
 
 
 static const int kTimeOut = 5000;
 static const int kTestHeight = 288;
 static const int kTestWidth = 352;
 static const int kTestFramerate = 30;
 
+// Compares the content of two video frames.
+static bool CompareFrames(const webrtc::VideoFrame& frame1,
+                          const webrtc::VideoFrame& frame2) {
+  bool result =
+      (frame1.stride(webrtc::kYPlane) == frame2.stride(webrtc::kYPlane)) &&
+      (frame1.stride(webrtc::kUPlane) == frame2.stride(webrtc::kUPlane)) &&
+      (frame1.stride(webrtc::kVPlane) == frame2.stride(webrtc::kVPlane)) &&
+      (frame1.width() == frame2.width()) &&
+      (frame1.height() == frame2.height());
+
+  if (!result)
+    return false;
+  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;
+}
+
 class TestVideoCaptureCallback : public VideoCaptureDataCallback {
  public:
   TestVideoCaptureCallback()
       : capture_cs_(CriticalSectionWrapper::CreateCriticalSection()),
         capture_delay_(-1),
         last_render_time_ms_(0),
         incoming_frames_(0),
         timing_warnings_(0),
         rotate_frame_(webrtc::kVideoRotation_0) {}
 
@@ skipping 26 matching lines @@
             last_render_time_ms_ + (1000 * 1.1) / capability_.maxFPS &&
             last_render_time_ms_ > 0) ||
         (videoFrame.render_time_ms() <
             last_render_time_ms_ + (1000 * 0.9) / capability_.maxFPS &&
             last_render_time_ms_ > 0)) {
       timing_warnings_++;
     }
 
     incoming_frames_++;
     last_render_time_ms_ = videoFrame.render_time_ms();
-    last_frame_ = videoFrame.video_frame_buffer();
+    last_frame_.CopyFrame(videoFrame);
   }
 
   virtual void OnCaptureDelayChanged(const int32_t id,
                                      const int32_t delay) {
     CriticalSectionScoped cs(capture_cs_.get());
     capture_delay_ = delay;
   }
 
   void SetExpectedCapability(VideoCaptureCapability capability) {
     CriticalSectionScoped cs(capture_cs_.get());
@@ skipping 15 matching lines @@
     CriticalSectionScoped cs(capture_cs_.get());
     return timing_warnings_;
   }
   VideoCaptureCapability capability() {
     CriticalSectionScoped cs(capture_cs_.get());
     return capability_;
   }
 
   bool CompareLastFrame(const webrtc::VideoFrame& frame) {
     CriticalSectionScoped cs(capture_cs_.get());
-    return webrtc::test::FrameBufsEqual(last_frame_,
-                                        frame.video_frame_buffer());
+    return CompareFrames(last_frame_, frame);
   }
 
   void SetExpectedCaptureRotation(webrtc::VideoRotation rotation) {
     CriticalSectionScoped cs(capture_cs_.get());
     rotate_frame_ = rotation;
   }
 
  private:
   std::unique_ptr<CriticalSectionWrapper> capture_cs_;
   VideoCaptureCapability capability_;
   int capture_delay_;
   int64_t last_render_time_ms_;
   int incoming_frames_;
   int timing_warnings_;
-  rtc::scoped_refptr<webrtc::VideoFrameBuffer> last_frame_;
+  webrtc::VideoFrame last_frame_;
   webrtc::VideoRotation rotate_frame_;
 };
 
 class TestVideoCaptureFeedBack : public VideoCaptureFeedBack {
  public:
   TestVideoCaptureFeedBack() :
     capture_cs_(CriticalSectionWrapper::CreateCriticalSection()),
     frame_rate_(0),
     alarm_(webrtc::Cleared) {
   }
@@ skipping 244 matching lines @@
     VideoCaptureCapability capability;
     capability.width = kTestWidth;
     capability.height = kTestHeight;
     capability.rawType = webrtc::kVideoYV12;
     capability.maxFPS = kTestFramerate;
     capture_callback_.SetExpectedCapability(capability);
 
     test_frame_.CreateEmptyFrame(kTestWidth, kTestHeight, kTestWidth,
                                  ((kTestWidth + 1) / 2), (kTestWidth + 1) / 2);
     SleepMs(1); // Wait 1ms so that two tests can't have the same timestamp.
-    memset(test_frame_.video_frame_buffer()->MutableDataY(), 127,
-           kTestWidth * kTestHeight);
-    memset(test_frame_.video_frame_buffer()->MutableDataU(), 127,
+    memset(test_frame_.buffer(webrtc::kYPlane), 127, kTestWidth * kTestHeight);
+    memset(test_frame_.buffer(webrtc::kUPlane), 127,
            ((kTestWidth + 1) / 2) * ((kTestHeight + 1) / 2));
-    memset(test_frame_.video_frame_buffer()->MutableDataV(), 127,
+    memset(test_frame_.buffer(webrtc::kVPlane), 127,
            ((kTestWidth + 1) / 2) * ((kTestHeight + 1) / 2));
 
     capture_module_->RegisterCaptureDataCallback(capture_callback_);
     capture_module_->RegisterCaptureCallback(capture_feedback_);
     capture_module_->EnableFrameRateCallback(true);
     capture_module_->EnableNoPictureAlarm(true);
   }
 
   void TearDown() {
     process_module_->Stop();
@@ skipping 78 matching lines @@
     length, capture_callback_.capability(), 0));
   EXPECT_EQ(0, capture_module_->SetCaptureRotation(webrtc::kVideoRotation_180));
   capture_callback_.SetExpectedCaptureRotation(webrtc::kVideoRotation_180);
   EXPECT_EQ(0, capture_input_interface_->IncomingFrame(test_buffer.get(),
     length, capture_callback_.capability(), 0));
   EXPECT_EQ(0, capture_module_->SetCaptureRotation(webrtc::kVideoRotation_270));
   capture_callback_.SetExpectedCaptureRotation(webrtc::kVideoRotation_270);
   EXPECT_EQ(0, capture_input_interface_->IncomingFrame(test_buffer.get(),
     length, capture_callback_.capability(), 0));
 }