Attachment #35984 for bug #55936

Lines 10-17 Link Here

(-)MPlayer-1.0pre4.orig/cfg-common.h (-1 / +3 lines)
10	// ------------------------- stream options --------------------	10	// ------------------------- stream options --------------------
11		11
12	#ifdef USE_STREAM_CACHE	12	#ifdef USE_STREAM_CACHE
13	{"cache", &stream_cache_size, CONF_TYPE_INT, CONF_RANGE, 4, 65536, NULL},	13	{"cache", &stream_cache_size, CONF_TYPE_INT, CONF_RANGE, 32, 262144, NULL},
14	{"nocache", &stream_cache_size, CONF_TYPE_FLAG, 0, 1, 0, NULL},	14	{"nocache", &stream_cache_size, CONF_TYPE_FLAG, 0, 1, 0, NULL},
		15	{"cache-min", &stream_cache_min_percent, CONF_TYPE_FLOAT, CONF_RANGE, 0, 99, NULL},
		16	{"cache-prefill", &stream_cache_prefill_percent, CONF_TYPE_FLOAT, CONF_RANGE, 0, 99, NULL},
15	#else	17	#else
16	{"cache", "MPlayer was compiled WITHOUT cache2 support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},	18	{"cache", "MPlayer was compiled WITHOUT cache2 support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
17	#endif	19	#endif

Lines 116-121 Link Here

(-)MPlayer-1.0pre4.orig/etc/example.conf (+2 lines)
116	# etc)	116	# etc)
117		117
118	cache = 8192 # use 8Mb input cache by default	118	cache = 8192 # use 8Mb input cache by default
		119	cache_min = 20.0 # Prefill 20% of the cache before initially playing
		120	cache_prefill = 5.0 # Prefill 5% of the cache before restarting playback if it empties
119		121
120	# slang = en # DVD : display english subtitles if available	122	# slang = en # DVD : display english subtitles if available
121	# alang = en # DVD : play english audio tracks if available	123	# alang = en # DVD : play english audio tracks if available

Lines 33-38 Link Here

(-)MPlayer-1.0pre4.orig/libmpdemux/cache2.c (-2 / +23 lines)
33	int stream_fill_buffer(stream_t *s);	33	int stream_fill_buffer(stream_t *s);
34	int stream_seek_long(stream_t *s,off_t pos);	34	int stream_seek_long(stream_t *s,off_t pos);
35		35
		36	extern float stream_cache_min_percent;
		37	extern float stream_cache_prefill_percent;
36	extern int mp_input_check_interrupt(int time);	38	extern int mp_input_check_interrupt(int time);
37		39
38	typedef struct {	40	typedef struct {
Lines 207-213 Link Here
207	#endif	209	#endif
208	s->fill_limit=8*sector;	210	s->fill_limit=8*sector;
209	s->back_size=size/2;	211	s->back_size=size/2;
210	s->prefill=size/20; // default: 5%	212	s->prefill=size * stream_cache_prefill_percent / 100.0;
211	return s;	213	return s;
212	}	214	}
213		215
Lines 265-271 Link Here
265	// wait until cache is filled at least prefill_init %	267	// wait until cache is filled at least prefill_init %
266	mp_msg(MSGT_CACHE,MSGL_V,"CACHE_PRE_INIT: %d [%d] %d pre:%d eof:%d \n",	268	mp_msg(MSGT_CACHE,MSGL_V,"CACHE_PRE_INIT: %d [%d] %d pre:%d eof:%d \n",
267	s->min_filepos,s->read_filepos,s->max_filepos,min,s->eof);	269	s->min_filepos,s->read_filepos,s->max_filepos,min,s->eof);
268	while(s->read_filepos<s->min_filepos \|\| s->max_filepos-s->read_filepos<min){	270
		271	// The buffer is determined to be full in cache_fill() when this condition is true:
		272	// s->buffer_size - (s->max_filepos - s->read_filepos) < s->fill_limit
		273	// So we need to make sure that min does not go over s->buffer_size - s->fill_limit
		274	// ie this needs to be always be true:
		275	// s->buffer_size - (data_in_buffer) >= s->fill_limit
		276	// ==> data_in_buffer <= s->buffer_size - s->fill_limit
		277	//
		278	// So we need to make sure that our min is safe with this condition or else we
		279	// will wait forever for cache_fill() to get to min.
		280	if (min > s->buffer_size - s->fill_limit) {
		281	min = s->buffer_size - s->fill_limit;
		282	}
		283
		284	// Keep waiting for the buffer to fill while:
		285	// We still want to read more: (s->max_filepos - s->read_filepos < min) \|\| (s->read_filepos < s->min_filepos)
		286	// There is data to read in the file: (!s->eof)
		287	while( (s->max_filepos - s->read_filepos < min) \|\|
		288	(s->read_filepos < s->min_filepos)) {
		289
269	mp_msg(MSGT_CACHE,MSGL_STATUS,"\rCache fill: %5.2f%% (%d bytes) ",	290	mp_msg(MSGT_CACHE,MSGL_STATUS,"\rCache fill: %5.2f%% (%d bytes) ",
270	100.0*(float)(s->max_filepos-s->read_filepos)/(float)(s->buffer_size),	291	100.0*(float)(s->max_filepos-s->read_filepos)/(float)(s->buffer_size),
271	s->max_filepos-s->read_filepos	292	s->max_filepos-s->read_filepos

Lines 1374-1379 Link Here

(-)MPlayer-1.0pre4.orig/libmpdemux/demuxer.c (-2 / +5 lines)
1374		1374
1375	extern int hr_mp3_seek;	1375	extern int hr_mp3_seek;
1376		1376
		1377	extern float stream_cache_min_percent;
		1378	extern float stream_cache_prefill_percent;
		1379
1377	demuxer_t* demux_open(stream_t vs,int file_format,int audio_id,int video_id,int dvdsub_id,char filename){	1380	demuxer_t* demux_open(stream_t vs,int file_format,int audio_id,int video_id,int dvdsub_id,char filename){
1378	stream_t as = NULL,ss = NULL;	1381	stream_t as = NULL,ss = NULL;
1379	demuxer_t vd,ad = NULL,*sd = NULL;	1382	demuxer_t vd,ad = NULL,*sd = NULL;
Lines 1386-1393 Link Here
1386	return NULL;	1389	return NULL;
1387	}	1390	}
1388	if(audio_stream_cache) {	1391	if(audio_stream_cache) {
1389	if(!stream_enable_cache(as,audio_stream_cache1024,audio_stream_cache1024/5,	1392	if(!stream_enable_cache(as,audio_stream_cache1024,audio_stream_cache1024*(stream_cache_min_percent / 100.0),
1390	audio_stream_cache*1024/20)) {	1393	audio_stream_cache1024(stream_cache_prefill_percent / 100.0))) {
1391	free_stream(as);	1394	free_stream(as);
1392	mp_msg(MSGT_DEMUXER,MSGL_ERR,"Can't enable audio stream cache\n");	1395	mp_msg(MSGT_DEMUXER,MSGL_ERR,"Can't enable audio stream cache\n");
1393	return NULL;	1396	return NULL;

Lines 100-105 Link Here

(-)MPlayer-1.0pre4.orig/mencoder.c (+3 lines)
100	int stream_cache_size=-1;	100	int stream_cache_size=-1;
101	#ifdef USE_STREAM_CACHE	101	#ifdef USE_STREAM_CACHE
102	extern int cache_fill_status;	102	extern int cache_fill_status;
		103
		104	float stream_cache_min_percent=20.0;
		105	float stream_cache_prefill_percent=5.0;
103	#else	106	#else
104	#define cache_fill_status 0	107	#define cache_fill_status 0
105	#endif	108	#endif

Lines 249-254 Link Here

(-)MPlayer-1.0pre4.orig/mplayer.c (-1 / +4 lines)
249	int stream_cache_size=-1;	249	int stream_cache_size=-1;
250	#ifdef USE_STREAM_CACHE	250	#ifdef USE_STREAM_CACHE
251	extern int cache_fill_status;	251	extern int cache_fill_status;
		252
		253	float stream_cache_min_percent=20.0;
		254	float stream_cache_prefill_percent=5.0;
252	#else	255	#else
253	#define cache_fill_status 0	256	#define cache_fill_status 0
254	#endif	257	#endif
Lines 1368-1374 Link Here
1368	#endif	1371	#endif
1369	if(stream_cache_size>0){	1372	if(stream_cache_size>0){
1370	current_module="enable_cache";	1373	current_module="enable_cache";
1371	if(!stream_enable_cache(stream,stream_cache_size1024,stream_cache_size1024/5,stream_cache_size*1024/20))	1374	if(!stream_enable_cache(stream,stream_cache_size1024,stream_cache_size1024(stream_cache_min_percent / 100.0),stream_cache_size1024*(stream_cache_prefill_percent / 100.0)))
1372	if((eof = libmpdemux_was_interrupted(PT_NEXT_ENTRY))) goto goto_next_file;	1375	if((eof = libmpdemux_was_interrupted(PT_NEXT_ENTRY))) goto goto_next_file;
1373	}	1376	}
1374		1377

Return to bug 55936