diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-13 15:37:43 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-13 15:37:43 +0000 |
| commit | 691a97e5081651a1df05eb9a59b6ce111e949350 (patch) | |
| tree | 13b75e295da42f6fcb8ede122aaa1985c2767111 /media/base/yuv_convert.cc | |
| parent | 5a8e55e537ea8247d0f45ebde418281c58e28391 (diff) | |
| download | chromium_src-691a97e5081651a1df05eb9a59b6ce111e949350.zip chromium_src-691a97e5081651a1df05eb9a59b6ce111e949350.tar.gz chromium_src-691a97e5081651a1df05eb9a59b6ce111e949350.tar.bz2 | |
Not use SSSE3 code that was merged accidentally
Disable SSSE3 conversion code as tests are not running.
TBR=hbono@chromium.org
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/7888014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100917 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/yuv_convert.cc')
| -rw-r--r-- | media/base/yuv_convert.cc | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/media/base/yuv_convert.cc b/media/base/yuv_convert.cc index 22f1a24..69c03e4 100644 --- a/media/base/yuv_convert.cc +++ b/media/base/yuv_convert.cc @@ -297,10 +297,7 @@ void ConvertRGB32ToYUV(const uint8* rgbframe, // TODO(hclam): Implement a NEON version. convert_proc = &ConvertRGB32ToYUV_C; #else - // For x86 processors, check if SSSE3 (or SSE2) is supported. - if (hasSSSE3()) - convert_proc = &ConvertRGB32ToYUV_SSSE3; - else if (hasSSE2()) + if (hasSSE2()) convert_proc = &ConvertRGB32ToYUV_SSE2; else convert_proc = &ConvertRGB32ToYUV_C; @@ -320,21 +317,8 @@ void ConvertRGB24ToYUV(const uint8* rgbframe, int rgbstride, int ystride, int uvstride) { -#if defined(ARCH_CPU_ARM_FAMILY) ConvertRGB24ToYUV_C(rgbframe, yplane, uplane, vplane, width, height, rgbstride, ystride, uvstride); -#else - static void (*convert_proc)(const uint8*, uint8*, uint8*, uint8*, - int, int, int, int, int) = NULL; - if (!convert_proc) { - if (hasSSSE3()) - convert_proc = &ConvertRGB24ToYUV_SSSE3; - else - convert_proc = &ConvertRGB24ToYUV_C; - } - convert_proc(rgbframe, yplane, uplane, vplane, width, height, - rgbstride, ystride, uvstride); -#endif } void ConvertYUY2ToYUV(const uint8* src, |