Skip to content

Commit 1fde09d

Browse files
author
wm4
committed
Remove some demuxers and decoders
Most of these demuxers and decoders are provided in better form by libav, while the mplayer builtin ones are essentially unmaintained. The only legimitate use case for not using the libav ones was working around libav bugs or bugs related to the way mplayer uses libav. Instead of trying to keep dead code alive, development effort should go into improving libav or the mplayer libav glue code. Note that the libav demuxer have been preferred over the mplayer builtin ones for a while in mplayer2. There were some exceptions: playing DVDs with dvdnav or playing network sources. (That's because some stream modules and network.c requested explicit file formats, such as DEMUXER_TYPE_MPEG_PS, which mapped to builtin demuxers.) With this commit, they are switched to use libav. One caveat is that the requested format is not passed to libavformat, instead we rely on the auto probing to select the correct libav demuxer (see code in demux_open_stream()).
1 parent 17b6949 commit 1fde09d

54 files changed

Lines changed: 34 additions & 19301 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,9 @@ SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c
8888

8989
SRCS_COMMON-$(LIBNEMESI) += libmpdemux/demux_nemesi.c \
9090
stream/stream_nemesi.c
91-
SRCS_COMMON-$(LIBNUT) += libmpdemux/demux_nut.c
9291
SRCS_COMMON-$(LIBPOSTPROC) += libmpcodecs/vf_pp.c
9392
SRCS_COMMON-$(LIBSMBCLIENT) += stream/stream_smb.c
9493

95-
SRCS_COMMON-$(LIBTHEORA) += libmpcodecs/vd_theora.c
9694
SRCS_COMMON-$(LIVE555) += libmpdemux/demux_rtp.cpp \
9795
libmpdemux/demux_rtp_codec.cpp \
9896
stream/stream_live555.c
@@ -103,8 +101,6 @@ SRCS_COMMON-$(COCOA) += libvo/osx_common.c \
103101
SRCS_COMMON-$(MNG) += libmpdemux/demux_mng.c
104102
SRCS_COMMON-$(MPG123) += libmpcodecs/ad_mpg123.c
105103

106-
SRCS_COMMON-$(MUSEPACK) += libmpcodecs/ad_mpc.c \
107-
libmpdemux/demux_mpc.c
108104
SRCS_COMMON-$(NATIVE_RTSP) += stream/stream_rtsp.c \
109105
stream/freesdp/common.c \
110106
stream/freesdp/errorlist.c \
@@ -148,7 +144,6 @@ SRCS_COMMON-$(RADIO) += stream/stream_radio.c
148144
SRCS_COMMON-$(RADIO_CAPTURE) += stream/audio_in.c
149145
SRCS_COMMON-$(REAL_CODECS) += libmpcodecs/ad_realaud.c \
150146
libmpcodecs/vd_realvid.c
151-
SRCS_COMMON-$(SPEEX) += libmpcodecs/ad_speex.c
152147
SRCS_COMMON-$(STREAM_CACHE) += stream/cache2.c
153148

154149
SRCS_COMMON-$(TV) += stream/stream_tv.c stream/tv.c \
@@ -161,8 +156,6 @@ SRCS_COMMON-$(TV_DSHOW) += stream/tvi_dshow.c \
161156
SRCS_COMMON-$(TV_V4L1) += stream/tvi_v4l.c stream/audio_in.c
162157
SRCS_COMMON-$(TV_V4L2) += stream/tvi_v4l2.c stream/audio_in.c
163158
SRCS_COMMON-$(VCD) += stream/stream_vcd.c
164-
SRCS_COMMON-$(VORBIS) += libmpcodecs/ad_libvorbis.c \
165-
libmpdemux/demux_ogg.c
166159
SRCS_COMMON-$(VSTREAM) += stream/stream_vstream.c
167160
SRCS_QTX_EMULATION += loader/wrapper.S
168161
SRCS_COMMON-$(QTX_EMULATION) += $(SRCS_QTX_EMULATION)
@@ -181,7 +174,6 @@ SRCS_COMMON-$(WIN32_EMULATION) += $(SRCS_WIN32_EMULATION)
181174
SRCS_COMMON-$(WIN32DLL) += libmpcodecs/ad_acm.c \
182175
libmpcodecs/ad_dmo.c \
183176
libmpcodecs/ad_dshow.c \
184-
libmpcodecs/ad_twin.c \
185177
libmpcodecs/vd_dmo.c \
186178
libmpcodecs/vd_dshow.c \
187179
libmpcodecs/vd_vfw.c \
@@ -207,7 +199,6 @@ SRCS_COMMON-$(WIN32DLL) += libmpcodecs/ad_acm.c \
207199
loader/dmo/dmo_guids.c \
208200

209201
SRCS_COMMON-$(XANIM_CODECS) += libmpcodecs/vd_xanim.c
210-
SRCS_COMMON-$(XVID4) += libmpcodecs/vd_xvid4.c
211202

212203
SRCS_COMMON-$(DUMMY_OSD) += sub/osd_dummy.c
213204
SRCS_COMMON-$(LIBASS_OSD) += sub/osd_libass.c
@@ -262,7 +253,6 @@ SRCS_COMMON = asxparser.c \
262253
libaf/window.c \
263254
libmpcodecs/ad.c \
264255
libmpcodecs/ad_alaw.c \
265-
libmpcodecs/ad_dk3adpcm.c \
266256
libmpcodecs/ad_dvdpcm.c \
267257
libmpcodecs/ad_ffmpeg.c \
268258
libmpcodecs/ad_hwac3.c \
@@ -280,11 +270,9 @@ SRCS_COMMON = asxparser.c \
280270
libmpcodecs/vd_ffmpeg.c \
281271
libmpcodecs/vd_hmblck.c \
282272
libmpcodecs/vd_lzo.c \
283-
libmpcodecs/vd_mpegpes.c \
284273
libmpcodecs/vd_mtga.c \
285274
libmpcodecs/vd_null.c \
286275
libmpcodecs/vd_raw.c \
287-
libmpcodecs/vd_sgi.c \
288276
libmpcodecs/vf.c \
289277
libmpcodecs/vf_1bpp.c \
290278
libmpcodecs/vf_2xsai.c \
@@ -357,48 +345,30 @@ SRCS_COMMON = asxparser.c \
357345
libmpcodecs/vf_yadif.c \
358346
libmpcodecs/vf_yuvcsp.c \
359347
libmpcodecs/vf_yvu9.c \
360-
libmpdemux/aac_hdr.c \
361348
libmpdemux/asfheader.c \
362349
libmpdemux/aviheader.c \
363350
libmpdemux/aviprint.c \
364351
libmpdemux/demuxer.c \
365-
libmpdemux/demux_aac.c \
366352
libmpdemux/demux_asf.c \
367353
libmpdemux/demux_audio.c \
368354
libmpdemux/demux_avi.c \
369355
libmpdemux/demux_demuxers.c \
370356
libmpdemux/demux_edl.c \
371357
libmpdemux/demux_cue.c \
372-
libmpdemux/demux_film.c \
373-
libmpdemux/demux_fli.c \
374358
libmpdemux/demux_lavf.c \
375-
libmpdemux/demux_lmlm4.c \
376359
libmpdemux/demux_mf.c \
377360
libmpdemux/demux_mkv.c \
378-
libmpdemux/demux_mov.c \
379-
libmpdemux/demux_mpg.c \
380-
libmpdemux/demux_nsv.c \
381-
libmpdemux/demux_pva.c \
382361
libmpdemux/demux_rawaudio.c \
383362
libmpdemux/demux_rawvideo.c \
384363
libmpdemux/demux_realaud.c \
385364
libmpdemux/demux_real.c \
386-
libmpdemux/demux_roq.c \
387-
libmpdemux/demux_smjpeg.c \
388-
libmpdemux/demux_ts.c \
389-
libmpdemux/demux_ty.c \
390365
libmpdemux/demux_viv.c \
391-
libmpdemux/demux_vqf.c \
392-
libmpdemux/demux_y4m.c \
393366
libmpdemux/ebml.c \
394367
libmpdemux/extension.c \
395368
libmpdemux/mf.c \
396369
libmpdemux/mp3_hdr.c \
397370
libmpdemux/mp_taglists.c \
398-
libmpdemux/mpeg_hdr.c \
399371
libmpdemux/mpeg_packetizer.c \
400-
libmpdemux/parse_es.c \
401-
libmpdemux/parse_mp4.c \
402372
libmpdemux/video.c \
403373
libmpdemux/yuv4mpeg.c \
404374
libmpdemux/yuv4mpeg_ratio.c \

‎cfg-mplayer.h‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#include "config.h"
3131
#include "m_config.h"
3232
#include "m_option.h"
33-
#include "libmpdemux/demux_ts.h"
3433
#include "stream/tv.h"
3534
#include "stream/stream_radio.h"
3635
#include "libvo/csputils.h"
@@ -77,12 +76,6 @@ extern const m_option_t demux_rawaudio_opts[];
7776
extern const m_option_t demux_rawvideo_opts[];
7877
extern const m_option_t cdda_opts[];
7978

80-
extern int ts_prog;
81-
extern int ts_keep_broken;
82-
extern off_t ts_probe;
83-
extern int audio_substream_id;
84-
extern off_t ps_probe;
85-
8679
extern int sws_flags;
8780
extern const char pp_help[];
8881

@@ -465,7 +458,6 @@ const m_option_t common_opts[] = {
465458

466459
// select audio/video/subtitle stream
467460
OPT_INTRANGE("aid", audio_id, 0, -2, 8190),
468-
{"ausid", &audio_substream_id, CONF_TYPE_INT, 0, 0, 0, NULL},
469461
OPT_INTRANGE("vid", video_id, 0, -2, 8190),
470462
OPT_INTRANGE("sid", sub_id, 0, -2, 8190),
471463
OPT_FLAG_CONSTANTS("no-sub", sub_id, 0, -1, -2),
@@ -566,10 +558,6 @@ const m_option_t common_opts[] = {
566558

567559
OPT_FLAG_CONSTANTS("flip", flip, 0, -1, 1),
568560
OPT_FLAG_CONSTANTS("no-flip", flip, 0, -1, 0),
569-
{"tsprog", &ts_prog, CONF_TYPE_INT, CONF_RANGE, 0, 65534, NULL},
570-
{"tsprobe", &ts_probe, CONF_TYPE_POSITION, 0, 0, TS_MAX_PROBE_SIZE, NULL},
571-
{"psprobe", &ps_probe, CONF_TYPE_POSITION, 0, 0, TS_MAX_PROBE_SIZE, NULL},
572-
{"tskeepbroken", &ts_keep_broken, CONF_TYPE_FLAG, 0, 0, 1, NULL},
573561

574562
// draw by slices or whole frame (useful with libmpeg2/libavcodec)
575563
OPT_MAKE_FLAGS("slices", vd_use_slices, 0),

‎command.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1610,8 +1610,7 @@ static int mp_property_sub(m_option_t *prop, int action, void *arg,
16101610

16111611
if ((d_sub->demuxer->type == DEMUXER_TYPE_MATROSKA
16121612
|| d_sub->demuxer->type == DEMUXER_TYPE_LAVF
1613-
|| d_sub->demuxer->type == DEMUXER_TYPE_LAVF_PREFERRED
1614-
|| d_sub->demuxer->type == DEMUXER_TYPE_OGG)
1613+
|| d_sub->demuxer->type == DEMUXER_TYPE_LAVF_PREFERRED)
16151614
&& d_sub->sh && opts->sub_id >= 0) {
16161615
struct sh_sub *sh = d_sub->sh;
16171616
char *lang = sh->lang ? sh->lang : mp_gtext("unknown");

0 commit comments

Comments
 (0)