Remove FastPaint.

media/filters/skcanvas_video_renderer.cc

Index: media/filters/skcanvas_video_renderer.cc
diff --git a/media/filters/skcanvas_video_renderer.cc b/media/filters/skcanvas_video_renderer.cc
index 1ccfd7720480cb86c8a41fe504d72894855d337f..0f5dd0ecdbba6622b8caf137a319a877751e97cd 100644
--- a/media/filters/skcanvas_video_renderer.cc
+++ b/media/filters/skcanvas_video_renderer.cc
@@ -9,7 +9,6 @@
 #include "media/base/yuv_convert.h"
 #include "third_party/libyuv/include/libyuv.h"
 #include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/skia/include/core/SkDevice.h"
 
 // Skia internal format depends on a platform. On Android it is ABGR, on others
 // it is ARGB.
@@ -36,214 +35,10 @@ static bool IsYUV(media::VideoFrame::Format format) {
          format == media::VideoFrame::YV24;
 }
 
-static bool IsFastPaintYUV(media::VideoFrame::Format format) {
-  return format == media::VideoFrame::YV12 ||
-         format == media::VideoFrame::YV16 ||
-         format == media::VideoFrame::I420 ||
-         format == media::VideoFrame::YV12J;
-}
-
 static bool IsYUVOrNative(media::VideoFrame::Format format) {
   return IsYUV(format) || format == media::VideoFrame::NATIVE_TEXTURE;
 }
 
-// CanFastPaint is a helper method to determine the conditions for fast
-// painting. The conditions are:
-// 1. No skew in canvas matrix.
-// 2. No flipping nor mirroring.
-// 3. Canvas has pixel format ARGB8888.
-// 4. Canvas is opaque.
-// 5. Frame format is YV12, I420 or YV16.
-//
-// TODO(hclam): The fast paint method should support flipping and mirroring.
-// Disable the flipping and mirroring checks once we have it.
-static bool CanFastPaint(SkCanvas* canvas, uint8 alpha,
-                         media::VideoFrame::Format format) {
-  if (alpha != 0xFF || !IsFastPaintYUV(format))
-    return false;
-
-  const SkMatrix& total_matrix = canvas->getTotalMatrix();
-  // Perform the following checks here:
-  // 1. Check for skewing factors of the transformation matrix. They should be
-  //    zero.
-  // 2. Check for mirroring and flipping. Make sure they are greater than zero.
-  if (SkScalarNearlyZero(total_matrix.getSkewX()) &&
-      SkScalarNearlyZero(total_matrix.getSkewY()) &&
-      total_matrix.getScaleX() > 0 &&
-      total_matrix.getScaleY() > 0) {
-    const SkImageInfo info = canvas->imageInfo();
-
-    if (info.colorType() == kN32_SkColorType && info.isOpaque()) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-// Fast paint does YUV => RGB, scaling, blitting all in one step into the
-// canvas. It's not always safe and appropriate to perform fast paint.
-// CanFastPaint() is used to determine the conditions.
-static void FastPaint(
-    const scoped_refptr<media::VideoFrame>& video_frame,
-    SkCanvas* canvas,
-    const SkRect& dest_rect) {
-  DCHECK(IsFastPaintYUV(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;
-  int y_shift = 0;
-  if (video_frame->format() == media::VideoFrame::YV12 ||
-      video_frame->format() == media::VideoFrame::I420) {
-    yuv_type = media::YV12;
-    y_shift = 1;
-  }
-
-  if (video_frame->format() == media::VideoFrame::YV12J) {
-    yuv_type = media::YV12J;
-    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);
-  local_dest_rect.round(&local_dest_irect_saved);
-
-  // No point painting if the destination rect doesn't intersect with the
-  // clip rect.
-  SkIRect device_bounds;
-  if (!canvas->getClipDeviceBounds(&device_bounds))
-    return;
-  if (!local_dest_irect.intersect(device_bounds))
-    return;
-
-  // At this point |local_dest_irect| contains the rect that we should draw
-  // to within the clipping rect.
-
-  // Project the clip rect to the original video frame, obtains the
-  // dimensions of the projected clip rect, "left" and "top" of the rect.
-  // The math here are all integer math so we won't have rounding error and
-  // write outside of the canvas.
-  // We have the assumptions of dest_rect.width() and dest_rect.height()
-  // being non-zero, these are valid assumptions since finding intersection
-  // above rejects empty rectangle so we just do a DCHECK here.
-  DCHECK_NE(0, dest_rect.width());
-  DCHECK_NE(0, dest_rect.height());
-  size_t frame_clip_width = local_dest_irect.width() *
-                            video_frame->visible_rect().width() /
-                            local_dest_irect_saved.width();
-  size_t frame_clip_height = local_dest_irect.height() *
-                             video_frame->visible_rect().height() /
-                             local_dest_irect_saved.height();
-
-  // Project the "left" and "top" of the final destination rect to local
-  // coordinates of the video frame, use these values to find the offsets
-  // in the video frame to start reading.
-  size_t frame_clip_left =
-      video_frame->visible_rect().x() +
-      (local_dest_irect.fLeft - local_dest_irect_saved.fLeft) *
-          video_frame->visible_rect().width() / local_dest_irect_saved.width();
-  size_t frame_clip_top =
-      video_frame->visible_rect().y() +
-      (local_dest_irect.fTop - local_dest_irect_saved.fTop) *
-          video_frame->visible_rect().height() /
-          local_dest_irect_saved.height();
-
-  // Use the "left" and "top" of the destination rect to locate the offset
-  // in Y, U and V planes.
-  size_t y_offset =
-      (video_frame->stride(media::VideoFrame::kYPlane) * frame_clip_top) +
-      frame_clip_left;
-
-  // For format YV12, there is one U, V value per 2x2 block.
-  // For format YV16, there is one U, V value per 2x1 block.
-  size_t uv_offset = (video_frame->stride(media::VideoFrame::kUPlane) *
-                      (frame_clip_top >> y_shift)) +
-                     (frame_clip_left >> 1);
-
-  // Calculate the address for the top left corner of destination rect in
-  // the canvas that we will draw to. The address is obtained by the base
-  // address of the canvas shifted by "left" and "top" of the rect.
-  uint8* dest_rect_pointer = static_cast<uint8*>(bitmap.getPixels()) +
-                             local_dest_irect.fTop * bitmap.rowBytes() +
-                             local_dest_irect.fLeft * 4;
-
-  uint8* frame_clip_y =
-      video_frame->data(media::VideoFrame::kYPlane) + y_offset;
-  uint8* frame_clip_u =
-      video_frame->data(media::VideoFrame::kUPlane) + uv_offset;
-  uint8* frame_clip_v =
-      video_frame->data(media::VideoFrame::kVPlane) + uv_offset;
-
-  // TODO(hclam): do rotation and mirroring here.
-  // TODO(fbarchard): switch filtering based on performance.
-  bitmap.lockPixels();
-
-  // If there is no scaling and the frame format is supported, then use faster
-  // libyuv.
-  if (frame_clip_width == static_cast<size_t>(local_dest_irect.width()) &&
-      frame_clip_height == static_cast<size_t>(local_dest_irect.height())) {
-    switch (yuv_type) {
-      case media::YV12:
-        LIBYUV_I420_TO_ARGB(frame_clip_y,
-                            video_frame->stride(media::VideoFrame::kYPlane),
-                            frame_clip_u,
-                            video_frame->stride(media::VideoFrame::kUPlane),
-                            frame_clip_v,
-                            video_frame->stride(media::VideoFrame::kVPlane),
-                            dest_rect_pointer,
-                            bitmap.rowBytes(),
-                            local_dest_irect.width(),
-                            local_dest_irect.height());
-        bitmap.unlockPixels();
-        return;
-
-      case media::YV16:
-        LIBYUV_I422_TO_ARGB(frame_clip_y,
-                            video_frame->stride(media::VideoFrame::kYPlane),
-                            frame_clip_u,
-                            video_frame->stride(media::VideoFrame::kUPlane),
-                            frame_clip_v,
-                            video_frame->stride(media::VideoFrame::kVPlane),
-                            dest_rect_pointer,
-                            bitmap.rowBytes(),
-                            local_dest_irect.width(),
-                            local_dest_irect.height());
-        bitmap.unlockPixels();
-        return;
-
-      default:
-        break;
-    }
-  }
-
-  // Fallback to media, since the operation is not supported by libyuv.
-  media::ScaleYUVToRGB32(frame_clip_y,
-                         frame_clip_u,
-                         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,
-                         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|.
@@ -413,12 +208,6 @@ void SkCanvasVideoRenderer::Paint(media::VideoFrame* video_frame,
     return;
   }
 
-  // Scale and convert to RGB in one step if we can.
-  if (CanFastPaint(canvas, alpha, video_frame->format())) {
-    FastPaint(video_frame, canvas, dest);
-    return;
-  }
-
   // Check if we should convert and update |last_frame_|.
   if (last_frame_.isNull() ||
       video_frame->timestamp() != last_frame_timestamp_) {