Resubmit - Use SSE2 block differ for chromoting

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 "build/build_config.h"
 #include "media/base/cpu_features.h"
 #include "media/base/yuv_convert_internal.h"
 #include "media/base/yuv_row.h"
 
 #if USE_MMX
 #if defined(_MSC_VER)
 #include <intrin.h>
 #else
 #include <mmintrin.h>
 #endif
@@ skipping 319 matching lines @@
                        uint8* uplane,
                        uint8* vplane,
                        int width,
                        int height,
                        int rgbstride,
                        int ystride,
                        int uvstride) {
   static void (*convert_proc)(const uint8*, uint8*, uint8*, uint8*,
                               int, int, int, int, int) = NULL;
   if (!convert_proc) {
-#ifdef __arm__
+#if defined(ARCH_CPU_ARM_FAMILY)
     // For ARM processors, always use C version.
     // TODO(hclam): Implement a NEON version.
     convert_proc = &ConvertRGB32ToYUV_C;
 #else
     // For x86 processors, check if SSE2 is supported.
     if (hasSSE2())
       convert_proc = &ConvertRGB32ToYUV_SSE2;
     else
       convert_proc = &ConvertRGB32ToYUV_C;
 #endif
   }
 
   convert_proc(rgbframe, yplane, uplane, vplane, width, height,
                rgbstride, ystride, uvstride);
 }
 
 }  // namespace media