Add I420Buffer::Copy method taking plane pointers as input.

webrtc/common_video/video_frame_buffer.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 "webrtc/common_video/include/video_frame_buffer.h"
@@ skipping 43 matching lines @@
   RTC_DCHECK_GT(width, 0);
   RTC_DCHECK_GT(height, 0);
   RTC_DCHECK_GE(stride_y, width);
   RTC_DCHECK_GE(stride_u, (width + 1) / 2);
   RTC_DCHECK_GE(stride_v, (width + 1) / 2);
 }
 
 I420Buffer::~I420Buffer() {
 }
 
+// static
 rtc::scoped_refptr<I420Buffer> I420Buffer::Create(int width, int height) {
   return new rtc::RefCountedObject<I420Buffer>(width, height);
 }
 
+// static
 rtc::scoped_refptr<I420Buffer> I420Buffer::Create(int width,
                                                   int height,
                                                   int stride_y,
                                                   int stride_u,
                                                   int stride_v) {
   return new rtc::RefCountedObject<I420Buffer>(
       width, height, stride_y, stride_u, stride_v);
 }
 
+// static
+rtc::scoped_refptr<I420Buffer> I420Buffer::Copy(
+    const VideoFrameBuffer& source) {
+  return Copy(source.width(), source.height(),
+              source.DataY(), source.StrideY(),
+              source.DataU(), source.StrideU(),
+              source.DataV(), source.StrideV());
+}
+
+// static
+rtc::scoped_refptr<I420Buffer> I420Buffer::Copy(
+      int width, int height,
+      const uint8_t* data_y, int stride_y,
+      const uint8_t* data_u, int stride_u,
+      const uint8_t* data_v, int stride_v) {
+  // Note: May use different strides than the input data.
+  rtc::scoped_refptr<I420Buffer> buffer = Create(width, height);
+  RTC_CHECK_EQ(0, libyuv::I420Copy(data_y, stride_y,
+                                   data_u, stride_u,
+                                   data_v, stride_v,
+                                   buffer->MutableDataY(), buffer->StrideY(),
+                                   buffer->MutableDataU(), buffer->StrideU(),
+                                   buffer->MutableDataV(), buffer->StrideV(),
+                                   width, height));
+  return buffer;
+}
+
+// static
+rtc::scoped_refptr<VideoFrameBuffer> I420Buffer::Rotate(
+    rtc::scoped_refptr<VideoFrameBuffer> src,
+    VideoRotation rotation) {
+  RTC_CHECK(src->DataY());

[nisse-webrtc, 2016/11/28 09:44:54]

I also changed these from DCHECK to CHECK. I think a check failure is preferable
to a crash in I420Rotate.

+  RTC_CHECK(src->DataU());
+  RTC_CHECK(src->DataV());
+
+  if (rotation == webrtc::kVideoRotation_0) {
+    return src;
+  }
+
+  int rotated_width = src->width();
+  int rotated_height = src->height();
+  if (rotation == webrtc::kVideoRotation_90 ||
+      rotation == webrtc::kVideoRotation_270) {
+    std::swap(rotated_width, rotated_height);
+  }
+
+  rtc::scoped_refptr<webrtc::I420Buffer> buffer =
+      I420Buffer::Create(rotated_width, rotated_height);
+
+  RTC_CHECK_EQ(0, libyuv::I420Rotate(

[nisse-webrtc, 2016/11/28 09:44:54]

And this is changed from res = ...; RTC_DCHECK_EQ(res, 0);

+      src->DataY(), src->StrideY(),
+      src->DataU(), src->StrideU(),
+      src->DataV(), src->StrideV(),
+      buffer->MutableDataY(), buffer->StrideY(), buffer->MutableDataU(),
+      buffer->StrideU(), buffer->MutableDataV(), buffer->StrideV(),
+      src->width(), src->height(),
+      static_cast<libyuv::RotationMode>(rotation)));
+
+  return buffer;
+}
+
 void I420Buffer::InitializeData() {
   memset(data_.get(), 0,
          I420DataSize(height_, stride_y_, stride_u_, stride_v_));
 }
 
 int I420Buffer::width() const {
   return width_;
 }
 
 int I420Buffer::height() const {
@@ skipping 32 matching lines @@
 
 void* I420Buffer::native_handle() const {
   return nullptr;
 }
 
 rtc::scoped_refptr<VideoFrameBuffer> I420Buffer::NativeToI420Buffer() {
   RTC_NOTREACHED();
   return nullptr;
 }
 
-// static
-rtc::scoped_refptr<I420Buffer> I420Buffer::Copy(
-    const VideoFrameBuffer& source) {
-  int width = source.width();
-  int height = source.height();
-  rtc::scoped_refptr<I420Buffer> target = I420Buffer::Create(width, height);
-  RTC_CHECK(libyuv::I420Copy(source.DataY(), source.StrideY(),
-                             source.DataU(), source.StrideU(),
-                             source.DataV(), source.StrideV(),
-                             target->MutableDataY(), target->StrideY(),
-                             target->MutableDataU(), target->StrideU(),
-                             target->MutableDataV(), target->StrideV(),
-                             width, height) == 0);
-
-  return target;
-}
-
 void I420Buffer::SetToBlack() {
   RTC_CHECK(libyuv::I420Rect(MutableDataY(), StrideY(),
                              MutableDataU(), StrideU(),
                              MutableDataV(), StrideV(),
                              0, 0, width(), height(),
                              0, 128, 128) == 0);
 }
 
 void I420Buffer::CropAndScaleFrom(
     const VideoFrameBuffer& src,
@@ skipping 42 matching lines @@
   CropAndScaleFrom(
       src,
       (src.width() - crop_width) / 2, (src.height() - crop_height) / 2,
       crop_width, crop_height);
 }
 
 void I420Buffer::ScaleFrom(const VideoFrameBuffer& src) {
   CropAndScaleFrom(src, 0, 0, src.width(), src.height());
 }
 
-// static
-rtc::scoped_refptr<VideoFrameBuffer> I420Buffer::Rotate(
-    rtc::scoped_refptr<VideoFrameBuffer> src,
-    VideoRotation rotation) {
-  RTC_DCHECK(src->DataY());
-  RTC_DCHECK(src->DataU());
-  RTC_DCHECK(src->DataV());
-
-  if (rotation == webrtc::kVideoRotation_0) {
-    return src;
-  }
-
-  int rotated_width = src->width();
-  int rotated_height = src->height();
-  if (rotation == webrtc::kVideoRotation_90 ||
-      rotation == webrtc::kVideoRotation_270) {
-    std::swap(rotated_width, rotated_height);
-  }
-
-  rtc::scoped_refptr<webrtc::I420Buffer> buffer =
-      I420Buffer::Create(rotated_width, rotated_height);
-
-  int res = libyuv::I420Rotate(
-      src->DataY(), src->StrideY(),
-      src->DataU(), src->StrideU(),
-      src->DataV(), src->StrideV(),
-      buffer->MutableDataY(), buffer->StrideY(), buffer->MutableDataU(),
-      buffer->StrideU(), buffer->MutableDataV(), buffer->StrideV(),
-      src->width(), src->height(),
-      static_cast<libyuv::RotationMode>(rotation));
-  RTC_DCHECK_EQ(res, 0);
-
-  return buffer;
-}
-
 NativeHandleBuffer::NativeHandleBuffer(void* native_handle,
                                        int width,
                                        int height)
     : native_handle_(native_handle), width_(width), height_(height) {
   RTC_DCHECK(native_handle != nullptr);
   RTC_DCHECK_GT(width, 0);
   RTC_DCHECK_GT(height, 0);
 }
 
 int NativeHandleBuffer::width() const {
@@ skipping 89 matching lines @@
 void* WrappedI420Buffer::native_handle() const {
   return nullptr;
 }
 
 rtc::scoped_refptr<VideoFrameBuffer> WrappedI420Buffer::NativeToI420Buffer() {
   RTC_NOTREACHED();
   return nullptr;
 }
 
 }  // namespace webrtc