J420ToABGR for 1 step Android J420 conversion

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"
 #include "media/base/yuv_convert.h"
 #include "skia/ext/refptr.h"
 #include "third_party/libyuv/include/libyuv.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkImageGenerator.h"
 #include "third_party/skia/include/gpu/GrContext.h"
 #include "third_party/skia/include/gpu/GrPaint.h"
 #include "third_party/skia/include/gpu/GrTexture.h"
 #include "third_party/skia/include/gpu/GrTextureProvider.h"
 #include "ui/gfx/geometry/rect_f.h"
 
 // Skia internal format depends on a platform. On Android it is ABGR, on others
 // it is ARGB.
 #if SK_B32_SHIFT == 0 && SK_G32_SHIFT == 8 && SK_R32_SHIFT == 16 && \
     SK_A32_SHIFT == 24
 #define LIBYUV_I420_TO_ARGB libyuv::I420ToARGB
 #define LIBYUV_I422_TO_ARGB libyuv::I422ToARGB
 #define LIBYUV_I420ALPHA_TO_ARGB libyuv::I420AlphaToARGB
+#define LIBYUV_J420_TO_ARGB libyuv::J420ToARGB
 #elif SK_R32_SHIFT == 0 && SK_G32_SHIFT == 8 && SK_B32_SHIFT == 16 && \
     SK_A32_SHIFT == 24
 #define LIBYUV_I420_TO_ARGB libyuv::I420ToABGR
 #define LIBYUV_I422_TO_ARGB libyuv::I422ToABGR
 #define LIBYUV_I420ALPHA_TO_ARGB libyuv::I420AlphaToABGR
+#define LIBYUV_J420_TO_ARGB libyuv::J420ToABGR
 #else
 #error Unexpected Skia ARGB_8888 layout!
 #endif
 
 namespace media {
 
 namespace {
 
 // This class keeps the last image drawn.
 // We delete the temporary resource if it is not used for 3 seconds.
@@ skipping 368 matching lines @@
     NOTREACHED() << "Non YUV formats are not supported";
     return;
   }
   DCHECK_EQ(video_frame->stride(VideoFrame::kUPlane),
             video_frame->stride(VideoFrame::kVPlane));
 
   switch (video_frame->format()) {
     case PIXEL_FORMAT_YV12:
     case PIXEL_FORMAT_I420:
       if (CheckColorSpace(video_frame, COLOR_SPACE_JPEG)) {
-        libyuv::J420ToARGB(
+        LIBYUV_J420_TO_ARGB(
             video_frame->visible_data(VideoFrame::kYPlane),
             video_frame->stride(VideoFrame::kYPlane),
             video_frame->visible_data(VideoFrame::kUPlane),
             video_frame->stride(VideoFrame::kUPlane),
             video_frame->visible_data(VideoFrame::kVPlane),
             video_frame->stride(VideoFrame::kVPlane),
             static_cast<uint8*>(rgb_pixels),
             row_bytes,
             video_frame->visible_rect().width(),
             video_frame->visible_rect().height());
-#if SK_R32_SHIFT == 0 && SK_G32_SHIFT == 8 && SK_B32_SHIFT == 16 && \
-    SK_A32_SHIFT == 24
-        libyuv::ARGBToABGR(static_cast<uint8*>(rgb_pixels),
-                           row_bytes,
-                           static_cast<uint8*>(rgb_pixels),
-                           row_bytes,
-                           video_frame->visible_rect().width(),
-                           video_frame->visible_rect().height());
-#endif
       } else if (CheckColorSpace(video_frame, COLOR_SPACE_HD_REC709)) {
         ConvertYUVToRGB32(video_frame->visible_data(VideoFrame::kYPlane),
                           video_frame->visible_data(VideoFrame::kUPlane),
                           video_frame->visible_data(VideoFrame::kVPlane),
                           static_cast<uint8*>(rgb_pixels),
                           video_frame->visible_rect().width(),
                           video_frame->visible_rect().height(),
                           video_frame->stride(VideoFrame::kYPlane),
                           video_frame->stride(VideoFrame::kUPlane), row_bytes,
                           YV12HD);
@@ skipping 117 matching lines @@
   video_frame->UpdateReleaseSyncPoint(&client);
 }
 
 void SkCanvasVideoRenderer::ResetCache() {
   // Clear cached values.
   last_image_ = nullptr;
   last_timestamp_ = kNoTimestamp();
 }
 
 }  // namespace media