Return WrappedI444Buffer in VP9Impl

webrtc/common_video/video_frame_buffer.cc

Index: webrtc/common_video/video_frame_buffer.cc
diff --git a/webrtc/common_video/video_frame_buffer.cc b/webrtc/common_video/video_frame_buffer.cc
index 5f339a5f35e70559dd80a16c610e7df91601450c..953053b29d1ee46960b12239a4af1b618e3b6d1a 100644
--- a/webrtc/common_video/video_frame_buffer.cc
+++ b/webrtc/common_video/video_frame_buffer.cc
@@ -124,4 +124,115 @@ int WrappedI420Buffer::StrideV() const {
   return v_stride_;
 }
 
+// Template to implement a wrapped buffer for a I4??BufferInterface.
+template <typename Base>
+class WrappedYuvBuffer : public Base {
+ public:
+  WrappedYuvBuffer(int width,
+                   int height,
+                   const uint8_t* y_plane,
+                   int y_stride,
+                   const uint8_t* u_plane,
+                   int u_stride,
+                   const uint8_t* v_plane,
+                   int v_stride,
+                   const rtc::Callback0<void>& no_longer_used)
+      : width_(width),
+        height_(height),
+        y_plane_(y_plane),
+        u_plane_(u_plane),
+        v_plane_(v_plane),
+        y_stride_(y_stride),
+        u_stride_(u_stride),
+        v_stride_(v_stride),
+        no_longer_used_cb_(no_longer_used) {}
+
+  int width() const override { return width_; }
+
+  int height() const override { return height_; }
+
+  const uint8_t* DataY() const override { return y_plane_; }
+
+  const uint8_t* DataU() const override { return u_plane_; }
+
+  const uint8_t* DataV() const override { return v_plane_; }
+
+  int StrideY() const override { return y_stride_; }
+
+  int StrideU() const override { return u_stride_; }
+
+  int StrideV() const override { return v_stride_; }
+
+ private:
+  friend class rtc::RefCountedObject<WrappedYuvBuffer>;
+
+  ~WrappedYuvBuffer() override { no_longer_used_cb_(); }
+
+  const int width_;
+  const int height_;
+  const uint8_t* const y_plane_;
+  const uint8_t* const u_plane_;
+  const uint8_t* const v_plane_;
+  const int y_stride_;
+  const int u_stride_;
+  const int v_stride_;
+  rtc::Callback0<void> no_longer_used_cb_;
+};
+
+rtc::scoped_refptr<I420BufferInterface> WrapI420Buffer(
+    int width,
+    int height,
+    const uint8_t* y_plane,
+    int y_stride,
+    const uint8_t* u_plane,
+    int u_stride,
+    const uint8_t* v_plane,
+    int v_stride,
+    const rtc::Callback0<void>& no_longer_used) {
+  return rtc::scoped_refptr<I420BufferInterface>(
+      new rtc::RefCountedObject<WrappedYuvBuffer<I420BufferInterface>>(
+          width, height, y_plane, y_stride, u_plane, u_stride, v_plane,
+          v_stride, no_longer_used));
+}
+
+rtc::scoped_refptr<I444BufferInterface> WrapI444Buffer(
+    int width,
+    int height,
+    const uint8_t* y_plane,
+    int y_stride,
+    const uint8_t* u_plane,
+    int u_stride,
+    const uint8_t* v_plane,
+    int v_stride,
+    const rtc::Callback0<void>& no_longer_used) {
+  return rtc::scoped_refptr<I444BufferInterface>(
+      new rtc::RefCountedObject<WrappedYuvBuffer<I444BufferInterface>>(
+          width, height, y_plane, y_stride, u_plane, u_stride, v_plane,
+          v_stride, no_longer_used));
+}
+
+rtc::scoped_refptr<PlanarYuvBuffer> WrapYuvBuffer(
+    VideoFrameBuffer::Type type,
+    int width,
+    int height,
+    const uint8_t* y_plane,
+    int y_stride,
+    const uint8_t* u_plane,
+    int u_stride,
+    const uint8_t* v_plane,
+    int v_stride,
+    const rtc::Callback0<void>& no_longer_used) {
+  switch (type) {
+    case VideoFrameBuffer::Type::kI420:
+      return WrapI420Buffer(width, height, y_plane, y_stride, u_plane, u_stride,
+                            v_plane, v_stride, no_longer_used);
+    case VideoFrameBuffer::Type::kI444:
+      return WrapI444Buffer(width, height, y_plane, y_stride, u_plane, u_stride,
+                            v_plane, v_stride, no_longer_used);
+    default:
+      RTC_NOTREACHED();

[nisse-webrtc, 2017/06/20 09:58:47]

nit: The pattern of DCHECK (which RTC_NOTREACHED is) + return of an error value
is questionable, for one thing, proper error handling of the error return is
untestable since all our tests run with DCHECKs enabled.

So I'd prefer either FATAL() << "some message" or return nullptr.

[Yuwei, 2017/06/22 01:17:24]

Done. I just did both both since the Windows compiler will complain about
missing return value if I don't return nullptr...

+      return nullptr;
+  }
+}
+
 }  // namespace webrtc