diff options
Diffstat (limited to 'options')
-rw-r--r-- | options/m_config.c | 2 | ||||
-rw-r--r-- | options/options.c | 10 | ||||
-rw-r--r-- | options/options.h | 5 |
3 files changed, 10 insertions, 7 deletions
diff --git a/options/m_config.c b/options/m_config.c index d8a5cceccb..479c2e952b 100644 --- a/options/m_config.c +++ b/options/m_config.c @@ -974,5 +974,7 @@ static const char *const replaced_opts = "|status-msg#--term-status-msg" "|idx#--index" "|forceidx#--index" + "|cache-pause-below#for 'no', use --no-cache-pause" + "|no-cache-pause-below#--no-cache-pause" "|" ; diff --git a/options/options.c b/options/options.c index 2ff524f522..a77568858d 100644 --- a/options/options.c +++ b/options/options.c @@ -144,9 +144,6 @@ const m_option_t mp_opts[] = { OPT_INTRANGE("cache-seek-min", stream_cache.seek_min, 0, 0, 0x7fffffff), OPT_STRING("cache-file", stream_cache.file, 0), OPT_INTRANGE("cache-file-size", stream_cache.file_max, 0, 0, 0x7fffffff), - OPT_CHOICE_OR_INT("cache-pause-below", stream_cache_pause, 0, 0, 0x7fffffff, - ({"no", 0})), - OPT_INTRANGE("cache-pause-restart", stream_cache_unpause, 0, 0, 0x7fffffff), #if HAVE_DVDREAD || HAVE_DVDNAV OPT_STRING("dvd-device", dvd_device, 0), @@ -220,6 +217,9 @@ const m_option_t mp_opts[] = { OPT_INTRANGE("demuxer-readahead-packets", demuxer_min_packs, 0, 0, MAX_PACKS), OPT_INTRANGE("demuxer-readahead-bytes", demuxer_min_bytes, 0, 0, MAX_PACK_BYTES), + OPT_DOUBLE("cache-secs", demuxer_min_secs_cache, M_OPT_MIN, .min = 0), + OPT_FLAG("cache-pause", cache_pausing, 0), + OPT_DOUBLE("mf-fps", mf_fps, 0), OPT_STRING("mf-type", mf_type, 0), #if HAVE_TV @@ -598,13 +598,13 @@ const struct MPOpts mp_default_opts = { .seek_min = 500, .file_max = 1024 * 1024, }, - .stream_cache_pause = 50, - .stream_cache_unpause = 100, .demuxer_thread = 1, .demuxer_min_packs = 0, .demuxer_min_bytes = 0, .demuxer_min_secs = 0.2, .network_rtsp_transport = 2, + .demuxer_min_secs_cache = 10, + .cache_pausing = 1, .chapterrange = {-1, -1}, .edition_id = -1, .default_max_pts_correction = -1, 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; |