Add plumbing for video pixel formats with JPEG color range.

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/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkDevice.h"
 
 namespace media {
 
 static bool IsEitherYV12OrYV16(media::VideoFrame::Format format) {
-  return format == media::VideoFrame::YV12 || format == media::VideoFrame::YV16;
+  return format == media::VideoFrame::YV12 ||
+         format == media::VideoFrame::YV16 ||
+         format == media::VideoFrame::YV12J;
 }
 
 static bool IsEitherYV12OrYV16OrNative(media::VideoFrame::Format format) {
   return IsEitherYV12OrYV16(format) ||
       format == media::VideoFrame::NATIVE_TEXTURE;
 }
 
 static bool IsEitherYV12OrYV12AOrYV16(media::VideoFrame::Format format) {
   return IsEitherYV12OrYV16(format) ||
       format == media::VideoFrame::YV12A;
@@ skipping 46 matching lines @@
 static void FastPaint(
     const scoped_refptr<media::VideoFrame>& video_frame,
     SkCanvas* canvas,
     const SkRect& dest_rect) {
   DCHECK(IsEitherYV12OrYV16(video_frame->format())) << video_frame->format();
   DCHECK_EQ(video_frame->stride(media::VideoFrame::kUPlane),
             video_frame->stride(media::VideoFrame::kVPlane));
 
   const SkBitmap& bitmap = canvas->getDevice()->accessBitmap(true);
   media::YUVType yuv_type = media::YV16;
+  media::YUVRange yuv_range = media::MPEG;
   int y_shift = 0;
   if (video_frame->format() == media::VideoFrame::YV12 ||
       video_frame->format() == media::VideoFrame::YV12A) {
     yuv_type = media::YV12;
+    yuv_range = media::MPEG;
     y_shift = 1;
   }
 
+  if (video_frame->format() == media::VideoFrame::YV12J) {
+    yuv_type = media::YV12;
+    yuv_range = media::JPEG;
+    y_shift = 1;
+  }
+
   // Transform the destination rectangle to local coordinates.
   const SkMatrix& local_matrix = canvas->getTotalMatrix();
   SkRect local_dest_rect;
   local_matrix.mapRect(&local_dest_rect, dest_rect);
 
   // After projecting the destination rectangle to local coordinates, round
   // the projected rectangle to integer values, this will give us pixel values
   // of the rectangle.
   SkIRect local_dest_irect, local_dest_irect_saved;
   local_dest_rect.round(&local_dest_irect);
@@ skipping 64 matching lines @@
                          frame_clip_v,
                          dest_rect_pointer,
                          frame_clip_width,
                          frame_clip_height,
                          local_dest_irect.width(),
                          local_dest_irect.height(),
                          video_frame->stride(media::VideoFrame::kYPlane),
                          video_frame->stride(media::VideoFrame::kUPlane),
                          bitmap.rowBytes(),
                          yuv_type,
+                         yuv_range,
                          media::ROTATE_0,
                          media::FILTER_BILINEAR);
   bitmap.unlockPixels();
 }
 
 // Converts a VideoFrame containing YUV data to a SkBitmap containing RGB data.
 //
 // |bitmap| will be (re)allocated to match the dimensions of |video_frame|.
 static void ConvertVideoFrameToBitmap(
     const scoped_refptr<media::VideoFrame>& video_frame,
@@ skipping 26 matching lines @@
     // in Y, U and V planes.
     y_offset = (video_frame->stride(media::VideoFrame::kYPlane) *
                 video_frame->visible_rect().y()) +
                 video_frame->visible_rect().x();
     // For format YV12, there is one U, V value per 2x2 block.
     // For format YV16, there is one U, V value per 2x1 block.
     uv_offset = (video_frame->stride(media::VideoFrame::kUPlane) *
                 (video_frame->visible_rect().y() >> y_shift)) +
                 (video_frame->visible_rect().x() >> 1);
   }
+
+  media::YUVRange yuv_range = video_frame->format() == media::VideoFrame::YV12J
+                                  ? media::JPEG
+                                  : media::MPEG;
+
   switch (video_frame->format()) {
     case media::VideoFrame::YV12:
+    case media::VideoFrame::YV12J:
       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*>(bitmap->getPixels()),
           video_frame->visible_rect().width(),
           video_frame->visible_rect().height(),
           video_frame->stride(media::VideoFrame::kYPlane),
           video_frame->stride(media::VideoFrame::kUPlane),
           bitmap->rowBytes(),
-          media::YV12);
+          media::YV12,
+          yuv_range);
       break;
 
     case media::VideoFrame::YV16:
       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*>(bitmap->getPixels()),
           video_frame->visible_rect().width(),
           video_frame->visible_rect().height(),
           video_frame->stride(media::VideoFrame::kYPlane),
           video_frame->stride(media::VideoFrame::kUPlane),
           bitmap->rowBytes(),
-          media::YV16);
+          media::YV16,
+          yuv_range);
       break;
 
     case media::VideoFrame::YV12A:
       media::ConvertYUVAToARGB(
           video_frame->data(media::VideoFrame::kYPlane) + y_offset,
           video_frame->data(media::VideoFrame::kUPlane) + uv_offset,
           video_frame->data(media::VideoFrame::kVPlane) + uv_offset,
           video_frame->data(media::VideoFrame::kAPlane),
           static_cast<uint8*>(bitmap->getPixels()),
           video_frame->visible_rect().width(),
           video_frame->visible_rect().height(),
           video_frame->stride(media::VideoFrame::kYPlane),
           video_frame->stride(media::VideoFrame::kUPlane),
           video_frame->stride(media::VideoFrame::kAPlane),
           bitmap->rowBytes(),
-          media::YV12);
+          media::YV12,
+          yuv_range);
       break;
 
     case media::VideoFrame::NATIVE_TEXTURE:
       DCHECK_EQ(video_frame->format(), media::VideoFrame::NATIVE_TEXTURE);
       video_frame->ReadPixelsFromNativeTexture(*bitmap);
       break;
 
     default:
       NOTREACHED();
       break;
@@ skipping 42 matching lines @@
     ConvertVideoFrameToBitmap(video_frame, &last_frame_);
     last_frame_timestamp_ = video_frame->GetTimestamp();
   }
 
   // Do a slower paint using |last_frame_|.
   paint.setFilterBitmap(true);
   canvas->drawBitmapRect(last_frame_, NULL, dest, &paint);
 }
 
 }  // namespace media