Return WrappedI444Buffer in VP9Impl

webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc

 /*
  *  Copyright (c) 2014 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.
  *
  */
@@ skipping 946 matching lines @@
   if (img == NULL) {
     // Decoder OK and NULL image => No show frame.
     return WEBRTC_VIDEO_CODEC_NO_OUTPUT;
   }
 
   // This buffer contains all of |img|'s image data, a reference counted
   // Vp9FrameBuffer. (libvpx is done with the buffers after a few
   // vpx_codec_decode calls or vpx_codec_destroy).
   Vp9FrameBufferPool::Vp9FrameBuffer* img_buffer =
       static_cast<Vp9FrameBufferPool::Vp9FrameBuffer*>(img->fb_priv);
+
+  VideoFrameBuffer::Type type = img->fmt == VPX_IMG_FMT_I444
+                                    ? VideoFrameBuffer::Type::kI444
+                                    : VideoFrameBuffer::Type::kI420;
+
   // The buffer can be used directly by the VideoFrame (without copy) by
-  // using a WrappedI420Buffer.
-  rtc::scoped_refptr<WrappedI420Buffer> img_wrapped_buffer(
-      new rtc::RefCountedObject<webrtc::WrappedI420Buffer>(
-          img->d_w, img->d_h, img->planes[VPX_PLANE_Y],
-          img->stride[VPX_PLANE_Y], img->planes[VPX_PLANE_U],
-          img->stride[VPX_PLANE_U], img->planes[VPX_PLANE_V],
-          img->stride[VPX_PLANE_V],
-          // WrappedI420Buffer's mechanism for allowing the release of its frame
-          // buffer is through a callback function. This is where we should
-          // release |img_buffer|.
-          rtc::KeepRefUntilDone(img_buffer)));
+  // using a WrappedI4??Buffer.

[magjed_webrtc, 2017/06/20 09:01:15]

Use WrapYuvBuffer instead of WrappedI4??Buffer now

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

Done.

+  rtc::scoped_refptr<VideoFrameBuffer> img_wrapped_buffer = WrapYuvBuffer(
+      type, img->d_w, img->d_h, img->planes[VPX_PLANE_Y],
+      img->stride[VPX_PLANE_Y], img->planes[VPX_PLANE_U],
+      img->stride[VPX_PLANE_U], img->planes[VPX_PLANE_V],
+      img->stride[VPX_PLANE_V],
+      // WrappedI4??Buffer's mechanism for allowing the release of its frame

[magjed_webrtc, 2017/06/20 09:01:15]

ditto, use WrapYuvBuffer instead of WrappedI4??Buffer now

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

Done.

+      // buffer is through a callback function. This is where we should
+      // release |img_buffer|.
+      rtc::KeepRefUntilDone(img_buffer));
 
   VideoFrame decoded_image(img_wrapped_buffer, timestamp,
                            0 /* render_time_ms */, webrtc::kVideoRotation_0);
   decoded_image.set_ntp_time_ms(ntp_time_ms);
 
   decode_complete_callback_->Decoded(decoded_image, rtc::Optional<int32_t>(),
                                      rtc::Optional<uint8_t>(qp));
   return WEBRTC_VIDEO_CODEC_OK;
 }
 
@@ skipping 19 matching lines @@
   frame_buffer_pool_.ClearPool();
   inited_ = false;
   return WEBRTC_VIDEO_CODEC_OK;
 }
 
 const char* VP9DecoderImpl::ImplementationName() const {
   return "libvpx";
 }
 
 }  // namespace webrtc