Start probing with a size matching the stream buffer size so it is possible

to restart without seeking even without cache for easily detectable formats.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30946 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2010-03-22 19:38:42 +00:00
parent a1f7ee1a4b
commit b28b15db30
1 changed files with 4 additions and 2 deletions

View File

@ -43,7 +43,8 @@
#include "mp_taglists.h"
#define INITIAL_PROBE_SIZE (32*1024)
#define INITIAL_PROBE_SIZE STREAM_BUFFER_SIZE
#define SMALL_MAX_PROBE_SIZE (32 * 1024)
#define PROBE_BUF_SIZE (2*1024*1024)
extern char *audio_lang;
@ -171,7 +172,8 @@ static int lavf_check_file(demuxer_t *demuxer){
priv->avif= av_probe_input_format(&avpd, probe_data_size > 0);
read_size = FFMIN(2*read_size, PROBE_BUF_SIZE - probe_data_size);
} while (demuxer->desc->type != DEMUXER_TYPE_LAVF_PREFERRED &&
} while ((demuxer->desc->type != DEMUXER_TYPE_LAVF_PREFERRED ||
probe_data_size < SMALL_MAX_PROBE_SIZE) &&
!priv->avif && read_size > 0 && probe_data_size < PROBE_BUF_SIZE);
av_free(avpd.buf);