summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorfbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-14 01:51:27 +0000
committerfbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-14 01:51:27 +0000
commitc847e0873d3ca883baf1876a7ec23fabe0657de6 (patch)
treee1ec8d7892d3ae6dc9d6372d298a6b7c92f0aa62 /media
parent1e25a76077f720c0d756060a0668d65c19688c4e (diff)
downloadchromium_src-c847e0873d3ca883baf1876a7ec23fabe0657de6.zip
chromium_src-c847e0873d3ca883baf1876a7ec23fabe0657de6.tar.gz
chromium_src-c847e0873d3ca883baf1876a7ec23fabe0657de6.tar.bz2
Disable SSE2 for Windows media playback
BUG=none TEST=none Review URL: http://codereview.chromium.org/1654001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44438 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_