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 2aee847e5d0f4ccaa847b8ed161a6d1793315cc9..d0aa752bbc6f1126e696492b7613f5591cedcf6b 100644 |
--- a/content/renderer/pepper/video_decoder_shim.cc |
+++ b/content/renderer/pepper/video_decoder_shim.cc |
@@ -19,11 +19,11 @@ |
#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" |
#include "ppapi/c/pp_errors.h" |
-#include "third_party/libyuv/include/libyuv.h" |
#include "webkit/common/gpu/context_provider_web_context.h" |
namespace content { |
@@ -272,16 +272,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. |
dshwang
2015/02/11 09:57:38
Hi, I have a question. In this code path, video fr
bbudge
2015/02/11 15:49:26
My understanding is that the software decoder retu
|
- 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_)); |
} |