diff options
author | wm4 <wm4@nowhere> | 2013-05-24 18:49:09 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-06-16 22:05:09 +0200 |
commit | 7c4202b863752e5903c76231420d9b391a0961e1 (patch) | |
tree | 4d3764b375bed6c60685b3bbd9a1fdeee5d40dcb /core/mplayer.c | |
parent | 27b633671f01a0f97518459717d273f45358bfb0 (diff) | |
download | mpv-7c4202b863752e5903c76231420d9b391a0961e1.tar.bz2 mpv-7c4202b863752e5903c76231420d9b391a0961e1.tar.xz |
cache: make the stream cache a proper stream that wraps other streams
Before this commit, the cache was franken-hacked on top of the stream
API. You had to use special functions (like cache_stream_fill_buffer()
instead of stream_fill_buffer()), which would access the stream in a
cached manner.
The whole idea about the previous design was that the cache runs in a
thread or in a forked process, while the cache awa functions made sure
the stream instance looked consistent to the user. If you used the
normal functions instead of the special ones while the cache was
running, you were out of luck.
Make it a bit more reasonable by turning the cache into a stream on its
own. This makes it behave exactly like a normal stream. The stream
callbacks call into the original (uncached) stream to do work. No
special cache functions or redirections are needed. The only different
thing about cache streams is that they are created by special functions,
instead of being part of the auto_open_streams[] array.
To make things simpler, remove the threading implementation, which was
messed into the code. The threading code could perhaps be kept, but I
don't really want to have to worry about this special case. A proper
threaded implementation will be added later.
Remove the cache enabling code from stream_radio.c. Since enabling the
cache involves replacing the old stream with a new one, the code as-is
can't be kept. It would be easily possible to enable the cache by
requesting a cache size (which is also much simpler). But nobody uses
stream_radio.c and I can't even test this thing, and the cache is
probably not really important for it either.
Diffstat (limited to 'core/mplayer.c')
-rw-r--r-- | core/mplayer.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/core/mplayer.c b/core/mplayer.c index 310559958a..7080c5a02e 100644 --- a/core/mplayer.c +++ b/core/mplayer.c @@ -108,7 +108,6 @@ #ifdef CONFIG_DVBIN #include "stream/dvbin.h" #endif -#include "stream/cache2.h" //**************************************************************************// // Playtree @@ -934,13 +933,13 @@ static int find_new_tid(struct MPContext *mpctx, enum stream_type t) // Map stream number (as used by libdvdread) to MPEG IDs (as used by demuxer). static int map_id_from_demuxer(struct demuxer *d, enum stream_type type, int id) { - if (d->stream->type == STREAMTYPE_DVD && type == STREAM_SUB) + if (d->stream->uncached_type == STREAMTYPE_DVD && type == STREAM_SUB) id = id & 0x1F; return id; } static int map_id_to_demuxer(struct demuxer *d, enum stream_type type, int id) { - if (d->stream->type == STREAMTYPE_DVD && type == STREAM_SUB) + if (d->stream->uncached_type == STREAMTYPE_DVD && type == STREAM_SUB) id = id | 0x20; return id; } @@ -3918,7 +3917,7 @@ static struct track *open_external_file(struct MPContext *mpctx, char *filename, struct stream *stream = open_stream(filename, &mpctx->opts, &format); if (!stream) goto err_out; - stream_enable_cache_percent(stream, stream_cache, + stream_enable_cache_percent(&stream, stream_cache, opts->stream_cache_min_percent, opts->stream_cache_seek_min_percent); // deal with broken demuxers: preselect streams @@ -4203,10 +4202,7 @@ static void play_current_file(struct MPContext *mpctx) } // CACHE2: initial prefill: 20% later: 5% (should be set by -cacheopts) -#ifdef CONFIG_DVBIN -goto_enable_cache: ; -#endif - int res = stream_enable_cache_percent(mpctx->stream, + int res = stream_enable_cache_percent(&mpctx->stream, opts->stream_cache_size, opts->stream_cache_min_percent, opts->stream_cache_seek_min_percent); @@ -4216,6 +4212,10 @@ goto_enable_cache: ; stream_set_capture_file(mpctx->stream, opts->stream_capture); +#ifdef CONFIG_DVBIN +goto_reopen_demuxer: ; +#endif + //============ Open DEMUXERS --- DETECT file type ======================= mpctx->audio_delay = opts->audio_delay; @@ -4402,9 +4402,8 @@ goto_enable_cache: ; if (mpctx->dvbin_reopen) { mpctx->stop_play = 0; uninit_player(mpctx, INITIALIZED_ALL - (INITIALIZED_STREAM | INITIALIZED_GETCH2 | (opts->fixed_vo ? INITIALIZED_VO : 0))); - cache_uninit(mpctx->stream); mpctx->dvbin_reopen = 0; - goto goto_enable_cache; + goto goto_reopen_demuxer; } #endif |