Index: cc/output/renderer_pixeltest.cc |
diff --git a/cc/output/renderer_pixeltest.cc b/cc/output/renderer_pixeltest.cc |
index 295fc84576770209e52260cfceb503332c5ae7b6..ed3f9508bf06ace9c7f50f9bbd59ced0d5038b60 100644 |
--- a/cc/output/renderer_pixeltest.cc |
+++ b/cc/output/renderer_pixeltest.cc |
@@ -247,11 +247,24 @@ void CreateTestYUVVideoDrawQuad_FromVideoFrame( |
resources.release_callbacks[media::VideoFrame::kAPlane])); |
} |
+ const gfx::Size ya_tex_size = video_frame->coded_size(); |
+ const gfx::Size uv_tex_size = media::VideoFrame::PlaneSize( |
+ video_frame->format(), media::VideoFrame::kUPlane, |
+ video_frame->coded_size()); |
+ DCHECK(uv_tex_size == media::VideoFrame::PlaneSize( |
+ video_frame->format(), media::VideoFrame::kVPlane, |
+ video_frame->coded_size())); |
+ if (with_alpha) { |
+ DCHECK(ya_tex_size == media::VideoFrame::PlaneSize( |
enne (OOO)
2015/03/18 19:25:57
DCHECK_EQ
|
+ video_frame->format(), media::VideoFrame::kAPlane, |
+ video_frame->coded_size())); |
+ } |
+ |
YUVVideoDrawQuad* yuv_quad = |
render_pass->CreateAndAppendDrawQuad<YUVVideoDrawQuad>(); |
yuv_quad->SetNew(shared_state, rect, opaque_rect, rect, tex_coord_rect, |
- video_frame->coded_size(), y_resource, u_resource, |
- v_resource, a_resource, color_space); |
+ ya_tex_size, uv_tex_size, y_resource, u_resource, v_resource, |
+ a_resource, color_space); |
} |
void CreateTestYUVVideoDrawQuad_Striped( |
@@ -933,8 +946,8 @@ class VideoGLRendererPixelTest : public GLRendererPixelTest { |
// the final image. Bleeding will appear on all four sides of the video |
// if the tex coords are not clamped. |
CreateTestYUVVideoDrawQuad_TwoColor( |
- shared_state, format, false, tex_coord_rect, background_size, 0, 0, 0, |
- green_rect, 149, 43, 21, pass.get(), video_resource_updater_.get(), |
+ shared_state, format, false, tex_coord_rect, background_size, 128, 128, |
+ 128, green_rect, 149, 43, 21, pass.get(), video_resource_updater_.get(), |
resource_provider_.get()); |
pass_list->push_back(pass.Pass()); |
} |