cc: VideoLayerImpl VideoFrame::TEXTURE_YUV_420 support.

cc/layers/video_layer_impl.cc

 // Copyright 2011 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 "cc/layers/video_layer_impl.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "cc/layers/video_frame_provider_client_impl.h"
 #include "cc/quads/io_surface_draw_quad.h"
@@ skipping 203 matching lines @@
                            uv_bottom_right,
                            SK_ColorTRANSPARENT,
                            opacity,
                            flipped,
                            nearest_neighbor);
       ValidateQuadResources(texture_quad);
       break;
     }
     case VideoFrameExternalResources::YUV_RESOURCE: {
       DCHECK_GE(frame_resources_.size(), 3u);
-      if (frame_resources_.size() < 3u)
-        break;
+
       YUVVideoDrawQuad::ColorSpace color_space = YUVVideoDrawQuad::REC_601;
       if (frame_->format() == media::VideoFrame::YV12J) {
         color_space = YUVVideoDrawQuad::JPEG;
       } else if (frame_->format() == media::VideoFrame::YV12HD) {
         color_space = YUVVideoDrawQuad::REC_709;
       }
 
       const gfx::Size ya_tex_size = coded_size;
-      const gfx::Size uv_tex_size = media::VideoFrame::PlaneSize(
-          frame_->format(), media::VideoFrame::kUPlane, coded_size);
-      DCHECK(uv_tex_size ==
-             media::VideoFrame::PlaneSize(
-                 frame_->format(), media::VideoFrame::kVPlane, coded_size));
-      if (frame_resources_.size() > 3) {
-        DCHECK(ya_tex_size ==
+      gfx::Size uv_tex_size;
+
+      if (frame_->format() == media::VideoFrame::NATIVE_TEXTURE) {
+        DCHECK_EQ(media::VideoFrame::TEXTURE_YUV_420, frame_->texture_format());
+        DCHECK(visible_rect.origin().IsOrigin());
+        DCHECK(visible_rect.size() == coded_size);
+        uv_tex_size.SetSize(ya_tex_size.width() / 2, ya_tex_size.height() / 2);

[danakj, 2015/05/14 23:08:33]

is this right if coded_size is odd?

[Daniele Castagna, 2015/05/14 23:26:20]

No. Done.

+      } else {
+        uv_tex_size = media::VideoFrame::PlaneSize(
+            frame_->format(), media::VideoFrame::kUPlane, coded_size);
+        DCHECK(uv_tex_size ==
                media::VideoFrame::PlaneSize(
-                   frame_->format(), media::VideoFrame::kAPlane, coded_size));
+                   frame_->format(), media::VideoFrame::kVPlane, coded_size));
+        if (frame_resources_.size() > 3) {

[danakj, 2015/05/14 23:08:33]

should this not also be true for NATIVE_TEXTURE? Y and A should be the same size
too?

[Daniele Castagna, 2015/05/14 23:26:20]

NATIVE_TEXTURE doesn't support alpha channel right now. :/
The only texture format is media::VideoFrame::TEXTURE_YUV_420 that has no alpha.

[danakj, 2015/05/14 23:33:56]

How about move this out of the else, and DCHECK that frame_resources_.size() ==
3 in the other block with a comment that alpha isn't supported.

Also you could make this a DCHECK_IMPLIES and get rid of the if() code outside
of the DCHECK.

[Daniele Castagna, 2015/05/14 23:52:08]

Added DCHECK_EQ(3u, frame_resources_.size())

Replaced the if with DCHECK_IMPLIES.

Then DCHECK_IMPLIES wouldn't work out of the else since VideoFrame::NumPlanes()
is not defined for NATIVE_TEXTURE, VideoFrame::NumTextures() is.

+          DCHECK(ya_tex_size ==
+                 media::VideoFrame::PlaneSize(
+                     frame_->format(), media::VideoFrame::kAPlane, coded_size));
+        }
       }
 
       gfx::RectF tex_coord_rect(
           tex_x_offset, tex_y_offset, tex_width_scale, tex_height_scale);
       YUVVideoDrawQuad* yuv_video_quad =
           render_pass->CreateAndAppendDrawQuad<YUVVideoDrawQuad>();
       yuv_video_quad->SetNew(
           shared_quad_state, quad_rect, opaque_rect, visible_quad_rect,
           tex_coord_rect, ya_tex_size, uv_tex_size, frame_resources_[0],
           frame_resources_[1], frame_resources_[2],
@@ skipping 123 matching lines @@
 void VideoLayerImpl::SetNeedsRedraw() {
   SetUpdateRect(gfx::UnionRects(update_rect(), gfx::Rect(bounds())));
   layer_tree_impl()->SetNeedsRedraw();
 }
 
 const char* VideoLayerImpl::LayerTypeAsString() const {
   return "cc::VideoLayerImpl";
 }
 
 }  // namespace cc