Use <vlc_cpu.h>

diff --git a/include/vlc_common.h b/include/vlc_common.h
index af18410e40245321fabadd3b3e7ff1543a5bed83..0b2ef8799526143d8f335209e07fd2446c974159 100644 (file)
--- 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 e7201a8cdf925e46cad30d2fce614f6f1ab3113b..b242a1f760a895c7ba1780cc79767925f1278ff3 100644 (file)
--- 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 7f84dce64d1bfe8610efb3ef7222af82f3d11f70..a7daaf26802569203bce7d46971b3142e86327a3 100644 (file)
--- 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 1adb6d40253f54080f622f780695442f527cfc34..c8568a6ab7a943fc14ec330cff47367938ac4787 100644 (file)
--- 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 f915a6b56e6f468599610a7b73d8edaef54e5399..6748e62145a72745eab72fb0758d1162b832bb9c 100644 (file)
--- 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 cdbc794bea9914faaafdd48cb71f7d9139cad36c..4bc691405bdfe4fccbf9d765e12eaafa9b297c72 100644 (file)
--- 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 19346678a410ecbc9e445e2101d8008323ea48d7..537a8abb06f8d830837d6505dd6e1e9a8662494c 100644 (file)
--- 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 03327bfc06bfe1b8df41f0fd64eaba5da4b5a929..2da40653925da0e84a69d3ce5254aa3909fede67 100644 (file)
--- 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 22ef5bf79966dc137e35507f641b4e0496179fd4..0e3224944c11d61c26a6bc0398d2cdf5ca6c2456 100644 (file)
--- 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 ef20994890462f10819388280a6378314e32efba..39bde8dd09931cec15a5572a6b436c469970c245 100644 (file)
--- 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 1cc036e590676a0c49eacbc2c0dfcaa6e561fb1e..c2c1b4d6bc228c1f4efc94aa40a578b1bb9d6a8c 100644 (file)
--- 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 d1552a177b2fb418badcd760dfaf0819d0d72cf1..8d16ff5b7480f03a7ddd299f30218350e2c41dae 100644 (file)
--- 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 7fdf2617167891d30ed658746a4b26c6dc3e60bc..6202a9e8061c4824afd933c5ccc7e1f311ed635e 100644 (file)
--- 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 b8f2fcf95f28504736f1c61930eeee16216e8521..2678fd4ba3e395200db60fcd25259aef5723114e 100644 (file)
--- 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 2e1048173c8124e93b3b4509eb17461747102d5c..69887dc8fb8294e90f33b4cd9c09cc22c5f89a2f 100644 (file)
--- 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 04fef312e4637ea4c6b6dcb0cfd529a748c544cd..d07272039110d266268ee7121e1910635a2a1ae0 100644 (file)
--- 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 bf1c9e4e4e19a5e931f21b878ffaafab932ebfb5..feafcc4ab44796e981e003d28c5499c7cdbd5870 100644 (file)
--- 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 facdf0a58595fb77d3fa0b98d2ca5cb4d98f99cc..b4672933a0c2d2afb05335a788e9714690bfb88d 100644 (file)
--- 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 cf7bfc9a9e646f1110c196b6aaefa861f03abfd0..87e10f0065050c5c5288680c37f55291b4c3e5a8 100644 (file)
--- 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 b8a17854d5c24b9362782c6d5bf07775e4b29935..625ae7a1f33722d813e6aeb4732ea94b22dcd173 100644 (file)
--- 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 1de201e3991593c2636b1f41db58ec396deaf593..de49514574390a09fd2b30f1e53f8f548c381776 100644 (file)
--- 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 16be58023fe32c2b4c812b21bf73c0a81fc740fd..8249a0bf6080a10206d443fafa9599fc83cd4c06 100644 (file)
--- 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 050549464268feca5acb2c101a19f43241d341a1..2355c05935f0c49eda202bf2d6f44696342e491c 100644 (file)
--- 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 d15d9909af0d133acc04d7855c281394bd0fcc76..bce5f1b00fd7a294c80121b86b94535fdf68a2e6 100644 (file)
--- 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 36391933f2d35c6cfa4530300695930f73735dc4..97755fd7328161e7ef334399e34c4674ecef0e28 100644 (file)
--- 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 2bbff245f05aa6dea38488d927fd3bdf3e82b0ba..615484cbef4af059d994c1b5fac5849042b67eb9 100644 (file)
--- 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 d9aedc478ce5bba4c77bc6aaabed481cfb11785e..3f7501307d7869618179f0dbca5c9378b769c7f7 100644 (file)
--- 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"