Replace or exclude MMX intrinsics in yuv_convert_simd_x86 due to lack of VS2010 support for them in…

media/base/yuv_convert.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This webpage shows layout of YV12 and other YUV formats
 // http://www.fourcc.org/yuv.php
 // The actual conversion is best described here
 // http://en.wikipedia.org/wiki/YUV
 // An article on optimizing YUV conversion using tables instead of multiplies
 // http://lestourtereaux.free.fr/papers/data/yuvrgb.pdf
@@ skipping 15 matching lines @@
 #include "media/base/simd/filter_yuv.h"
 
 #if defined(ARCH_CPU_X86_FAMILY)
 #if defined(COMPILER_MSVC)
 #include <intrin.h>
 #else
 #include <mmintrin.h>
 #endif
 #endif
 
+// Assembly functions are declared without namespace.
+extern "C" {
+void EmptyRegisterState_MMX(void);

[scherkus (not reviewing), 2013/02/01 01:13:17]

nit: we don't typically put the void type in for parameters (if this is somehow
necessary for assembly magic, feel free to ignore)

[wolenetz, 2013/02/01 02:42:07]

Done.

+}  // extern "C"
+
 namespace media {
 
 static FilterYUVRowsProc ChooseFilterYUVRowsProc() {
 #if defined(ARCH_CPU_X86_FAMILY)
   base::CPU cpu;
   if (cpu.has_sse2())
     return &FilterYUVRows_SSE2;
+
+#if !defined(MEDIA_DO_NOT_USE_MMX_INTRINSICS)
   if (cpu.has_mmx())
     return &FilterYUVRows_MMX;
-#endif
+#endif  // !defined(MEDIA_DO_NOT_USE_MMX_INTRINSICS)
+#endif  // defined(ARCH_CPU_X86_FAMILY)
   return &FilterYUVRows_C;
 }
 
 static ConvertYUVToRGB32RowProc ChooseConvertYUVToRGB32RowProc() {
 #if defined(ARCH_CPU_X86_FAMILY)
   base::CPU cpu;
   if (cpu.has_sse())
     return &ConvertYUVToRGB32Row_SSE;
   if (cpu.has_mmx())
     return &ConvertYUVToRGB32Row_MMX;
@@ skipping 34 matching lines @@
 // Empty SIMD registers state after using them.
 void EmptyRegisterState() {
 #if defined(ARCH_CPU_X86_FAMILY)
   static bool checked = false;
   static bool has_mmx = false;
   if (!checked) {
     base::CPU cpu;
     has_mmx = cpu.has_mmx();
     checked = true;
   }
-  if (has_mmx)
+
+  if (has_mmx) {
+#if defined(MEDIA_DO_NOT_USE_MMX_INTRINSICS)
+    EmptyRegisterState_MMX();
+#else
     _mm_empty();
-#endif
+#endif  // defined(MEDIA_DO_NOT_USE_MMX_INTRINSICS)
+  }
+
+#endif  // defined(ARCH_CPU_X86_FAMILY)
 }
 
 // 16.16 fixed point arithmetic
 const int kFractionBits = 16;
 const int kFractionMax = 1 << kFractionBits;
 const int kFractionMask = ((1 << kFractionBits) - 1);
 
 // Scale a frame of YUV to 32 bit ARGB.
 void ScaleYUVToRGB32(const uint8* y_buf,
                      const uint8* u_buf,
@@ skipping 469 matching lines @@
     else
       convert_proc = &ConvertYUVToRGB32_C;
   }
 
   convert_proc(yplane, uplane, vplane, rgbframe,
                width, height, ystride, uvstride, rgbstride, yuv_type);
 #endif
 }
 
 }  // namespace media