github
/
mpv
mirror of https://github.com/mpv-player/mpv
1
Fork 0
Code Releases Activity

demux: allow cache sizes > 2GB 

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 committed by sfan5
parent 20d381d1e9
commit 36e7ef96fc
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
demux/demux.c
View File

@ -22,6 +22,7 @@
#include <unistd.h>
#include <limits.h>
#include <pthread.h>
#include <stdint.h>
#include <math.h>
@ -97,11 +98,15 @@ struct demux_opts {
#define OPT_BASE_STRUCT struct demux_opts
#define MAX_BYTES MPMIN(INT64_MAX, SIZE_MAX / 2)
const struct m_sub_options demux_conf = {
.opts = (const struct m_option[]){
OPT_DOUBLE("demuxer-readahead-secs", min_secs, M_OPT_MIN, .min = 0),
OPT_BYTE_SIZE("demuxer-max-bytes", max_bytes, 0, 0, INT_MAX),
OPT_BYTE_SIZE("demuxer-max-back-bytes", max_bytes_bw, 0, 0, INT_MAX),
// (The MAX_BYTES sizes may not be accurate because the max field is
// 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_DOUBLE("cache-secs", min_secs_cache, M_OPT_MIN, .min = 0),
OPT_FLAG("access-references", access_references, 0),
@ -160,8 +165,8 @@ struct demux_internal {
bool idle;
bool autoselect;
double min_secs;
int max_bytes;
int max_bytes_bw;
size_t max_bytes;
size_t max_bytes_bw;
bool seekable_cache;
// At least one decoder actually requested data since init or the last seek.