Streamline SIMD targets in media.gyp

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 22 matching lines @@
 #endif
 #endif
 
 // Assembly functions are declared without namespace.
 extern "C" {
 void EmptyRegisterState_MMX();
 }  // extern "C"
 
 namespace media {
 
+typedef void (*FilterYUVRowsProc)(uint8*, const uint8*, const uint8*, int, int);
+
+typedef void (*ConvertYUVToRGB32Proc)(const uint8*,
+                                      const uint8*,
+                                      const uint8*,
+                                      uint8*,
+                                      int,
+                                      int,
+                                      int,
+                                      int,
+                                      int,
+                                      YUVType);
+
+typedef void (*ConvertYUVAToARGBProc)(const uint8*,
+                                      const uint8*,
+                                      const uint8*,
+                                      const uint8*,
+                                      uint8*,
+                                      int,
+                                      int,
+                                      int,
+                                      int,
+                                      int,
+                                      int,
+                                      YUVType);
+
+typedef void (*ConvertYUVToRGB32RowProc)(const uint8*,
+                                         const uint8*,
+                                         const uint8*,
+                                         uint8*,
+                                         ptrdiff_t);
+
+typedef void (*ConvertYUVAToARGBRowProc)(const uint8*,
+                                         const uint8*,
+                                         const uint8*,
+                                         const uint8*,
+                                         uint8*,
+                                         ptrdiff_t);
+
+typedef void (*ScaleYUVToRGB32RowProc)(const uint8*,
+                                       const uint8*,
+                                       const uint8*,
+                                       uint8*,
+                                       ptrdiff_t,
+                                       ptrdiff_t);
+
 static FilterYUVRowsProc ChooseFilterYUVRowsProc() {
 #if defined(ARCH_CPU_X86_FAMILY)
   base::CPU cpu;
   if (cpu.has_sse2())
     return &FilterYUVRows_SSE2;
 
 #if defined(MEDIA_MMX_INTRINSICS_AVAILABLE)
   if (cpu.has_mmx())
     return &FilterYUVRows_MMX;
 #endif  // defined(MEDIA_MMX_INTRINSICS_AVAILABLE)
 #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;
 #endif
   return &ConvertYUVToRGB32Row_C;
 }
 
 static ScaleYUVToRGB32RowProc ChooseScaleYUVToRGB32RowProc() {
+#if defined(ARCH_CPU_X86_FAMILY)
+  base::CPU cpu;
 #if defined(ARCH_CPU_X86_64)
   // Use 64-bits version if possible.
-  return &ScaleYUVToRGB32Row_SSE2_X64;
-#elif defined(ARCH_CPU_X86_FAMILY)
-  base::CPU cpu;
+  // TODO(dalecurtis): Fix this to directly return X64 version.  All x64 procs
+  // have SSE2, this is a hack to prevent MSVC from optimizing exports out in
+  // the shared library build which are used by unittests.
+  if (cpu.has_sse2())
+    return &ScaleYUVToRGB32Row_SSE2_X64;
+#endif  // defined(ARCH_CPU_X86_64)
   // Choose the best one on 32-bits system.
   if (cpu.has_sse())
     return &ScaleYUVToRGB32Row_SSE;
   if (cpu.has_mmx())
     return &ScaleYUVToRGB32Row_MMX;
-#endif  // defined(ARCH_CPU_X86_64)
+#endif  // defined(ARCH_CPU_X86_FAMILY)
   return &ScaleYUVToRGB32Row_C;
 }
 
 static ScaleYUVToRGB32RowProc ChooseLinearScaleYUVToRGB32RowProc() {
+#if defined(ARCH_CPU_X86_FAMILY)
+  base::CPU cpu;
 #if defined(ARCH_CPU_X86_64)
   // Use 64-bits version if possible.
-  return &LinearScaleYUVToRGB32Row_MMX_X64;
-#elif defined(ARCH_CPU_X86_FAMILY)
-  base::CPU cpu;
+  // TODO(dalecurtis): Fix this to directly return X64 version.  All x64 procs
+  // have SSE2, this is a hack to prevent MSVC from optimizing exports out in
+  // the shared library build which are used by unittests.
+  if (cpu.has_sse2())
+    return &LinearScaleYUVToRGB32Row_MMX_X64;
+#endif  // defined(ARCH_CPU_X86_64)
   // 32-bits system.
   if (cpu.has_sse())
     return &LinearScaleYUVToRGB32Row_SSE;
   if (cpu.has_mmx())
     return &LinearScaleYUVToRGB32Row_MMX;
-#endif  // defined(ARCH_CPU_X86_64)
+#endif  // defined(ARCH_CPU_X86_FAMILY)
   return &LinearScaleYUVToRGB32Row_C;
 }
 
 // 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;
@@ skipping 522 matching lines @@
       convert_proc = &ConvertYUVAToARGB_MMX;
     else
       convert_proc = &ConvertYUVAToARGB_C;
   }
   convert_proc(yplane, uplane, vplane, aplane, rgbframe,
                width, height, ystride, uvstride, astride, rgbstride, yuv_type);
 #endif
 }
 
 }  // namespace media