Use <vlc_cpu.h>

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 ) );
 

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

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 *);
 

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. */

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>
 

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

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

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>
 

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

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>

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>

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__

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

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>

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>
 

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)

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"

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>

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"
 

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 *);
 

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"

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"
 

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>

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"
 
 /*****************************************************************************

src/libvlc.c

@@ -86,6 +86,7 @@
 #include "audio_output/aout_internal.h"
 
 #include <vlc_charset.h>
+#include <vlc_cpu.h>
 
 #include "libvlc.h"
 

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;

src/modules/modules.c

@@ -80,6 +80,7 @@
 
 #include "vlc_charset.h"
 #include "vlc_arrays.h"
+#include <vlc_cpu.h>
 
 #include "modules/modules.h"