summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-14 19:04:46 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-14 19:04:46 +0000
commitab201cc7fca706cfc35cb11d279a3f5c0572d71c (patch)
treeeaf2d3a12f4ade9dff4bfe4523a6862d04b219f3 /media
parenta7ffb11c8e70a2dd3dfae42acb376b3ea559679c (diff)
downloadchromium_src-ab201cc7fca706cfc35cb11d279a3f5c0572d71c.zip
chromium_src-ab201cc7fca706cfc35cb11d279a3f5c0572d71c.tar.gz
chromium_src-ab201cc7fca706cfc35cb11d279a3f5c0572d71c.tar.bz2
Merge 44438 - Disable SSE2 for Windows media playback
BUG=none TEST=none Review URL: http://codereview.chromium.org/1654001 TBR=fbarchard@chromium.org Review URL: http://codereview.chromium.org/1612020 git-svn-id: svn://svn.chromium.org/chrome/branches/375/src@44512 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/base/yuv_row.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/media/base/yuv_row.h b/media/base/yuv_row.h
index 2f8b277..248a934 100644
--- a/media/base/yuv_row.h
+++ b/media/base/yuv_row.h
@@ -79,7 +79,7 @@ void LinearScaleYUVToRGB32Row(const uint8* y_buf,
#endif
#if !defined(USE_SSE)
-#if defined(__SSE2__) || defined(_MSC_VER)
+#if defined(__SSE2__) || defined(ARCH_CPU_X86_64) || _M_IX86_FP==2
#define USE_SSE 1
#else
#define USE_SSE 0
@@ -90,11 +90,13 @@ void LinearScaleYUVToRGB32Row(const uint8* y_buf,
#if USE_MMX && !defined(ARCH_CPU_X86_64)
#if defined(_MSC_VER)
#define EMMS() __asm emms
+#pragma warning(disable: 4799)
#else
#define EMMS() asm("emms")
#endif
#else
-#define EMMS()
+//#define EMMS()
+#define EMMS() __asm emms
#endif
#endif // MEDIA_BASE_YUV_ROW_H_