summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-07-29 17:20:57 +0200
committerwm4 <wm4@nowhere>2012-07-30 01:37:28 +0200
commit74df1d8e05aa226c7e82a6d84f43c873ee234561 (patch)
treec75185bd2d82e06564c03c41577475f425e44edf /libvo
parenta4bab723b30fe6190fb137b67bba521e55276cf6 (diff)
downloadmpv-74df1d8e05aa226c7e82a6d84f43c873ee234561.tar.bz2
mpv-74df1d8e05aa226c7e82a6d84f43c873ee234561.tar.xz
Remove compile time/runtime CPU detection, and drop some platforms
mplayer had three ways of enabling CPU specific assembler routines: a) Enable them at compile time; crash if the CPU can't handle it. b) Enable them at compile time, but let the configure script detect your CPU. Your binary will only crash if you try to run it on a different system that has less features than yours. This was the default, I think. c) Runtime detection. The implementation of b) and c) suck. a) is not really feasible (it sucks for users). Remove all code related to this, and use libav's CPU detection instead. Now the configure script will always enable CPU specific features, and disable them at runtime if libav reports them not as available. One implication is that now the compiler is always expected to handle SSE (etc.) inline assembly at runtime, unless it's explicitly disabled. Only checks for x86 CPU specific features are kept, the rest is either unused or barely used. Get rid of all the dump -mpcu, -march etc. flags. Trust the compiler to select decent settings. Get rid of support for the following operating systems: - BSD/OS (some ancient BSD fork) - QNX (don't care) - BeOS (dead, Haiku support is still welcome) - AIX (don't care) - HP-UX (don't care) - OS/2 (dead, actual support has been removed a while ago) Remove the configure code for detecting the endianness. Instead, use the standard header <endian.h>, which can be used if _GNU_SOURCE or _BSD_SOURCE is defined. (Maybe these changes should have been in a separate commit.) Since this is a quite violent code removal orgy, and I'm testing only on x86 32 bit Linux, expect regressions.
Diffstat (limited to 'libvo')
-rw-r--r--libvo/osd.c3
-rw-r--r--libvo/osd_template.c2
-rw-r--r--libvo/vo_x11.c5
3 files changed, 7 insertions, 3 deletions
diff --git a/libvo/osd.c b/libvo/osd.c
index 992ffc01f3..08cda11a81 100644
--- a/libvo/osd.c
+++ b/libvo/osd.c
@@ -27,6 +27,7 @@
#include "osd.h"
#include "mp_msg.h"
#include <inttypes.h>
+#include <endian.h>
#include "cpudetect.h"
#if ARCH_X86
@@ -35,6 +36,8 @@ static const unsigned long long mask24lh __attribute__((aligned(8))) = 0xFFFF00
static const unsigned long long mask24hl __attribute__((aligned(8))) = 0x0000FFFFFFFFFFFFULL;
#endif
+#define CONFIG_RUNTIME_CPUDETECT 1
+
//Note: we have C, X86-nommx, MMX, MMX2, 3DNOW version therse no 3DNOW+MMX2 one
//Plain C versions
#if !HAVE_MMX || CONFIG_RUNTIME_CPUDETECT
diff --git a/libvo/osd_template.c b/libvo/osd_template.c
index 6d8305a3c5..103d169b32 100644
--- a/libvo/osd_template.c
+++ b/libvo/osd_template.c
@@ -320,7 +320,7 @@ static inline void RENAME(vo_draw_alpha_rgb24)(int w,int h, unsigned char* src,
static inline void RENAME(vo_draw_alpha_rgb32)(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride){
int y;
-#if HAVE_BIGENDIAN
+#if BYTE_ORDER == BIG_ENDIAN
dstbase++;
#endif
#if HAVE_MMX
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c
index 9be47c9d8a..3b264b232c 100644
--- a/libvo/vo_x11.c
+++ b/libvo/vo_x11.c
@@ -19,6 +19,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <endian.h>
#include "config.h"
#include "video_out.h"
@@ -261,7 +262,7 @@ static void freeMyXImage(void)
ImageData = NULL;
}
-#if HAVE_BIGENDIAN
+#if BYTE_ORDER == BIG_ENDIAN
#define BO_NATIVE MSBFirst
#define BO_NONNATIVE LSBFirst
#else
@@ -431,7 +432,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
// we can easily "emulate" them.
if (out_format & 64 && (IMGFMT_IS_RGB(out_format) || IMGFMT_IS_BGR(out_format))) {
out_format &= ~64;
-#if HAVE_BIGENDIAN
+#if BYTE_ORDER == BIG_ENDIAN
out_offset = 1;
#else
out_offset = -1;