diff options
author | wm4 <wm4@nowhere> | 2014-08-27 01:13:20 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-08-27 03:39:04 +0200 |
commit | 0b428e44829abc4387f051e3c618c1c878b3a838 (patch) | |
tree | 994e0580c831642fde1f2ff6918814404c61deae /options/options.h | |
parent | a8513f8b37343c27a4abea380ae0aa6bbae3894c (diff) | |
download | mpv-0b428e44829abc4387f051e3c618c1c878b3a838.tar.bz2 mpv-0b428e44829abc4387f051e3c618c1c878b3a838.tar.xz |
player: redo how stream caching and pausing on low cache works
Add the --cache-secs option, which literally overrides the value of
--demuxer-readahead-secs if the stream cache is active. The default
value is very high (10 seconds), which means it can act as network
cache.
Remove the old behavior of trying to pause once the byte cache runs
low. Instead, do something similar wit the demuxer cache. The nice
thing is that we can guess how many seconds of video it has cached,
and we can make better decisions. But for now, apply a relatively
naive heuristic: if the cache is below 0.5 secs, pause, and wait
until at least 2 secs are available.
Note that due to timestamp reordering, the estimated cached duration
of video might be inaccurate, depending on the file format. If the
file format has DTS, it's easy, otherwise the duration will seemingly
jump back and forth.
Diffstat (limited to 'options/options.h')
-rw-r--r-- | options/options.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/options/options.h b/options/options.h index e5436383ad..4468d2abbd 100644 --- a/options/options.h +++ b/options/options.h @@ -123,8 +123,6 @@ typedef struct MPOpts { int use_filedir_conf; int network_rtsp_transport; struct mp_cache_opts stream_cache; - int stream_cache_pause; - int stream_cache_unpause; int chapterrange[2]; int edition_id; int correct_pts; @@ -189,6 +187,9 @@ typedef struct MPOpts { char *sub_demuxer_name; int mkv_subtitle_preroll; + double demuxer_min_secs_cache; + int cache_pausing; + struct image_writer_opts *screenshot_image_opts; char *screenshot_template; |