diff options
| author | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-11 18:00:57 +0000 |
|---|---|---|
| committer | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-11 18:00:57 +0000 |
| commit | c59d845257c5245a476ffd4284c506ef58fe008d (patch) | |
| tree | 7d6db0a3b735ec3fb944ad902506d638aa1cf1dd /media/base | |
| parent | eff69e3f36db0ed1e17281506cf315e51e07c2c3 (diff) | |
| download | chromium_src-c59d845257c5245a476ffd4284c506ef58fe008d.zip chromium_src-c59d845257c5245a476ffd4284c506ef58fe008d.tar.gz chromium_src-c59d845257c5245a476ffd4284c506ef58fe008d.tar.bz2 | |
Revert 74571 - Use SSE2 block differ for chromoting
We have the SSE2 lying around in the tree just never being used. This will
allow us to use it.
A number of Windows bots have gone red in media_tests on the waterfall:
http://build.chromium.org/p/chromium/builders/XP%20Tests%20%281%29
http://build.chromium.org/p/chromium/builders/XP%20Tests%20%281%29/builds/501/steps/media_unittests/logs/stdio
This seems to be related to r74571. So am reverting to see.
BUG=None
TEST=Chromoting to a host machine and the diff will work correctly
Review URL: http://codereview.chromium.org/6469022
TBR=hclam@chromium.org
Review URL: http://codereview.chromium.org/6502002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74630 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base')
| -rw-r--r-- | media/base/yuv_convert.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/media/base/yuv_convert.cc b/media/base/yuv_convert.cc index 2e4af1d..f6e2857 100644 --- a/media/base/yuv_convert.cc +++ b/media/base/yuv_convert.cc @@ -17,7 +17,6 @@ #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" @@ -357,7 +356,7 @@ void ConvertRGB32ToYUV(const uint8* rgbframe, static void (*convert_proc)(const uint8*, uint8*, uint8*, uint8*, int, int, int, int, int) = NULL; if (!convert_proc) { -#if defined(ARCH_CPU_ARM_FAMILY) +#ifdef __arm__ // For ARM processors, always use C version. // TODO(hclam): Implement a NEON version. convert_proc = &ConvertRGB32ToYUV_C; |