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

stream: minor adjustment to buffer size limit logic 

Instead of having 2 inconsistent limits on the upper possible buffer
size (option limit and allocation code), use a shared constant for them.
This commit is contained in:
wm4 2020-04-10 10:54:02 +02:00
parent 217c47ecb2
commit 8e74b08538
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
stream/stream.c
View File

@ -96,6 +96,9 @@ static const stream_info_t *const stream_list[] = {
// Because of guarantees documented on STREAM_BUFFER_SIZE.
// Half the buffer is used as forward buffer, the other for seek-back.
#define STREAM_MIN_BUFFER_SIZE (STREAM_BUFFER_SIZE * 2)
// Sort of arbitrary; keep *2 of it comfortably within integer limits.
// Must be power of 2.
#define STREAM_MAX_BUFFER_SIZE (512 * 1024 * 1024)
struct stream_opts {
int64_t buffer_size;
@ -107,7 +110,7 @@ struct stream_opts {
const struct m_sub_options stream_conf = {
.opts = (const struct m_option[]){
{"stream-buffer-size", OPT_BYTE_SIZE(buffer_size),
M_RANGE(STREAM_MIN_BUFFER_SIZE, 512 * 1024 * 1024)},
M_RANGE(STREAM_MIN_BUFFER_SIZE, STREAM_MAX_BUFFER_SIZE)},
{"load-unsafe-playlists", OPT_FLAG(load_unsafe_playlists)},
{0}
},
@ -269,14 +272,11 @@ static bool stream_resize_buffer(struct stream *s, uint32_t new)
int old_pos = s->buf_cur - s->buf_start;
new = MPMAX(new, old_used_len);
// This much is always required.
new = MPMAX(new, s->requested_buffer_size);
// This much is always required.
new = MPMAX(new, STREAM_MIN_BUFFER_SIZE);
new = MPMIN(new, STREAM_MAX_BUFFER_SIZE);
new = mp_round_next_power_of_2(new);
if (!new || new > INT_MAX / 8)
return false;
if (new == s->buffer_mask + 1)
return true;