Remove redundant I420-to-YV12 conversion in MediaStreamVideoTrack.

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) {

[Ami GONE FROM CHROMIUM, 2014/04/02 22:03:58]

This name is bad now.
IsYUV()
?

[hshi1, 2014/04/02 22:17:05]

WDYT of my new patch?

   return format == media::VideoFrame::YV12 ||
+         format == media::VideoFrame::I420 ||
          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;
 }
 
 static bool IsEitherYV12OrYV12AOrYV16OrNative(
     media::VideoFrame::Format format) {
   return IsEitherYV12OrYV16OrNative(format) ||
       format == media::VideoFrame::YV12A;
 }
 
 // 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 or YV16.
+// 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 || !IsEitherYV12OrYV16(format))
     return false;
 
   const SkMatrix& total_matrix = canvas->getTotalMatrix();
   // Perform the following checks here:
@@ skipping 23 matching lines @@
     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;
   int y_shift = 0;
   if (video_frame->format() == media::VideoFrame::YV12 ||
+      video_frame->format() == media::VideoFrame::I420 ||
       video_frame->format() == media::VideoFrame::YV12A) {
     yuv_type = media::YV12;
     y_shift = 1;
   }
 
   if (video_frame->format() == media::VideoFrame::YV12J) {
     yuv_type = media::YV12;
     y_shift = 1;
   }
 
@@ skipping 123 matching lines @@
                 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);
   }
 
   switch (video_frame->format()) {
     case media::VideoFrame::YV12:
+    case media::VideoFrame::I420:
     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),
@@ skipping 84 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