J420ToABGR for 1 step Android J420 conversion

media/blink/skcanvas_video_renderer.cc

Index: media/blink/skcanvas_video_renderer.cc
diff --git a/media/blink/skcanvas_video_renderer.cc b/media/blink/skcanvas_video_renderer.cc
index 90297f7dc8f1db1321143a86659b1af5ab49357c..c9fbcdcf133adce4a9ca10619b0684f34b461b2c 100644
--- a/media/blink/skcanvas_video_renderer.cc
+++ b/media/blink/skcanvas_video_renderer.cc
@@ -27,11 +27,13 @@
 #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
@@ -419,7 +421,7 @@ void SkCanvasVideoRenderer::ConvertVideoFrameToRGBPixels(
     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),
@@ -430,15 +432,6 @@ void SkCanvasVideoRenderer::ConvertVideoFrameToRGBPixels(
             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),