diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-11 11:58:29 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-11 11:58:29 +0000 |
| commit | f92d0bbbd1e7eb2bd77e1ebb7edc33a516bc29f6 (patch) | |
| tree | a55b89c0f6de8a76d75b3cea20bd99d2bb4da3ff /media/base | |
| parent | 5e5376de8ce113df5653351f21a3efb7ba2db007 (diff) | |
| download | chromium_src-f92d0bbbd1e7eb2bd77e1ebb7edc33a516bc29f6.zip chromium_src-f92d0bbbd1e7eb2bd77e1ebb7edc33a516bc29f6.tar.gz chromium_src-f92d0bbbd1e7eb2bd77e1ebb7edc33a516bc29f6.tar.bz2 | |
Revert 74583 - Revert 74571 - Use SSE2 block differ for chromoting
(Quick test to see if it is the cause of crashes in media_unittests)
(Test showed this CL is not to blame)
We have the SSE2 lying around in the tree just never being used. This will
allow us to use it.
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/6488023
TBR=finnur@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74588 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base')
| -rw-r--r-- | media/base/yuv_convert.cc | 3 |
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; |