core, timeline: cache external ordered chapter files too

Previously, Matroska source files other than the initially opened one
were always accessed without caching. Enable cache for extra files
too. A separate cache process/thread is started for each file, which
is less than optimal but probably better than no caching if the user
explicitly enabled cache. This commit only implements caching for
Matroska ordered chapters (not for EDL timeline).

To build the timeline we need to demux the files in the current
directory to look for segments with matching uuid. This first demux is
done with no cache since we don't need to read a lot of the stream. If
the file is recognized as one of the needed sources it's reopened with
cache enabled.

Also move the stream_cache_size global variable to the options struct.

Conflicts:
	cfg-mplayer.h
	mplayer.c
	stream/stream.h
	timeline/tl_matroska.c

1 files changed, 6 insertions, 6 deletions

diff --git a/stream/network.c b/stream/network.c
index 87b295e7e6..7d45ca71d9 100644
--- a/stream/network.c
+++ b/stream/network.c
@@ -29,6 +29,7 @@
 #include <ctype.h>
 
 #include "config.h"
+#include "options.h"
 
 #include "mp_msg.h"
 
@@ -47,8 +48,6 @@
 #include "cookies.h"
 #include "url.h"
 
-extern int stream_cache_size;
-
 /* Variables for the command line option -user, -passwd, -bandwidth,
    -user-agent and -nocookies */
 
@@ -461,13 +460,14 @@ nop_streaming_seek( int fd, off_t pos, streaming_ctrl_t *stream_ctrl ) {
 
 
 void fixup_network_stream_cache(stream_t *stream) {
+  struct MPOpts *opts = stream->opts;
   if(stream->streaming_ctrl->buffering) {
-    if(stream_cache_size<0) {
+    if(opts->stream_cache_size<0) {
       // cache option not set, will use our computed value.
       // buffer in KBytes, *5 because the prefill is 20% of the buffer.
-      stream_cache_size = (stream->streaming_ctrl->prebuffer_size/1024)*5;
-      if( stream_cache_size<64 ) stream_cache_size = 64;	// 16KBytes min buffer
+      opts->stream_cache_size = (stream->streaming_ctrl->prebuffer_size/1024)*5;
+      if( opts->stream_cache_size<64 ) opts->stream_cache_size = 64;	// 16KBytes min buffer
     }
-    mp_tmsg(MSGT_NETWORK,MSGL_INFO,"Cache size set to %d KBytes\n", stream_cache_size);
+    mp_tmsg(MSGT_NETWORK,MSGL_INFO,"Cache size set to %d KBytes\n", opts->stream_cache_size);
   }
 }