diff options
author | wm4 <wm4@nowhere> | 2012-08-12 15:30:21 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-08-16 17:16:33 +0200 |
commit | aebfbbf2bdda8e18beef90c16da97bd335f7d3b0 (patch) | |
tree | a7362bf3ef6f2d80a47b2e539a2ea4efe5e2e079 | |
parent | c6b03ffef6250096373c4a81a489dae9fbff9087 (diff) | |
download | mpv-aebfbbf2bdda8e18beef90c16da97bd335f7d3b0.tar.bz2 mpv-aebfbbf2bdda8e18beef90c16da97bd335f7d3b0.tar.xz |
Remove win32/qt/xanim/real binary codecs loading
Remove the win32 loader - the win32 emulation layer, as well as the
code for using DirectShow/DMO/VFW codecs. Remove loading of xanim,
QuickTime, and RealMedia codecs.
The win32 emulation layer is based on a very old version of wine.
Apparently, wine code was copied and hacked until it was somehow able
to load a limited collection of binary codecs. It poked around in the
code segment of some known binary codecs to disable unsupported win32
API calls to make them work. Example from module.c:
for (i=0;i<5;i++) RVA(0x19e842)[i]=0x90; // make_new_region ?
for (i=0;i<28;i++) RVA(0x19e86d)[i]=0x90; // call__call_CreateCompatibleDC ?
for (i=0;i<5;i++) RVA(0x19e898)[i]=0x90; // jmp_to_call_loadbitmap ?
for (i=0;i<9;i++) RVA(0x19e8ac)[i]=0x90; // call__calls_OLE_shit ?
for (i=0;i<106;i++) RVA(0x261b10)[i]=0x90; // disable threads
Just to show how utterly insane this code is. You wouldn't want even
your worst enemy to have to maintain this. In fact, it seems nobody
made major changes to this code ever since it was committed.
Most formats can be decoded by libavcodecs these days, and the loader
couldn't be used on 64 bit platforms anyway. The same is (probably)
true for the other binary codecs.
General note about how support for win32 codecs could be added back:
It's not possible to replace the win32 loader code by using wine as
library, because modern wine can not be linked with native Linux
programs for certain reasons. It would be possible to to move DirectShow
video decoding into a separate process linked with wine, like the
CoreAVC-for-Linux patches do. There is also the mplayer-ww fork, which
uses the dshownative library to use DirectShow codecs on Windows.
114 files changed, 2 insertions, 44013 deletions
@@ -120,66 +120,17 @@ SRCS_COMMON-$(NETWORKING) += stream/stream_netstream.c \ SRCS_COMMON-$(PNG) += libmpcodecs/vd_mpng.c SRCS_COMMON-$(PRIORITY) += osdep/priority.c SRCS_COMMON-$(PVR) += stream/stream_pvr.c -SRCS_COMMON-$(QTX_CODECS) += libmpcodecs/ad_qtaudio.c \ - libmpcodecs/vd_qtvideo.c SRCS_COMMON-$(RADIO) += stream/stream_radio.c SRCS_COMMON-$(RADIO_CAPTURE) += stream/audio_in.c -SRCS_COMMON-$(REAL_CODECS) += libmpcodecs/ad_realaud.c \ - libmpcodecs/vd_realvid.c SRCS_COMMON-$(STREAM_CACHE) += stream/cache2.c SRCS_COMMON-$(TV) += stream/stream_tv.c stream/tv.c \ stream/frequencies.c stream/tvi_dummy.c SRCS_COMMON-$(TV_BSDBT848) += stream/tvi_bsdbt848.c -SRCS_COMMON-$(TV_DSHOW) += stream/tvi_dshow.c \ - loader/dshow/guids.c \ - loader/dshow/mediatype.c \ SRCS_COMMON-$(TV_V4L2) += stream/tvi_v4l2.c stream/audio_in.c SRCS_COMMON-$(VCD) += stream/stream_vcd.c SRCS_COMMON-$(VSTREAM) += stream/stream_vstream.c -SRCS_QTX_EMULATION += loader/wrapper.S -SRCS_COMMON-$(QTX_EMULATION) += $(SRCS_QTX_EMULATION) -SRCS_WIN32_EMULATION += loader/elfdll.c \ - loader/ext.c \ - loader/ldt_keeper.c \ - loader/module.c \ - loader/pe_image.c \ - loader/pe_resource.c \ - loader/registry.c \ - loader/resource.c \ - loader/win32.c \ - -SRCS_COMMON-$(WIN32_EMULATION) += $(SRCS_WIN32_EMULATION) - -SRCS_COMMON-$(WIN32DLL) += libmpcodecs/ad_acm.c \ - libmpcodecs/ad_dmo.c \ - libmpcodecs/ad_dshow.c \ - libmpcodecs/vd_dmo.c \ - libmpcodecs/vd_dshow.c \ - libmpcodecs/vd_vfw.c \ - libmpcodecs/vd_vfwex.c \ - libmpdemux/demux_avs.c \ - loader/afl.c \ - loader/drv.c \ - loader/vfl.c \ - loader/dshow/DS_AudioDecoder.c \ - loader/dshow/DS_Filter.c \ - loader/dshow/DS_VideoDecoder.c \ - loader/dshow/allocator.c \ - loader/dshow/cmediasample.c \ - loader/dshow/graph.c \ - loader/dshow/guids.c \ - loader/dshow/inputpin.c \ - loader/dshow/mediatype.c \ - loader/dshow/outputpin.c \ - loader/dmo/DMO_AudioDecoder.c \ - loader/dmo/DMO_VideoDecoder.c \ - loader/dmo/buffer.c \ - loader/dmo/dmo.c \ - loader/dmo/dmo_guids.c \ - -SRCS_COMMON-$(XANIM_CODECS) += libmpcodecs/vd_xanim.c SRCS_COMMON-$(DUMMY_OSD) += sub/osd_dummy.c SRCS_COMMON-$(LIBASS_OSD) += sub/osd_libass.c @@ -455,10 +406,6 @@ DIRS = . \ libmpcodecs/native \ libmpdemux \ libvo \ - loader \ - loader/dshow \ - loader/dmo \ - loader/wine \ osdep \ stream \ sub \ @@ -575,10 +522,6 @@ libdvdcss/%: CFLAGS := -Ilibdvdcss -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS libdvdnav/%: CFLAGS := -Ilibdvdnav -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\" $(CFLAGS) libdvdread4/%: CFLAGS := -Ilibdvdread4 -D_GNU_SOURCE $(CFLAGS_LIBDVDCSS_DVDREAD) $(CFLAGS) -loader/%: CFLAGS += -fno-omit-frame-pointer $(CFLAGS_NO_OMIT_LEAF_FRAME_POINTER) -#loader/%: CFLAGS += -Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT -loader/win32%: CFLAGS += $(CFLAGS_STACKREALIGN) - stream/stream_dvdnav%: CFLAGS := $(CFLAGS_LIBDVDNAV) $(CFLAGS) diff --git a/cfg-mplayer.h b/cfg-mplayer.h index 83fe9e3589..da39b06c65 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -363,7 +363,6 @@ const m_option_t common_opts[] = { #ifdef CONFIG_PRIORITY {"priority", &proc_priority, CONF_TYPE_STRING, 0, 0, 0, NULL}, #endif - {"codecpath", &codec_path, CONF_TYPE_STRING, 0, 0, 0, NULL}, OPT_CHOICE("noconfig", noconfig, CONF_GLOBAL | CONF_NOCFG | CONF_PRE_PARSE, ({"off", 0}, {"user", 1}, {"system", 2}, {"all", 3})), @@ -340,7 +340,6 @@ Optional features: --disable-ftp disable FTP support [enabled] --disable-vstream disable TiVo vstream client support [autodetect] --disable-pthreads disable Posix threads support [autodetect] - --disable-w32threads disable Win32 threads support [autodetect] --disable-libass disable subtitle rendering with libass [autodetect] --disable-libass-osd disable OSD rendering with libass [autodetect] --enable-rpath enable runtime linker path for extra libs [disabled] @@ -352,10 +351,6 @@ Codecs: --enable-mng enable MNG input support [autodetect] --enable-jpeg enable JPEG input/output support [autodetect] --enable-libcdio enable libcdio support [autodetect] - --disable-win32dll disable Win32 DLL support [disabled] - --disable-qtx disable QuickTime codecs support [enabled] - --disable-xanim disable XAnim codecs support [enabled] - --disable-real disable RealPlayer codecs support [enabled] --enable-libav skip Libav autodetection [autodetect] --enable-faad enable FAAD2 (AAC) [autodetect] --disable-ladspa disable LADSPA plugin support [autodetect] @@ -493,8 +488,6 @@ _dvdreadconfig=dvdread-config _dvdread=auto _dvdread_internal=auto _libdvdcss_internal=auto -_xanim=auto -_real=auto _live=no _nemesi=auto _lcms2=auto @@ -502,7 +495,6 @@ _xinerama=auto _vm=auto _xf86keysym=auto _alsa=auto -_win32dll=no _select=yes _radio=no _radio_capture=no @@ -511,7 +503,6 @@ _radio_bsdbt848=auto _tv=yes _tv_v4l2=auto _tv_bsdbt848=auto -_tv_dshow=auto _pvr=auto networking=yes _winsock2_h=auto @@ -531,11 +522,9 @@ _translation=no _libdv=auto _cdda=auto _cddb=auto -_qtx=auto |