Reorganize YUV scalers (Continued)

media/base/yuv_convert.cc

 // Copyright (c) 2011 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.
 
 // This webpage shows layout of YV12 and other YUV formats
 // http://www.fourcc.org/yuv.php
 // The actual conversion is best described here
 // http://en.wikipedia.org/wiki/YUV
 // An article on optimizing YUV conversion using tables instead of multiplies
 // http://lestourtereaux.free.fr/papers/data/yuvrgb.pdf
 //
 // YV12 is a full plane of Y and a half height, half width chroma planes
 // YV16 is a full plane of Y and a full height, half width chroma planes
 //
 // ARGB pixel format is output, which on little endian is stored as BGRA.
 // The alpha is set to 255, allowing the application to use RGBA or RGB32.
 
 #include "media/base/yuv_convert.h"
 
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "media/base/cpu_features.h"
 #include "media/base/simd/convert_rgb_to_yuv.h"
 #include "media/base/simd/convert_yuv_to_rgb.h"
 #include "media/base/simd/filter_yuv.h"
-#include "media/base/yuv_convert_internal.h"
-#include "media/base/yuv_row.h"
 
 #if defined(ARCH_CPU_X86_FAMILY)
 #if defined(_MSC_VER)
 #include <intrin.h>
 #else
 #include <emmintrin.h>
 #include <mmintrin.h>
 #endif
 #endif
 
@@ skipping 298 matching lines @@
                rgbstride, ystride, uvstride);
 #endif
 }
 
 void ConvertYUY2ToYUV(const uint8* src,
                       uint8* yplane,
                       uint8* uplane,
                       uint8* vplane,
                       int width,
                       int height) {
-  ConvertYUY2ToYUV_C(src, yplane, uplane, vplane, width, height);
+  for (int i = 0; i < height / 2; ++i) {
+    for (int j = 0; j < (width / 2); ++j) {
+      yplane[0] = src[0];
+      *uplane = src[1];
+      yplane[1] = src[2];
+      *vplane = src[3];
+      src += 4;
+      yplane += 2;
+      uplane++;
+      vplane++;
+    }
+    for (int j = 0; j < (width / 2); ++j) {
+      yplane[0] = src[0];
+      yplane[1] = src[2];
+      src += 4;
+      yplane += 2;
+    }
+  }
 }
 
 void ConvertYUVToRGB32(const uint8* yplane,
                        const uint8* uplane,
                        const uint8* vplane,
                        uint8* rgbframe,
                        int width,
                        int height,
                        int ystride,
                        int uvstride,
@@ skipping 12 matching lines @@
     else
       convert_proc = &ConvertYUVToRGB32_C;
   }
 
   convert_proc(yplane, uplane, vplane, rgbframe,
                width, height, ystride, uvstride, rgbstride, yuv_type);
 #endif
 }
 
 }  // namespace media