Add support for Rec709 color space videos in software YUV convert path.

media/filters/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/filters/skcanvas_video_renderer.h"
 
 #include "base/logging.h"
 #include "media/base/video_frame.h"
 #include "media/base/yuv_convert.h"
 #include "third_party/libyuv/include/libyuv.h"
@@ skipping 26 matching lines @@
 // a temporary resource if it is not used for 3 sec.
 const int kTemporaryResourceDeletionDelay = 3;  // Seconds;
 
 bool IsYUV(media::VideoFrame::Format format) {
   switch (format) {
     case VideoFrame::YV12:
     case VideoFrame::YV16:
     case VideoFrame::I420:
     case VideoFrame::YV12A:
     case VideoFrame::YV12J:
+    case VideoFrame::YV12HD:
     case VideoFrame::YV24:
     case VideoFrame::NV12:
       return true;
     case VideoFrame::UNKNOWN:
     case VideoFrame::NATIVE_TEXTURE:
 #if defined(VIDEO_HOLE)
     case VideoFrame::HOLE:
 #endif  // defined(VIDEO_HOLE)
       return false;
   }
   NOTREACHED() << "Invalid videoframe format provided: " << format;
   return false;
 }
 
 bool IsJPEGColorSpace(media::VideoFrame::Format format) {
   switch (format) {
     case VideoFrame::YV12J:
       return true;
     case VideoFrame::YV12:
+    case VideoFrame::YV12HD:
     case VideoFrame::YV16:
     case VideoFrame::I420:
     case VideoFrame::YV12A:
     case VideoFrame::YV24:
     case VideoFrame::NV12:
     case VideoFrame::UNKNOWN:
     case VideoFrame::NATIVE_TEXTURE:
 #if defined(VIDEO_HOLE)
     case VideoFrame::HOLE:
 #endif  // defined(VIDEO_HOLE)
@@ skipping 58 matching lines @@
           video_frame->data(media::VideoFrame::kVPlane) + uv_offset,
           static_cast<uint8*>(rgb_pixels),
           video_frame->visible_rect().width(),
           video_frame->visible_rect().height(),
           video_frame->stride(media::VideoFrame::kYPlane),
           video_frame->stride(media::VideoFrame::kUPlane),
           row_bytes,
           media::YV12J);
       break;
 
+    case media::VideoFrame::YV12HD:
+      media::ConvertYUVToRGB32(
+          video_frame->data(media::VideoFrame::kYPlane) + y_offset,
+          video_frame->data(media::VideoFrame::kUPlane) + uv_offset,
+          video_frame->data(media::VideoFrame::kVPlane) + uv_offset,
+          static_cast<uint8*>(rgb_pixels),
+          video_frame->visible_rect().width(),
+          video_frame->visible_rect().height(),
+          video_frame->stride(media::VideoFrame::kYPlane),
+          video_frame->stride(media::VideoFrame::kUPlane),
+          row_bytes,
+          media::YV12HD);
+      break;
+
     case media::VideoFrame::YV16:
       LIBYUV_I422_TO_ARGB(
           video_frame->data(media::VideoFrame::kYPlane) + y_offset,
           video_frame->stride(media::VideoFrame::kYPlane),
           video_frame->data(media::VideoFrame::kUPlane) + uv_offset,
           video_frame->stride(media::VideoFrame::kUPlane),
           video_frame->data(media::VideoFrame::kVPlane) + uv_offset,
           video_frame->stride(media::VideoFrame::kVPlane),
           static_cast<uint8*>(rgb_pixels),
           row_bytes,
@@ skipping 47 matching lines @@
       DCHECK_EQ(video_frame->format(), media::VideoFrame::NATIVE_TEXTURE);
       SkBitmap tmp;
       tmp.installPixels(
           SkImageInfo::MakeN32Premul(video_frame->visible_rect().width(),
                                      video_frame->visible_rect().height()),
           rgb_pixels,
           row_bytes);
       video_frame->ReadPixelsFromNativeTexture(tmp);
       break;
     }
-    default:
+    case VideoFrame::UNKNOWN:
+    case VideoFrame::NV12:
       NOTREACHED();
-      break;
   }
 }
 
 }  // anonymous namespace
 
 // Generates an RGB image from a VideoFrame. Convert YUV to RGB plain on GPU.
 class VideoImageGenerator : public SkImageGenerator {
  public:
   VideoImageGenerator(const scoped_refptr<VideoFrame>& frame) : frame_(frame) {
     DCHECK(frame_.get());
@@ skipping 25 matching lines @@
     return true;
   }
 
   bool onGetYUV8Planes(SkISize sizes[3],
                        void* planes[3],
                        size_t row_bytes[3],
                        SkYUVColorSpace* color_space) override {
     if (!frame_.get() || !IsYUV(frame_->format()))
       return false;
 
+    // Skia currently can't convert Rec709 "HD" color space YUV to RGB.
+    // TODO(rileya): Add support for HD color space in Skia's YUV conversions.

[DaleCurtis, 2014/12/15 18:47:34]

Doesn't this just need the right matrix below? Without this what happens to
canvas?

[rileya (GONE FROM CHROMIUM), 2014/12/16 22:05:59]

Skia needs the 709 matrix to get plumbed into its YUV convert shader, that's an
easy change, but one that requires skia changes to happen and roll in.

Without this, we just fall back to our usual SW YUV convert. This path is purely
an optimization, where if the destination canvas is accelerated, skia can take
YUV data directly, instead of asking us for RGB.

+    if (frame_->format() == VideoFrame::YV12HD)
+      return false;
+
     if (color_space) {
       if (IsJPEGColorSpace(frame_->format()))
         *color_space = kJPEG_SkYUVColorSpace;
       else
         *color_space = kRec601_SkYUVColorSpace;
     }
 
     for (int plane = VideoFrame::kYPlane; plane <= VideoFrame::kVPlane;
          ++plane) {
       if (sizes) {
@@ skipping 184 matching lines @@
   last_frame_timestamp_ = media::kNoTimestamp();
 }
 
 void SkCanvasVideoRenderer::ResetAcceleratedLastFrame() {
   accelerated_last_frame_.reset();
   accelerated_generator_ = nullptr;
   accelerated_last_frame_timestamp_ = media::kNoTimestamp();
 }
 
 }  // namespace media