RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-26 00:42:57 +00:00
Code Issues Releases Wiki Activity

demux: allow cache sizes > 2GB

Browse Source 
There was no reason to limit this. Only some int fields had to be
changed to size_t.
This commit is contained in:
wm4 2018-08-24 12:56:41 +02:00
parent 9467e90c5b
commit 120dcdf5cc
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
demux/demux.c
View File

@ -98,11 +98,15 @@ struct demux_opts {
#define OPT_BASE_STRUCT struct demux_opts #define OPT_BASE_STRUCT struct demux_opts
#define MAX_BYTES MPMIN(INT64_MAX, (size_t)-1 / 2)
const struct m_sub_options demux_conf = { const struct m_sub_options demux_conf = {
.opts = (const struct m_option[]){ .opts = (const struct m_option[]){
OPT_DOUBLE("demuxer-readahead-secs", min_secs, M_OPT_MIN, .min = 0), OPT_DOUBLE("demuxer-readahead-secs", min_secs, M_OPT_MIN, .min = 0),
OPT_BYTE_SIZE("demuxer-max-bytes", max_bytes, 0, 0, INT_MAX), // (The MAX_BYTES sizes may not be accurate because the max field is
OPT_BYTE_SIZE("demuxer-max-back-bytes", max_bytes_bw, 0, 0, INT_MAX), // of double type.)
OPT_BYTE_SIZE("demuxer-max-bytes", max_bytes, 0, 0, MAX_BYTES),
OPT_BYTE_SIZE("demuxer-max-back-bytes", max_bytes_bw, 0, 0, MAX_BYTES),
OPT_FLAG("force-seekable", force_seekable, 0), OPT_FLAG("force-seekable", force_seekable, 0),
OPT_DOUBLE("cache-secs", min_secs_cache, M_OPT_MIN, .min = 0), OPT_DOUBLE("cache-secs", min_secs_cache, M_OPT_MIN, .min = 0),
OPT_FLAG("access-references", access_references, 0), OPT_FLAG("access-references", access_references, 0),
@ -164,8 +168,8 @@ struct demux_internal {
bool idle; bool idle;
bool autoselect; bool autoselect;
double min_secs; double min_secs;
int max_bytes; size_t max_bytes;
int max_bytes_bw; size_t max_bytes_bw;
bool seekable_cache; bool seekable_cache;
// At least one decoder actually requested data since init or the last seek. // At least one decoder actually requested data since init or the last seek.