From 222a5cf7c0a4de094f368f7154122a72312dbf39 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 8 Dec 2012 20:14:13 +0100 Subject: demux_lavf: make minimum probe score customizable, remove lavf_preferred libavformat wants to read a full ~400KB of data to determine whether it's really AAC. This causes slow startup with AAC web radio streams [1] (possible due to a broken initial packet). There are similar issues with other file formats. Make the probe "score" (libavformat's mechanism for testing file formats) configurable with the -lavfdtops:probescore option. This allows lowering the amount of data read on probing. If the probe score is below the probescore option value, demux_lavf will try to get a higher score by feeding more data to libavformat, until the required score or the max. probe size is reached. Remove the lavf_preferred demuxer entry. This had a purpose in mplayer-svn, but now there doesn't seem to be any good reason for it to exist. Make sure that our native "good" demuxers are above demux_lavf in demuxer_list[] instead (so that they are preferred). [1] http://lr2mp0.latvijasradio.lv:8000 --- demux/demux.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'demux/demux.c') diff --git a/demux/demux.c b/demux/demux.c index 41b74b20c4..23b01b22f4 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -57,7 +57,6 @@ extern const demuxer_desc_t demuxer_desc_avi; extern const demuxer_desc_t demuxer_desc_asf; extern const demuxer_desc_t demuxer_desc_matroska; extern const demuxer_desc_t demuxer_desc_lavf; -extern const demuxer_desc_t demuxer_desc_lavf_preferred; extern const demuxer_desc_t demuxer_desc_mng; extern const demuxer_desc_t demuxer_desc_mpeg_ps; extern const demuxer_desc_t demuxer_desc_mpeg_pes; @@ -79,11 +78,10 @@ const demuxer_desc_t *const demuxer_list[] = { #ifdef CONFIG_TV &demuxer_desc_tv, #endif - &demuxer_desc_lavf_preferred, - &demuxer_desc_avi, - &demuxer_desc_asf, &demuxer_desc_matroska, &demuxer_desc_lavf, + &demuxer_desc_avi, + &demuxer_desc_asf, #ifdef CONFIG_MNG &demuxer_desc_mng, #endif @@ -920,6 +918,7 @@ static struct demuxer *open_given_type(struct MPOpts *opts, { struct demuxer *demuxer; int fformat; + mp_msg(MSGT_DEMUXER, MSGL_V, "Trying demuxer: %s\n", desc->name); demuxer = new_demuxer(opts, stream, desc->type, audio_id, video_id, sub_id, filename); demuxer->params = params; -- cgit v1.2.3