Use skia to do accelerated YUV conversion for rec709 'HD' color space in

media/blink/skcanvas_video_renderer.cc

   // Copyright (c) 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 "media/blink/skcanvas_video_renderer.h"
 
 #include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "gpu/command_buffer/common/mailbox_holder.h"
 #include "media/base/video_frame.h"
@@ skipping 135 matching lines @@
   }
   GrBackendObject handles[3] = {
       source_textures[0], source_textures[1], source_textures[2]};
 
   SkISize yuvSizes[] = {
       {ya_tex_size.width(), ya_tex_size.height()},
       {uv_tex_size.width(), uv_tex_size.height()},
       {uv_tex_size.width(), uv_tex_size.height()},
   };
 
-  // TODO(dcastagna): Skia currently doesn't support Rec709 YUV conversion.
-  DCHECK(!CheckColorSpace(video_frame, media::COLOR_SPACE_HD_REC709));
   SkYUVColorSpace color_space = kRec601_SkYUVColorSpace;
   if (CheckColorSpace(video_frame, media::COLOR_SPACE_JPEG))
     color_space = kJPEG_SkYUVColorSpace;
+  else if (CheckColorSpace(video_frame, media::COLOR_SPACE_HD_REC709))
+    color_space = kRec709_SkYUVColorSpace;
 
   SkImage* img = SkImage::NewFromYUVTexturesCopy(context_3d.gr_context,
                                                  color_space, handles, yuvSizes,
                                                  kTopLeft_GrSurfaceOrigin);
   DCHECK(img);
   gl->DeleteTextures(3, source_textures);
   SyncPointClientImpl client(gl);
   video_frame->UpdateReleaseSyncPoint(&client);
   return make_scoped_ptr(img);
 }
@@ skipping 54 matching lines @@
     SkCanvasVideoRenderer::ConvertVideoFrameToRGBPixels(
         frame_, pixels, row_bytes);
     return kSuccess;
   }
 
   bool onGetYUV8Planes(SkISize sizes[3],
                        void* planes[3],
                        size_t row_bytes[3],
                        SkYUVColorSpace* color_space) override {
     if (!frame_.get() || !media::IsYuvPlanar(frame_->format()) ||
-        // TODO(rileya): Skia currently doesn't support Rec709 YUV conversion,
-        // or YUVA conversion. Remove this case once it does. As-is we will
-        // fall back on the pure-software path in this case.
-        CheckColorSpace(frame_, COLOR_SPACE_HD_REC709) ||
+        // TODO(rileya): Skia currently doesn't support YUVA conversion. Remove
+        // this case once it does. As-is we will fall back on the pure-software
+        // path in this case.
         frame_->format() == PIXEL_FORMAT_YV12A) {
       return false;
     }
 
     if (color_space) {
       if (CheckColorSpace(frame_, COLOR_SPACE_JPEG))
         *color_space = kJPEG_SkYUVColorSpace;
+      else if (CheckColorSpace(frame_, COLOR_SPACE_HD_REC709))
+        *color_space = kRec709_SkYUVColorSpace;
       else
         *color_space = kRec601_SkYUVColorSpace;
     }
 
     for (int plane = VideoFrame::kYPlane; plane <= VideoFrame::kVPlane;
          ++plane) {
       if (sizes) {
         const gfx::Size size =
             VideoFrame::PlaneSize(frame_->format(), plane,
                                   gfx::Size(frame_->visible_rect().width(),
@@ skipping 417 matching lines @@
 }
 
 void SkCanvasVideoRenderer::ResetAcceleratedLastFrame() {
   accelerated_last_image_.reset();
   accelerated_last_frame_.reset();
   accelerated_generator_ = nullptr;
   accelerated_last_frame_timestamp_ = media::kNoTimestamp();
 }
 
 }  // namespace media