Index: media/blink/skcanvas_video_renderer.cc |
diff --git a/media/blink/skcanvas_video_renderer.cc b/media/blink/skcanvas_video_renderer.cc |
index a36a9ede331471f45ece7148dbf27206262abec0..6aa863e89b1bc19cfc92a8ad2f84c89f2be6c209 100644 |
--- a/media/blink/skcanvas_video_renderer.cc |
+++ b/media/blink/skcanvas_video_renderer.cc |
@@ -138,7 +138,8 @@ bool ShouldCacheVideoFrameSkImage(const VideoFrame* video_frame) { |
skia::RefPtr<SkImage> NewSkImageFromVideoFrameNative( |
VideoFrame* video_frame, |
const Context3D& context_3d) { |
- DCHECK_EQ(PIXEL_FORMAT_ARGB, video_frame->format()); |
+ DCHECK(PIXEL_FORMAT_ARGB == video_frame->format() || |
+ PIXEL_FORMAT_UYVY == video_frame->format()); |
reveman
2015/08/21 21:53:03
and why this change?
Daniele Castagna
2015/08/21 22:46:04
Same as the above, if the VideoFrame gets converte
reveman
2015/08/22 14:04:46
what is this format used for? determines how to sa
|
const gpu::MailboxHolder& mailbox_holder = video_frame->mailbox_holder(0); |
DCHECK(mailbox_holder.texture_target == GL_TEXTURE_2D || |