mirror of
https://github.com/mpv-player/mpv
synced 2024-10-26 07:22:17 +02:00
VO: remove vo_directfb2 and vo_directx
While being able to play videos on a framebuffer device would be nice, I didn't need it, and couldn't even test it (buggy nvidia binary drivers that disable framebuffers, buggy DirectFB that crashes when using the X11 backend). It's just dead weight, get rid of it. vo_directx was very horrible, and by today it's mostly useless. I didn't remove it, because there was that-guy who told me in amazement how awesome mplayer was, because it was the only video player fast enough for fast playback on his system when using vo_directx. Sorry, that-guy.
This commit is contained in:
parent
41fbcee1f5
commit
0e2c48a3ce
@ -224,14 +224,6 @@ direct3d (Windows only)
|
||||
Same as ``direct3d_shaders``, but with the options ``disable-textures``
|
||||
and ``disable-shaders`` forced.
|
||||
|
||||
directx (Windows only)
|
||||
Video output driver that uses the DirectX interface. Deprecated, always
|
||||
prefer direct3d* by default.
|
||||
|
||||
noaccel
|
||||
Turns off hardware acceleration. Try this option if you have display
|
||||
problems.
|
||||
|
||||
corevideo (Mac OS X 10.6 and later)
|
||||
Mac OS X CoreVideo video output driver. Uses the CoreVideo APIs to fill
|
||||
PixelBuffers and generate OpenGL textures from them (useful as a fallback
|
||||
@ -652,28 +644,6 @@ null
|
||||
caca
|
||||
Color ASCII art video output driver that works on a text console.
|
||||
|
||||
directfb
|
||||
Play video using the DirectFB library.
|
||||
|
||||
(no-)input
|
||||
Use the DirectFB instead of the MPlayer keyboard code (default:
|
||||
enabled).
|
||||
buffermode=single|double|triple
|
||||
Double and triple buffering give best results if you want to avoid
|
||||
tearing issues. Triple buffering is more efficient than double
|
||||
buffering as it does not block MPlayer while waiting for the vertical
|
||||
retrace. Single buffering should be avoided (default: single).
|
||||
fieldparity=top|bottom
|
||||
Control the output order for interlaced frames (default: disabled).
|
||||
Valid values are top = top fields first, bottom = bottom fields first.
|
||||
This option does not have any effect on progressive film material like
|
||||
most MPEG movies are. You need to enable this option if you have
|
||||
tearing issues or unsmooth motions watching interlaced film material.
|
||||
layer=N
|
||||
Will force layer with ID N for playback (default: -1 - auto).
|
||||
dfbopts=<list>
|
||||
Specify a parameter list for DirectFB.
|
||||
|
||||
image
|
||||
Output each frame into an image file in the current directory. Each file
|
||||
takes the frame number padded with leading zeros as name.
|
||||
|
2
Makefile
2
Makefile
@ -307,8 +307,6 @@ SRCS_MPLAYER-$(CACA) += libvo/vo_caca.c
|
||||
SRCS_MPLAYER-$(COREAUDIO) += libao2/ao_coreaudio.c
|
||||
SRCS_MPLAYER-$(COREVIDEO) += libvo/vo_corevideo.m
|
||||
SRCS_MPLAYER-$(DIRECT3D) += libvo/vo_direct3d.c libvo/w32_common.c
|
||||
SRCS_MPLAYER-$(DIRECTFB) += libvo/vo_directfb2.c
|
||||
SRCS_MPLAYER-$(DIRECTX) += libao2/ao_dsound.c libvo/vo_directx.c
|
||||
SRCS_MPLAYER-$(GL) += libvo/gl_common.c libvo/vo_gl.c libvo/vo_gl3.c \
|
||||
pnm_loader.c
|
||||
SRCS_MPLAYER-$(GL_WIN32) += libvo/w32_common.c
|
||||
|
62
configure
vendored
62
configure
vendored
@ -362,7 +362,6 @@ Video output:
|
||||
--enable-gl enable OpenGL video output [autodetect]
|
||||
--enable-caca enable CACA video output [autodetect]
|
||||
--enable-direct3d enable Direct3D video output [autodetect]
|
||||
--enable-directx enable DirectX video output [autodetect]
|
||||
--enable-xv enable Xv video output [autodetect]
|
||||
--enable-vdpau enable VDPAU acceleration [autodetect]
|
||||
--enable-vm enable XF86VidMode support [autodetect]
|
||||
@ -370,7 +369,6 @@ Video output:
|
||||
--enable-x11 enable X11 video output [autodetect]
|
||||
--enable-xshape enable XShape support [autodetect]
|
||||
--disable-xss disable screensaver support via xss [autodetect]
|
||||
--enable-directfb enable DirectFB video output [autodetect]
|
||||
--disable-corevideo disable CoreVideo video output [autodetect]
|
||||
--disable-cocoa disable Cocoa OpenGL backend [autodetect]
|
||||
|
||||
@ -451,7 +449,6 @@ _xss=auto
|
||||
_xv=auto
|
||||
_vdpau=auto
|
||||
_direct3d=auto
|
||||
_directx=auto
|
||||
_nas=auto
|
||||
_png=auto
|
||||
_mng=auto
|
||||
@ -507,7 +504,6 @@ _apple_remote=auto
|
||||
_apple_ir=auto
|
||||
_termcap=auto
|
||||
_termios=auto
|
||||
_directfb=auto
|
||||
#language=en
|
||||
_shm=auto
|
||||
_translation=no
|
||||
@ -652,8 +648,6 @@ for ac_option do
|
||||
--disable-vdpau) _vdpau=no ;;
|
||||
--enable-direct3d) _direct3d=yes ;;
|
||||
--disable-direct3d) _direct3d=no ;;
|
||||
--enable-directx) _directx=yes ;;
|
||||
--disable-directx) _directx=no ;;
|
||||
--enable-png) _png=yes ;;
|
||||
--disable-png) _png=no ;;
|
||||
--enable-mng) _mng=yes ;;
|
||||
@ -762,8 +756,6 @@ for ac_option do
|
||||
--disable-termcap) _termcap=no ;;
|
||||
--enable-termios) _termios=yes ;;
|
||||
--disable-termios) _termios=no ;;
|
||||
--enable-directfb) _directfb=yes ;;
|
||||
--disable-directfb) _directfb=no ;;
|
||||
--enable-shm) _shm=yes ;;
|
||||
--disable-shm) _shm=no ;;
|
||||
--enable-select) _select=yes ;;
|
||||
@ -1997,33 +1989,6 @@ echores "$_libquvi"
|
||||
#########
|
||||
|
||||
|
||||
echocheck "DirectFB"
|
||||
if test "$_directfb" = auto ; then
|
||||
_directfb=no
|
||||
cat > $TMPC << EOF
|
||||
#include <directfb.h>
|
||||
#include <directfb_version.h>
|
||||
#if (DIRECTFB_MAJOR_VERSION << 16 | DIRECTFB_MINOR_VERSION << 8 | DIRECTFB_MICRO_VERSION) < (0 << 16 | 9 << 8 | 22)
|
||||
#error "DirectFB version too old."
|
||||
#endif
|
||||
int main(void) { DirectFBInit(0, 0); return 0; }
|
||||
EOF
|
||||
for _inc_tmp in "" -I/usr/local/include/directfb -I/usr/include/directfb -I/usr/local/include; do
|
||||
cc_check $_inc_tmp -ldirectfb &&
|
||||
_directfb=yes && extra_cflags="$extra_cflags $_inc_tmp" && break
|
||||
done
|
||||
fi
|
||||
if test "$_directfb" = yes ; then
|
||||
def_directfb='#define CONFIG_DIRECTFB 1'
|
||||
vomodules="directfb $vomodules"
|
||||
libs_mplayer="$libs_mplayer -ldirectfb"
|
||||
else
|
||||
def_directfb='#undef CONFIG_DIRECTFB'
|
||||
novomodules="directfb $novomodules"
|
||||
fi
|
||||
echores "$_directfb"
|
||||
|
||||
|
||||
if darwin; then
|
||||
|
||||
echocheck "Cocoa"
|
||||
@ -2556,29 +2521,6 @@ else
|
||||
fi
|
||||
echores "$_direct3d"
|
||||
|
||||
echocheck "Directx"
|
||||
if test "$_directx" = auto ; then
|
||||
cat > $TMPC << EOF
|
||||
#include <windows.h>
|
||||
#include <ddraw.h>
|
||||
#include <dsound.h>
|
||||
int main(void) { return 0; }
|
||||
EOF
|
||||
_directx=no
|
||||
cc_check -lgdi32 && _directx=yes
|
||||
fi
|
||||
if test "$_directx" = yes ; then
|
||||
def_directx='#define CONFIG_DIRECTX 1'
|
||||
libs_mplayer="$libs_mplayer -lgdi32"
|
||||
vomodules="directx $vomodules"
|
||||
aomodules="dsound $aomodules"
|
||||
else
|
||||
def_directx='#undef CONFIG_DIRECTX'
|
||||
novomodules="directx $novomodules"
|
||||
noaomodules="dsound $noaomodules"
|
||||
fi
|
||||
echores "$_directx"
|
||||
|
||||
fi #if win32; then
|
||||
|
||||
|
||||
@ -3586,8 +3528,6 @@ COCOA = $_cocoa
|
||||
COREAUDIO = $_coreaudio
|
||||
COREVIDEO = $_corevideo
|
||||
DIRECT3D = $_direct3d
|
||||
DIRECTFB = $_directfb
|
||||
DIRECTX = $_directx
|
||||
DVBIN = $_dvbin
|
||||
DVDREAD = $_dvdread
|
||||
DXR3 = $_dxr3
|
||||
@ -3872,8 +3812,6 @@ $def_caca
|
||||
$def_corevideo
|
||||
$def_cocoa
|
||||
$def_direct3d
|
||||
$def_directfb
|
||||
$def_directx
|
||||
$def_gif
|
||||
$def_gif_4
|
||||
$def_gif_tvt_hack
|
||||
|
@ -30,8 +30,6 @@
|
||||
#define memcpy_pic(d, s, b, h, ds, ss) memcpy_pic2(d, s, b, h, ds, ss, 0)
|
||||
#define my_memcpy_pic(d, s, b, h, ds, ss) memcpy_pic2(d, s, b, h, ds, ss, 1)
|
||||
|
||||
#define mem2agpcpy_pic memcpy_pic
|
||||
|
||||
/**
|
||||
* \param limit2width always skip data between end of line and start of next
|
||||
* instead of copying the full block when strides are the same
|
||||
|
@ -84,8 +84,6 @@ extern struct vo_driver video_out_image;
|
||||
extern struct vo_driver video_out_caca;
|
||||
extern struct vo_driver video_out_direct3d;
|
||||
extern struct vo_driver video_out_direct3d_shaders;
|
||||
extern struct vo_driver video_out_directx;
|
||||
extern struct vo_driver video_out_directfb;
|
||||
extern struct vo_driver video_out_corevideo;
|
||||
|
||||
const struct vo_driver *video_out_drivers[] =
|
||||
@ -94,9 +92,6 @@ const struct vo_driver *video_out_drivers[] =
|
||||
&video_out_direct3d_shaders,
|
||||
&video_out_direct3d,
|
||||
#endif
|
||||
#ifdef CONFIG_DIRECTX
|
||||
&video_out_directx,
|
||||
#endif
|
||||
#ifdef CONFIG_GL_COCOA
|
||||
&video_out_gl,
|
||||
#endif
|
||||
@ -123,10 +118,6 @@ const struct vo_driver *video_out_drivers[] =
|
||||
#endif
|
||||
&video_out_null,
|
||||
// should not be auto-selected
|
||||
#ifdef CONFIG_DIRECTFB
|
||||
// vo directfb can call exit() if initialization fails
|
||||
&video_out_directfb,
|
||||
#endif
|
||||
&video_out_image,
|
||||
#ifdef CONFIG_X11
|
||||
#ifdef CONFIG_GL
|
||||
|
1537
libvo/vo_directfb2.c
1537
libvo/vo_directfb2.c
File diff suppressed because it is too large
Load Diff
1143
libvo/vo_directx.c
1143
libvo/vo_directx.c
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user