From be5d9107a6ba2160a0baa5ea51fc3c121265d5d2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
Date: Tue, 22 Sep 2009 18:21:14 +0300
Subject: [PATCH] Use <vlc_cpu.h>

---
 include/vlc_common.h                          | 22 +------------------
 .../audio_filter/converter/mpgatofixed32.c    |  1 +
 modules/audio_filter/converter/neon.c         |  1 +
 modules/audio_output/alsa.c                   |  1 +
 modules/audio_output/pulse.c                  |  1 +
 modules/codec/avcodec/avcodec.c               |  1 +
 modules/codec/avcodec/encoder.c               |  1 +
 modules/codec/faad.c                          |  1 +
 modules/codec/fluidsynth.c                    |  1 +
 modules/codec/libmpeg2.c                      |  1 +
 modules/codec/x264.c                          |  1 +
 modules/codec/xvmc/xxmc.c                     |  1 +
 modules/misc/memcpy/memcpy.c                  |  1 +
 modules/misc/memcpy/memcpyaltivec.c           |  1 +
 modules/stream_out/switcher.c                 |  1 +
 modules/video_chroma/i420_rgb.c               |  1 +
 modules/video_chroma/i420_ymga.c              |  1 +
 modules/video_chroma/i420_yuy2.c              |  1 +
 modules/video_chroma/i422_yuy2.c              |  1 +
 modules/video_chroma/neon.c                   |  1 +
 modules/video_filter/deinterlace.c            |  1 +
 modules/video_filter/postproc.c               |  1 +
 modules/video_filter/swscale.c                |  1 +
 src/audio_output/output.c                     |  2 ++
 src/libvlc.c                                  |  1 +
 src/misc/cpu.c                                |  3 ++-
 src/modules/modules.c                         |  1 +
 27 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/include/vlc_common.h b/include/vlc_common.h
index af18410e40..0b2ef87995 100644
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -785,27 +785,7 @@ VLC_EXPORT( int, __vlc_execve, ( vlc_object_t *p_object, int i_argc, char *const
 /* dir wrappers (defined in src/extras/libc.c) */
 VLC_EXPORT(int, vlc_wclosedir, ( void *_p_dir ));
 
-/*****************************************************************************
- * CPU capabilities
- *****************************************************************************/
-#define CPU_CAPABILITY_NONE    0
-#define CPU_CAPABILITY_MMX     (1<<3)
-#define CPU_CAPABILITY_3DNOW   (1<<4)
-#define CPU_CAPABILITY_MMXEXT  (1<<5)
-#define CPU_CAPABILITY_SSE     (1<<6)
-#define CPU_CAPABILITY_SSE2    (1<<7)
-#define CPU_CAPABILITY_SSE3    (1<<8)
-#define CPU_CAPABILITY_SSSE3   (1<<9)
-#define CPU_CAPABILITY_SSE4    (1<<10)
-#define CPU_CAPABILITY_ALTIVEC (1<<16)
-#define CPU_CAPABILITY_NEON    (1<<24)
-#define CPU_CAPABILITY_FPU     (1<<31)
-VLC_EXPORT( unsigned, vlc_CPU, ( void ) );
-
-typedef void *(*vlc_memcpy_t) (void *tgt, const void *src, size_t n);
-typedef void *(*vlc_memset_t) (void *tgt, int c, size_t n);
-
-VLC_EXPORT( void, vlc_fastmem_register, (vlc_memcpy_t cpy, vlc_memset_t set) );
+/* Fast large memory copy and memory set */
 VLC_EXPORT( void *, vlc_memcpy, ( void *, const void *, size_t ) );
 VLC_EXPORT( void *, vlc_memset, ( void *, int, size_t ) );
 
diff --git a/modules/audio_filter/converter/mpgatofixed32.c b/modules/audio_filter/converter/mpgatofixed32.c
index e7201a8cdf..b242a1f760 100644
--- a/modules/audio_filter/converter/mpgatofixed32.c
+++ b/modules/audio_filter/converter/mpgatofixed32.c
@@ -38,6 +38,7 @@
 #include <vlc_aout.h>
 #include <vlc_block.h>
 #include <vlc_filter.h>
+#include <vlc_cpu.h>
 
 /*****************************************************************************
  * Local prototypes
diff --git a/modules/audio_filter/converter/neon.c b/modules/audio_filter/converter/neon.c
index 7f84dce64d..a7daaf2680 100644
--- a/modules/audio_filter/converter/neon.c
+++ b/modules/audio_filter/converter/neon.c
@@ -25,6 +25,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
+#include <vlc_cpu.h>
 
 static int Open (vlc_object_t *);
 
diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c
index 1adb6d4025..c8568a6ab7 100644
--- a/modules/audio_output/alsa.c
+++ b/modules/audio_output/alsa.c
@@ -38,6 +38,7 @@
 #include <vlc_dialog.h>
 
 #include <vlc_aout.h>
+#include <vlc_cpu.h>
 
 /* ALSA part
    Note: we use the new API which is available since 0.9.0beta10a. */
diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c
index f915a6b56e..6748e62145 100644
--- a/modules/audio_output/pulse.c
+++ b/modules/audio_output/pulse.c
@@ -31,6 +31,7 @@
 #include <vlc_plugin.h>
 
 #include <vlc_aout.h>
+#include <vlc_cpu.h>
 
 #include <pulse/pulseaudio.h>
 
diff --git a/modules/codec/avcodec/avcodec.c b/modules/codec/avcodec/avcodec.c
index cdbc794bea..4bc691405b 100644
--- a/modules/codec/avcodec/avcodec.c
+++ b/modules/codec/avcodec/avcodec.c
@@ -33,6 +33,7 @@
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
 #include <vlc_avcodec.h>
+#include <vlc_cpu.h>
 
 /* ffmpeg header */
 #define HAVE_MMX 1
diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c
index 19346678a4..537a8abb06 100644
--- a/modules/codec/avcodec/encoder.c
+++ b/modules/codec/avcodec/encoder.c
@@ -38,6 +38,7 @@
 #include <vlc_codec.h>
 #include <vlc_dialog.h>
 #include <vlc_avcodec.h>
+#include <vlc_cpu.h>
 
 /* ffmpeg header */
 #define HAVE_MMX 1
diff --git a/modules/codec/faad.c b/modules/codec/faad.c
index 03327bfc06..2da4065392 100644
--- a/modules/codec/faad.c
+++ b/modules/codec/faad.c
@@ -31,6 +31,7 @@
 #include <vlc_input.h>
 #include <vlc_aout.h>
 #include <vlc_codec.h>
+#include <vlc_cpu.h>
 
 #include <faad.h>
 
diff --git a/modules/codec/fluidsynth.c b/modules/codec/fluidsynth.c
index 22ef5bf799..0e3224944c 100644
--- a/modules/codec/fluidsynth.c
+++ b/modules/codec/fluidsynth.c
@@ -27,6 +27,7 @@
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
 #include <vlc_codec.h>
+#include <vlc_cpu.h>
 
 /* On Win32, we link statically */
 #ifdef WIN32
diff --git a/modules/codec/libmpeg2.c b/modules/codec/libmpeg2.c
index ef20994890..39bde8dd09 100644
--- a/modules/codec/libmpeg2.c
+++ b/modules/codec/libmpeg2.c
@@ -34,6 +34,7 @@
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
 #include <vlc_block_helper.h>
+#include <vlc_cpu.h>
 #include "../codec/cc.h"
 
 #include <mpeg2.h>
diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 1cc036e590..c2c1b4d6bc 100644
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -33,6 +33,7 @@
 #include <vlc_sout.h>
 #include <vlc_codec.h>
 #include <vlc_charset.h>
+#include <vlc_cpu.h>
 
 #ifdef PTW32_STATIC_LIB
 #include <pthread.h>
diff --git a/modules/codec/xvmc/xxmc.c b/modules/codec/xvmc/xxmc.c
index d1552a177b..8d16ff5b74 100644
--- a/modules/codec/xvmc/xxmc.c
+++ b/modules/codec/xvmc/xxmc.c
@@ -33,6 +33,7 @@
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
 #include <vlc_codec_synchro.h>
+#include <vlc_cpu.h>
 
 #include <unistd.h>
 #ifdef __GLIBC__
diff --git a/modules/misc/memcpy/memcpy.c b/modules/misc/memcpy/memcpy.c
index 7fdf261716..6202a9e806 100644
--- a/modules/misc/memcpy/memcpy.c
+++ b/modules/misc/memcpy/memcpy.c
@@ -31,6 +31,7 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
+#include <vlc_cpu.h>
 
 #undef HAVE_MMX
 #undef HAVE_MMX2
diff --git a/modules/misc/memcpy/memcpyaltivec.c b/modules/misc/memcpy/memcpyaltivec.c
index b8f2fcf95f..2678fd4ba3 100644
--- a/modules/misc/memcpy/memcpyaltivec.c
+++ b/modules/misc/memcpy/memcpyaltivec.c
@@ -33,6 +33,7 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
+#include <vlc_cpu.h>
 
 #ifdef HAVE_ALTIVEC_H
 #   include <altivec.h>
diff --git a/modules/stream_out/switcher.c b/modules/stream_out/switcher.c
index 2e1048173c..69887dc8fb 100644
--- a/modules/stream_out/switcher.c
+++ b/modules/stream_out/switcher.c
@@ -35,6 +35,7 @@
 #include <vlc_sout.h>
 #include <vlc_avcodec.h>
 #include <vlc_filter.h>
+#include <vlc_cpu.h>
 
 #include <vlc_block.h>
 
diff --git a/modules/video_chroma/i420_rgb.c b/modules/video_chroma/i420_rgb.c
index 04fef312e4..d072720391 100644
--- a/modules/video_chroma/i420_rgb.c
+++ b/modules/video_chroma/i420_rgb.c
@@ -35,6 +35,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
+#include <vlc_cpu.h>
 
 #include "i420_rgb.h"
 #if defined (MODULE_NAME_IS_i420_rgb)
diff --git a/modules/video_chroma/i420_ymga.c b/modules/video_chroma/i420_ymga.c
index bf1c9e4e4e..feafcc4ab4 100644
--- a/modules/video_chroma/i420_ymga.c
+++ b/modules/video_chroma/i420_ymga.c
@@ -34,6 +34,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
+#include <vlc_cpu.h>
 
 #define SRC_FOURCC  "I420,IYUV,YV12"
 #define DEST_FOURCC "YMGA"
diff --git a/modules/video_chroma/i420_yuy2.c b/modules/video_chroma/i420_yuy2.c
index facdf0a585..b4672933a0 100644
--- a/modules/video_chroma/i420_yuy2.c
+++ b/modules/video_chroma/i420_yuy2.c
@@ -33,6 +33,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
+#include <vlc_cpu.h>
 
 #if defined (MODULE_NAME_IS_i420_yuy2_altivec) && defined(HAVE_ALTIVEC_H)
 #   include <altivec.h>
diff --git a/modules/video_chroma/i422_yuy2.c b/modules/video_chroma/i422_yuy2.c
index cf7bfc9a9e..87e10f0065 100644
--- a/modules/video_chroma/i422_yuy2.c
+++ b/modules/video_chroma/i422_yuy2.c
@@ -33,6 +33,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
+#include <vlc_cpu.h>
 
 #include "i422_yuy2.h"
 
diff --git a/modules/video_chroma/neon.c b/modules/video_chroma/neon.c
index b8a17854d5..625ae7a1f3 100644
--- a/modules/video_chroma/neon.c
+++ b/modules/video_chroma/neon.c
@@ -25,6 +25,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
+#include <vlc_cpu.h>
 
 static int Open (vlc_object_t *);
 
diff --git a/modules/video_filter/deinterlace.c b/modules/video_filter/deinterlace.c
index 1de201e399..de49514574 100644
--- a/modules/video_filter/deinterlace.c
+++ b/modules/video_filter/deinterlace.c
@@ -40,6 +40,7 @@
 #include <vlc_vout.h>
 #include <vlc_sout.h>
 #include <vlc_filter.h>
+#include <vlc_cpu.h>
 
 #ifdef CAN_COMPILE_MMXEXT
 #   include "mmx.h"
diff --git a/modules/video_filter/postproc.c b/modules/video_filter/postproc.c
index 16be58023f..8249a0bf60 100644
--- a/modules/video_filter/postproc.c
+++ b/modules/video_filter/postproc.c
@@ -30,6 +30,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
+#include <vlc_cpu.h>
 
 #include "filter_picture.h"
 
diff --git a/modules/video_filter/swscale.c b/modules/video_filter/swscale.c
index 0505494642..2355c05935 100644
--- a/modules/video_filter/swscale.c
+++ b/modules/video_filter/swscale.c
@@ -32,6 +32,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
+#include <vlc_cpu.h>
 
 #ifdef HAVE_LIBSWSCALE_SWSCALE_H
 #   include <libswscale/swscale.h>
diff --git a/src/audio_output/output.c b/src/audio_output/output.c
index d15d9909af..bce5f1b00f 100644
--- a/src/audio_output/output.c
+++ b/src/audio_output/output.c
@@ -30,6 +30,8 @@
 
 #include <vlc_common.h>
 #include <vlc_aout.h>
+#include <vlc_cpu.h>
+
 #include "aout_internal.h"
 
 /*****************************************************************************
diff --git a/src/libvlc.c b/src/libvlc.c
index 36391933f2..97755fd732 100644
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -86,6 +86,7 @@
 #include "audio_output/aout_internal.h"
 
 #include <vlc_charset.h>
+#include <vlc_cpu.h>
 
 #include "libvlc.h"
 
diff --git a/src/misc/cpu.c b/src/misc/cpu.c
index 2bbff245f0..615484cbef 100644
--- a/src/misc/cpu.c
+++ b/src/misc/cpu.c
@@ -31,6 +31,7 @@
 #endif
 
 #include <vlc_common.h>
+#include <vlc_cpu.h>
 
 #include <sys/types.h>
 #ifndef WIN32
@@ -81,7 +82,7 @@ static bool check_OS_capability( const char *psz_capability, pid_t pid )
  *****************************************************************************/
 uint32_t CPUCapabilities( void )
 {
-    uint32_t i_capabilities = CPU_CAPABILITY_NONE;
+    uint32_t i_capabilities = 0;
 
 #if defined( __i386__ ) || defined( __x86_64__ )
      unsigned int i_eax, i_ebx, i_ecx, i_edx;
diff --git a/src/modules/modules.c b/src/modules/modules.c
index d9aedc478c..3f7501307d 100644
--- a/src/modules/modules.c
+++ b/src/modules/modules.c
@@ -80,6 +80,7 @@
 
 #include "vlc_charset.h"
 #include "vlc_arrays.h"
+#include <vlc_cpu.h>
 
 #include "modules/modules.h"
 
-- 
2.39.5