media/tools/player_x11/x11_video_renderer.cc - Issue 222563002: Remove redundant I420-to-YV12 conversion in MediaStreamVideoTrack.

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/tools/player_x11/x11_video_renderer.cc

Issue 222563002: Remove redundant I420-to-YV12 conversion in MediaStreamVideoTrack. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Allow I420 as acceptable default YUV format in ppapi tests. Created 6 years, 9 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:

Index: media/tools/player_x11/x11_video_renderer.cc

diff --git a/media/tools/player_x11/x11_video_renderer.cc b/media/tools/player_x11/x11_video_renderer.cc

index 907e1abb5f680172559538880ba9cd0687fbe285..5c886e7eed82101b4c52c1241f7d122b32bbd229 100644

--- a/media/tools/player_x11/x11_video_renderer.cc

+++ b/media/tools/player_x11/x11_video_renderer.cc

@@ -100,14 +100,16 @@ void X11VideoRenderer::Paint(media::VideoFrame* video_frame) {

// Convert YUV frame to RGB.

DCHECK(video_frame->format() == media::VideoFrame::YV12 ||

+ video_frame->format() == media::VideoFrame::I420 ||

video_frame->format() == media::VideoFrame::YV16);

DCHECK(video_frame->stride(media::VideoFrame::kUPlane) ==

video_frame->stride(media::VideoFrame::kVPlane));

DCHECK(image_->data);

- media::YUVType yuv_type =

- (video_frame->format() == media::VideoFrame::YV12) ?

- media::YV12 : media::YV16;

+ media::YUVType yuv_type = (video_frame->format() == media::VideoFrame::YV12 ||

+ video_frame->format() == media::VideoFrame::I420)

+ ? media::YV12

+ : media::YV16;

media::ConvertYUVToRGB32(video_frame->data(media::VideoFrame::kYPlane),

video_frame->data(media::VideoFrame::kUPlane),

video_frame->data(media::VideoFrame::kVPlane),