summaryrefslogtreecommitdiffstats
path: root/media/base
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-11 21:20:13 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-11 21:20:13 +0000
commit02a9ac8c98166906aa678b31b439fcb862c30338 (patch)
tree9775ae1fe2921799f790d9d34f02446c988c1ea5 /media/base
parent7c8b20677195488825cf4f9ccc13116e5fe0ecee (diff)
downloadchromium_src-02a9ac8c98166906aa678b31b439fcb862c30338.zip
chromium_src-02a9ac8c98166906aa678b31b439fcb862c30338.tar.gz
chromium_src-02a9ac8c98166906aa678b31b439fcb862c30338.tar.bz2
Resubmit - Use SSE2 block differ for chromoting
Put the SSE2 block differ code back in. TBR=dhollowa BUG=NONE TEST=NONE Review URL: http://codereview.chromium.org/6501005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74671 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base')
-rw-r--r--media/base/yuv_convert.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/base/yuv_convert.cc b/media/base/yuv_convert.cc
index f6e2857..2e4af1d 100644
--- a/media/base/yuv_convert.cc
+++ b/media/base/yuv_convert.cc
@@ -17,6 +17,7 @@
#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"
@@ -356,7 +357,7 @@ void ConvertRGB32ToYUV(const uint8* rgbframe,
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;