Delete method webrtc::VideoFrame::native_handle.

webrtc/test/frame_utils.cc

Index: webrtc/test/frame_utils.cc
diff --git a/webrtc/test/frame_utils.cc b/webrtc/test/frame_utils.cc
index 0f411447458173331b48db59de325b7a4cc174c4..21daa44f97d4899996609a9c8f12bbd4f9f714a5 100644
--- a/webrtc/test/frame_utils.cc
+++ b/webrtc/test/frame_utils.cc
@@ -16,53 +16,60 @@ namespace test {
 
 bool EqualPlane(const uint8_t* data1,
                 const uint8_t* data2,
-                int stride,
+                int stride1,
+                int stride2,
                 int width,
                 int height) {
   for (int y = 0; y < height; ++y) {
     if (memcmp(data1, data2, width) != 0)
       return false;
-    data1 += stride;
-    data2 += stride;
+    data1 += stride1;
+    data2 += stride2;
   }
   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() ||
+  if (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);
+  return FrameBufsEqual(f1.video_frame_buffer(), f2.video_frame_buffer());
 }
 
 bool FrameBufsEqual(const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& f1,
                     const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& 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)) {
+  if (f1 == f2) {
+    return true;
+  }
+  // Exlude nullptr (except if both are nullptr, as above)
+  if (!f1 || !f2) {
+    return false;
+  }
+
+  if (f1->width() != f2->width() || f1->height() != f2->height()) {
+    return false;
+  }
+  // Exclude native handle
+  if (f1->native_handle()) {
+    return f1->native_handle() == f2->native_handle();
+  }
+
+  if (f2->native_handle()) {
     return false;
   }
   const int half_width = (f1->width() + 1) / 2;
   const int half_height = (f1->height() + 1) / 2;
   return EqualPlane(f1->data(webrtc::kYPlane), f2->data(webrtc::kYPlane),
-                    f1->stride(webrtc::kYPlane), f1->width(), f1->height()) &&
+                    f1->stride(webrtc::kYPlane), f2->stride(webrtc::kYPlane),
+                    f1->width(), f1->height()) &&
          EqualPlane(f1->data(webrtc::kUPlane), f2->data(webrtc::kUPlane),
-                    f1->stride(webrtc::kUPlane), half_width, half_height) &&
+                    f1->stride(webrtc::kUPlane), f2->stride(webrtc::kUPlane),
+                    half_width, half_height) &&
          EqualPlane(f1->data(webrtc::kVPlane), f2->data(webrtc::kVPlane),
-                    f1->stride(webrtc::kVPlane), half_width, half_height);
+                    f1->stride(webrtc::kVPlane), f2->stride(webrtc::kVPlane),
+                    half_width, half_height);
 }
 
 }  // namespace test