cc: Support texcoord offsets in YUVVideoDrawQuad

cc/output/renderer_pixeltest.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/message_loop/message_loop.h"
 #include "cc/layers/append_quads_data.h"
 #include "cc/output/gl_renderer.h"
 #include "cc/quads/draw_quad.h"
 #include "cc/quads/picture_draw_quad.h"
 #include "cc/quads/texture_draw_quad.h"
@@ skipping 385 matching lines @@
   EXPECT_TRUE(this->RunPixelTest(
       &pass_list,
       PixelTest::NoOffscreenContext,
       base::FilePath(FILE_PATH_LITERAL("green_alpha.png")),
       FuzzyPixelOffByOneComparator(true)));
 }
 
 class VideoGLRendererPixelTest : public GLRendererPixelTest {
  protected:
   scoped_ptr<YUVVideoDrawQuad> CreateTestYUVVideoDrawQuad(
-      SharedQuadState* shared_state, bool with_alpha, bool is_transparent) {
-    gfx::Rect rect(this->device_viewport_size_);
-    gfx::Rect opaque_rect(0, 0, 0, 0);
+      SharedQuadState* shared_state,
+      bool with_alpha,
+      bool is_transparent,
+      const gfx::RectF& tex_coord_rect) {
+    const gfx::Rect rect(this->device_viewport_size_);
+    const gfx::Rect uv_rect(0, 0, rect.width() + 1 / 2, rect.height() + 1 / 2);

[danakj, 2014/03/21 18:11:11]

a + 1 / 2 == a + (1/2) == a + 0

for integer division. what's going on here? is the test broken or is this
supposed to be a no-op change to rect.width and height?

[sheu, 2014/03/21 20:44:50]

:-(

Forgot parentheses.  Fixed.

+    const gfx::Rect opaque_rect(0, 0, 0, 0);
 
     ResourceProvider::ResourceId y_resource =
         resource_provider_->CreateResource(
             this->device_viewport_size_,
             GL_CLAMP_TO_EDGE,
             ResourceProvider::TextureUsageAny,
             LUMINANCE_8);
     ResourceProvider::ResourceId u_resource =
         resource_provider_->CreateResource(
             this->device_viewport_size_,
             GL_CLAMP_TO_EDGE,
             ResourceProvider::TextureUsageAny,
             LUMINANCE_8);
     ResourceProvider::ResourceId v_resource =
         resource_provider_->CreateResource(
             this->device_viewport_size_,
             GL_CLAMP_TO_EDGE,
             ResourceProvider::TextureUsageAny,
             LUMINANCE_8);
     ResourceProvider::ResourceId a_resource = 0;
     if (with_alpha) {
       a_resource = resource_provider_->CreateResource(
                        this->device_viewport_size_,
                        GL_CLAMP_TO_EDGE,
                        ResourceProvider::TextureUsageAny,
                        LUMINANCE_8);
     }
 
-    int w = this->device_viewport_size_.width();
-    int h = this->device_viewport_size_.height();
-    const int y_plane_size = w * h;
-    gfx::Rect uv_rect((w + 1) / 2, (h + 1) / 2);
+    const int y_plane_size = rect.size().GetArea();
     const int uv_plane_size = uv_rect.size().GetArea();
     scoped_ptr<uint8_t[]> y_plane(new uint8_t[y_plane_size]);
     scoped_ptr<uint8_t[]> u_plane(new uint8_t[uv_plane_size]);
     scoped_ptr<uint8_t[]> v_plane(new uint8_t[uv_plane_size]);
     scoped_ptr<uint8_t[]> a_plane;
     if (with_alpha)
       a_plane.reset(new uint8_t[y_plane_size]);
-    // YUV values representing Green.
-    memset(y_plane.get(), 149, y_plane_size);
+    // YUV values representing a striped pattern of green.
+    uint8_t luma = 0;
+    for (int i = 0; i < y_plane_size; ++i)
+      y_plane.get()[i] = (luma += 1);
     memset(u_plane.get(), 43, uv_plane_size);
     memset(v_plane.get(), 21, uv_plane_size);
     if (with_alpha)
       memset(a_plane.get(), is_transparent ? 0 : 128, y_plane_size);
 
-    resource_provider_->SetPixels(y_resource, y_plane.get(), rect, rect,
-                                  gfx::Vector2d());
-    resource_provider_->SetPixels(u_resource, u_plane.get(), uv_rect, uv_rect,
-                                  gfx::Vector2d());
-    resource_provider_->SetPixels(v_resource, v_plane.get(), uv_rect, uv_rect,
-                                  gfx::Vector2d());
+    resource_provider_->SetPixels(
+        y_resource, y_plane.get(), rect, rect, gfx::Vector2d());
+    resource_provider_->SetPixels(
+        u_resource, u_plane.get(), rect, uv_rect, gfx::Vector2d());
+    resource_provider_->SetPixels(
+        v_resource, v_plane.get(), rect, uv_rect, gfx::Vector2d());
     if (with_alpha) {
       resource_provider_->SetPixels(a_resource, a_plane.get(), rect, rect,
                                     gfx::Vector2d());
     }
 
     scoped_ptr<YUVVideoDrawQuad> yuv_quad = YUVVideoDrawQuad::Create();
     yuv_quad->SetNew(shared_state,
                      rect,
                      opaque_rect,
                      rect,
-                     gfx::Size(),
+                     tex_coord_rect,
                      y_resource,
                      u_resource,
                      v_resource,
                      a_resource);
     return yuv_quad.Pass();
   }
 };
 
 TEST_F(VideoGLRendererPixelTest, SimpleYUVRect) {
   gfx::Rect rect(this->device_viewport_size_);
 
   RenderPass::Id id(1, 1);
   scoped_ptr<RenderPass> pass = CreateTestRootRenderPass(id, rect);
 
   scoped_ptr<SharedQuadState> shared_state =
       CreateTestSharedQuadState(gfx::Transform(), rect);
 
-  scoped_ptr<YUVVideoDrawQuad> yuv_quad =
-      CreateTestYUVVideoDrawQuad(shared_state.get(), false, false);
+  scoped_ptr<YUVVideoDrawQuad> yuv_quad = CreateTestYUVVideoDrawQuad(
+      shared_state.get(), false, false, gfx::RectF(0.0f, 0.0f, 1.0f, 1.0f));
 
   pass->quad_list.push_back(yuv_quad.PassAs<DrawQuad>());
 
+  RenderPassList pass_list;
+  pass_list.push_back(pass.Pass());
+
+  EXPECT_TRUE(
+      this->RunPixelTest(&pass_list,
+                         PixelTest::NoOffscreenContext,
+                         base::FilePath(FILE_PATH_LITERAL("green_stripes.png")),
+                         ExactPixelComparator(true)));
+}
+
+TEST_F(VideoGLRendererPixelTest, OffsetYUVRect) {
+  gfx::Rect rect(this->device_viewport_size_);
+
+  RenderPass::Id id(1, 1);
+  scoped_ptr<RenderPass> pass = CreateTestRootRenderPass(id, rect);
+
+  scoped_ptr<SharedQuadState> shared_state =
+      CreateTestSharedQuadState(gfx::Transform(), rect);
+
+  scoped_ptr<YUVVideoDrawQuad> yuv_quad = CreateTestYUVVideoDrawQuad(
+      shared_state.get(), false, false, gfx::RectF(0.125f, 0.25f, 0.75f, 0.5f));
+
+  pass->quad_list.push_back(yuv_quad.PassAs<DrawQuad>());
+
   RenderPassList pass_list;
   pass_list.push_back(pass.Pass());
 
   EXPECT_TRUE(this->RunPixelTest(
       &pass_list,
       PixelTest::NoOffscreenContext,
-      base::FilePath(FILE_PATH_LITERAL("green.png")),
+      base::FilePath(FILE_PATH_LITERAL("green_stripes_offset.png")),
       ExactPixelComparator(true)));
 }
 
 TEST_F(VideoGLRendererPixelTest, SimpleYUVARect) {
   gfx::Rect rect(this->device_viewport_size_);
 
   RenderPass::Id id(1, 1);
   scoped_ptr<RenderPass> pass = CreateTestRootRenderPass(id, rect);
 
   scoped_ptr<SharedQuadState> shared_state =
       CreateTestSharedQuadState(gfx::Transform(), rect);
 
-  scoped_ptr<YUVVideoDrawQuad> yuv_quad =
-      CreateTestYUVVideoDrawQuad(shared_state.get(), true, false);
+  scoped_ptr<YUVVideoDrawQuad> yuv_quad = CreateTestYUVVideoDrawQuad(
+      shared_state.get(), true, false, gfx::RectF(0.0f, 0.0f, 1.0f, 1.0f));
 
   pass->quad_list.push_back(yuv_quad.PassAs<DrawQuad>());
 
   scoped_ptr<SolidColorDrawQuad> color_quad = SolidColorDrawQuad::Create();
   color_quad->SetNew(shared_state.get(), rect, rect, SK_ColorWHITE, false);
 
   pass->quad_list.push_back(color_quad.PassAs<DrawQuad>());
 
   RenderPassList pass_list;
   pass_list.push_back(pass.Pass());
 
   EXPECT_TRUE(this->RunPixelTest(
       &pass_list,
       PixelTest::NoOffscreenContext,
-      base::FilePath(FILE_PATH_LITERAL("green_alpha.png")),
+      base::FilePath(FILE_PATH_LITERAL("green_stripes_alpha.png")),
       ExactPixelComparator(true)));
 }
 
 TEST_F(VideoGLRendererPixelTest, FullyTransparentYUVARect) {
   gfx::Rect rect(this->device_viewport_size_);
 
   RenderPass::Id id(1, 1);
   scoped_ptr<RenderPass> pass = CreateTestRootRenderPass(id, rect);
 
   scoped_ptr<SharedQuadState> shared_state =
       CreateTestSharedQuadState(gfx::Transform(), rect);
 
-  scoped_ptr<YUVVideoDrawQuad> yuv_quad =
-      CreateTestYUVVideoDrawQuad(shared_state.get(), true, true);
+  scoped_ptr<YUVVideoDrawQuad> yuv_quad = CreateTestYUVVideoDrawQuad(
+      shared_state.get(), true, true, gfx::RectF(0.0f, 0.0f, 1.0f, 1.0f));

[danakj, 2014/03/21 18:11:11]

nit: gfx::RectF(1.f, 1.f) is much shorter way to say the same thing.

[sheu, 2014/03/21 20:44:50]

I'm adding offset support to the tests (see: new OffsetYUVRect test) so I
figured I'd make this explicit.

 
   pass->quad_list.push_back(yuv_quad.PassAs<DrawQuad>());
 
   scoped_ptr<SolidColorDrawQuad> color_quad = SolidColorDrawQuad::Create();
   color_quad->SetNew(shared_state.get(), rect, rect, SK_ColorBLACK, false);
 
   pass->quad_list.push_back(color_quad.PassAs<DrawQuad>());
 
   RenderPassList pass_list;
   pass_list.push_back(pass.Pass());
@@ skipping 1515 matching lines @@
       &pass_list,
       PixelTest::NoOffscreenContext,
       base::FilePath(FILE_PATH_LITERAL("wrap_mode_repeat.png")),
       FuzzyPixelOffByOneComparator(true)));
 }
 
 #endif  // !defined(OS_ANDROID)
 
 }  // namespace
 }  // namespace cc