summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DOCS/interface-changes.rst1
-rw-r--r--DOCS/man/options.rst15
-rw-r--r--demux/demux.c6
-rw-r--r--options/options.c4
-rw-r--r--options/options.h2
5 files changed, 1 insertions, 27 deletions
diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst
index f61ee7befe..9eb3de3048 100644
--- a/DOCS/interface-changes.rst
+++ b/DOCS/interface-changes.rst
@@ -20,6 +20,7 @@ Interface changes
::
--- mpv 0.10.0 will be released ---
+ - remove --demuxer-readahead-packets and --demuxer-readahead-bytes
- change "video-aspect" property: always settable, even if no video is
running; always return the override - if no override is set, return
the video's aspect ratio
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index 9ad67c6492..f86e489db1 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -2247,21 +2247,6 @@ Demuxer
(This value tends to be fuzzy, because many file formats don't store linear
timestamps.)
-``--demuxer-readahead-packets=<packets>``
- If ``--demuxer-thread`` is enabled, this controls how much the demuxer
- should buffer ahead. As long as the number of packets in the packet queue
- doesn't exceed ``--demuxer-readahead-packets``, and the total number of
- bytes doesn't exceed ``--demuxer-readahead-bytes``, the thread keeps
- reading ahead.
-
- Note that if you set these options near the maximum, you might get a
- packet queue overflow warning.
-
- See ``--list-options`` for defaults and value range.
-
-``--demuxer-readahead-bytes=<bytes>``
- See ``--demuxer-readahead-packets``.
-
``--force-seekable=<yes|no>``
If the player thinks that the media is not seekable (e.g. playing from a
pipe, or it's a http stream with a server that doesn't support range
diff --git a/demux/demux.c b/demux/demux.c
index ba2678466f..55dfd259da 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -112,8 +112,6 @@ struct demux_internal {
bool idle;
bool autoselect;
double min_secs;
- int min_packs;
- int min_bytes;
bool tracks_switched; // thread needs to inform demuxer of this
@@ -412,8 +410,6 @@ static bool read_packet(struct demux_internal *in)
pthread_cond_signal(&in->wakeup);
return false;
}
- if (packs < in->min_packs && bytes < in->min_bytes)
- read_more |= active;
if (!read_more)
return false;
@@ -961,8 +957,6 @@ static struct demuxer *open_given_type(struct mpv_global *global,
.d_buffer = talloc(demuxer, struct demuxer),
.d_user = demuxer,
.min_secs = demuxer->opts->demuxer_min_secs,
- .min_packs = demuxer->opts->demuxer_min_packs,
- .min_bytes = demuxer->opts->demuxer_min_bytes,
};
pthread_mutex_init(&in->lock, NULL);
pthread_cond_init(&in->wakeup, NULL);
diff --git a/options/options.c b/options/options.c
index bb19a44688..93f7b4a45e 100644
--- a/options/options.c
+++ b/options/options.c
@@ -242,8 +242,6 @@ const m_option_t mp_opts[] = {
OPT_STRING("sub-demuxer", sub_demuxer_name, 0),
OPT_FLAG("demuxer-thread", demuxer_thread, 0),
OPT_DOUBLE("demuxer-readahead-secs", demuxer_min_secs, M_OPT_MIN, .min = 0),
- 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_FLAG("force-seekable", force_seekable, 0),
@@ -721,8 +719,6 @@ const struct MPOpts mp_default_opts = {
.file_max = 1024 * 1024,
},
.demuxer_thread = 1,
- .demuxer_min_packs = 0,
- .demuxer_min_bytes = 0,
.demuxer_min_secs = 1.0,
.network_rtsp_transport = 2,
.network_timeout = 0.0,
diff --git a/options/options.h b/options/options.h
index 3dcb783164..677b23f92e 100644
--- a/options/options.h
+++ b/options/options.h
@@ -196,8 +196,6 @@ typedef struct MPOpts {
char **audio_files;
char *demuxer_name;
int demuxer_thread;
- int demuxer_min_packs;
- int demuxer_min_bytes;
double demuxer_min_secs;
char *audio_demuxer_name;
char *sub_demuxer_name;