media/blink/skcanvas_video_renderer.cc - Issue 1306693002: media: Convert I420 VideoFrame to UYVY GpuMemoryBuffer.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/blink/skcanvas_video_renderer.cc

Issue 1306693002: media: Convert I420 VideoFrame to UYVY GpuMemoryBuffer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: s/CHECK_EQ/DCHECK_EQ. Created 5 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

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());

const gpu::MailboxHolder& mailbox_holder = video_frame->mailbox_holder(0);

DCHECK(mailbox_holder.texture_target == GL_TEXTURE_2D ||

« no previous file with comments | « media/base/video_frame.cc ('k') | media/renderers/gpu_video_accelerator_factories.h » ('j') | no next file with comments »