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

ao_audiotrack: align buffer size to sample size 

This looks like a pretty bad bug but only became a problem
with the last commit that allows rates like 22.5kHz to pass through
directly instead of being resampled.
This commit is contained in:
sfan5 2023-08-06 16:18:10 +02:00
parent d9072fef2a
commit 36bea732fb
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
audio/out/ao_audiotrack.c
View File

@ -714,11 +714,17 @@ static int init(struct ao *ao)
return -1; return -1;
} }
int min = 0.075 * p->samplerate * af_fmt_to_bytes(ao->format) * ao->channels.num; // Choose double of the minimum buffer size suggested by the driver, but not
// less than 75ms or more than 150ms.
const int bps = af_fmt_to_bytes(ao->format);
int min = 0.075 * p->samplerate * bps * ao->channels.num;
int max = min * 2; int max = min * 2;
min = MP_ALIGN_UP(min, bps);
max = MP_ALIGN_UP(max, bps);
p->size = MPCLAMP(buffer_size * 2, min, max); p->size = MPCLAMP(buffer_size * 2, min, max);
MP_VERBOSE(ao, "Setting bufferSize = %d (driver=%d, min=%d, max=%d)\n", p->size, buffer_size, min, max); MP_VERBOSE(ao, "Setting bufferSize = %d (driver=%d, min=%d, max=%d)\n", p->size, buffer_size, min, max);
ao->device_buffer = p->size / af_fmt_to_bytes(ao->format); assert(p->size % bps == 0);
ao->device_buffer = p->size / bps;
p->chunksize = p->size; p->chunksize = p->size;
p->chunk = talloc_size(ao, p->size); p->chunk = talloc_size(ao, p->size);