| Index: content/renderer/pepper/video_decoder_shim.cc
|
| diff --git a/content/renderer/pepper/video_decoder_shim.cc b/content/renderer/pepper/video_decoder_shim.cc
|
| index e5c5bd0ca230f2278329c688faf4be6e28d72463..53af5dd394523456bc8a3bfaf8c23c06bcac326d 100644
|
| --- a/content/renderer/pepper/video_decoder_shim.cc
|
| +++ b/content/renderer/pepper/video_decoder_shim.cc
|
| @@ -19,6 +19,7 @@
|
| #include "media/base/limits.h"
|
| #include "media/base/video_decoder.h"
|
| #include "media/filters/ffmpeg_video_decoder.h"
|
| +#include "media/filters/skcanvas_video_renderer.h"
|
| #include "media/filters/vpx_video_decoder.h"
|
| #include "media/video/picture.h"
|
| #include "media/video/video_decode_accelerator.h"
|
| @@ -267,16 +268,10 @@ void VideoDecoderShim::DecoderImpl::OnOutputComplete(
|
| pending_frame.reset(new PendingFrame(
|
| decode_id_, frame->coded_size(), frame->visible_rect()));
|
| // Convert the VideoFrame pixels to ABGR to match VideoDecodeAccelerator.
|
| - libyuv::I420ToABGR(frame->data(media::VideoFrame::kYPlane),
|
| - frame->stride(media::VideoFrame::kYPlane),
|
| - frame->data(media::VideoFrame::kUPlane),
|
| - frame->stride(media::VideoFrame::kUPlane),
|
| - frame->data(media::VideoFrame::kVPlane),
|
| - frame->stride(media::VideoFrame::kVPlane),
|
| - &pending_frame->argb_pixels.front(),
|
| - frame->coded_size().width() * 4,
|
| - frame->coded_size().width(),
|
| - frame->coded_size().height());
|
| + media::SkCanvasVideoRenderer::ConvertVideoFrameToRGBPixels(
|
| + frame,
|
| + &pending_frame->argb_pixels.front(),
|
| + frame->coded_size().width() * 4);
|
| } else {
|
| pending_frame.reset(new PendingFrame(decode_id_));
|
| }
|
|
|