Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1599)

Unified Diff: cc/quads/draw_quad_unittest.cc

Issue 12157002: Adding YUVA support for enabling Alpha Playback (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressing comments Created 7 years, 8 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: cc/quads/draw_quad_unittest.cc
diff --git a/cc/quads/draw_quad_unittest.cc b/cc/quads/draw_quad_unittest.cc
index 043a785bb78e261c04f42e84562a7ee4fa68363d..06d27ed5d36d0c8024070a45d17f4a69abee1cab 100644
--- a/cc/quads/draw_quad_unittest.cc
+++ b/cc/quads/draw_quad_unittest.cc
@@ -628,10 +628,15 @@ TEST(DrawQuadTest, CopyYUVVideoDrawQuad) {
v_plane.resource_id = 4;
v_plane.size = gfx::Size(456, 486);
v_plane.format = 46;
+ VideoLayerImpl::FramePlane a_plane;
+ a_plane.resource_id = 400;
+ a_plane.size = gfx::Size(634, 354);
+ a_plane.format = 9;
CREATE_SHARED_STATE();
- CREATE_QUAD_5_NEW(
- YUVVideoDrawQuad, opaque_rect, tex_scale, y_plane, u_plane, v_plane);
+ CREATE_QUAD_6_NEW(
+ YUVVideoDrawQuad, opaque_rect, tex_scale,
+ &y_plane, &u_plane, &v_plane, &a_plane);
EXPECT_EQ(DrawQuad::YUV_VIDEO_CONTENT, copy_quad->material);
EXPECT_RECT_EQ(opaque_rect, copy_quad->opaque_rect);
EXPECT_EQ(tex_scale, copy_quad->tex_scale);
@@ -644,8 +649,12 @@ TEST(DrawQuadTest, CopyYUVVideoDrawQuad) {
EXPECT_EQ(v_plane.resource_id, copy_quad->v_plane.resource_id);
EXPECT_EQ(v_plane.size, copy_quad->v_plane.size);
EXPECT_EQ(v_plane.format, copy_quad->v_plane.format);
+ EXPECT_EQ(a_plane.resource_id, copy_quad->a_plane.resource_id);
+ EXPECT_EQ(a_plane.size, copy_quad->a_plane.size);
+ EXPECT_EQ(a_plane.format, copy_quad->a_plane.format);
- CREATE_QUAD_4_ALL(YUVVideoDrawQuad, tex_scale, y_plane, u_plane, v_plane);
+ CREATE_QUAD_5_ALL(YUVVideoDrawQuad, tex_scale,
+ &y_plane, &u_plane, &v_plane, &a_plane);
EXPECT_EQ(DrawQuad::YUV_VIDEO_CONTENT, copy_quad->material);
EXPECT_EQ(tex_scale, copy_quad->tex_scale);
EXPECT_EQ(y_plane.resource_id, copy_quad->y_plane.resource_id);
@@ -657,6 +666,9 @@ TEST(DrawQuadTest, CopyYUVVideoDrawQuad) {
EXPECT_EQ(v_plane.resource_id, copy_quad->v_plane.resource_id);
EXPECT_EQ(v_plane.size, copy_quad->v_plane.size);
EXPECT_EQ(v_plane.format, copy_quad->v_plane.format);
+ EXPECT_EQ(a_plane.resource_id, copy_quad->a_plane.resource_id);
+ EXPECT_EQ(a_plane.size, copy_quad->a_plane.size);
+ EXPECT_EQ(a_plane.format, copy_quad->a_plane.format);
}
TEST(DrawQuadTest, CopyPictureDrawQuad) {
@@ -858,18 +870,25 @@ TEST_F(DrawQuadIteratorTest, YUVVideoDrawQuad) {
v_plane.resource_id = 4;
v_plane.size = gfx::Size(456, 486);
v_plane.format = 46;
+ VideoLayerImpl::FramePlane a_plane;
+ a_plane.resource_id = 400;
+ a_plane.size = gfx::Size(634, 354);
+ a_plane.format = 9;
CREATE_SHARED_STATE();
- CREATE_QUAD_5_NEW(
- YUVVideoDrawQuad, opaque_rect, tex_scale, y_plane, u_plane, v_plane);
+ CREATE_QUAD_6_NEW(
+ YUVVideoDrawQuad, opaque_rect, tex_scale,
+ &y_plane, &u_plane, &v_plane, &a_plane);
EXPECT_EQ(DrawQuad::YUV_VIDEO_CONTENT, copy_quad->material);
EXPECT_EQ(y_plane.resource_id, quad_new->y_plane.resource_id);
EXPECT_EQ(u_plane.resource_id, quad_new->u_plane.resource_id);
EXPECT_EQ(v_plane.resource_id, quad_new->v_plane.resource_id);
- EXPECT_EQ(3, IterateAndCount(quad_new.get()));
+ EXPECT_EQ(a_plane.resource_id, quad_new->a_plane.resource_id);
+ EXPECT_EQ(4, IterateAndCount(quad_new.get()));
EXPECT_EQ(y_plane.resource_id + 1, quad_new->y_plane.resource_id);
EXPECT_EQ(u_plane.resource_id + 1, quad_new->u_plane.resource_id);
EXPECT_EQ(v_plane.resource_id + 1, quad_new->v_plane.resource_id);
+ EXPECT_EQ(a_plane.resource_id + 1, quad_new->a_plane.resource_id);
}
TEST_F(DrawQuadIteratorTest, PictureDrawQuad) {

Powered by Google App Engine
This is Rietveld 408576698