diff options
author | wm4 <wm4@nowhere> | 2014-09-04 23:48:27 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-09-05 01:53:10 +0200 |
commit | a7d737a6986446ba921690cc985468534ed8caab (patch) | |
tree | d0b2af92edac2f3ebc2cc25d97046c1c0dcd30f0 /audio | |
parent | 7ab228629e8184a43782606e9fb0319110c8eee8 (diff) | |
download | mpv-a7d737a6986446ba921690cc985468534ed8caab.tar.bz2 mpv-a7d737a6986446ba921690cc985468534ed8caab.tar.xz |
audio: make buffer size configurable
Really only for testing.
Diffstat (limited to 'audio')
-rw-r--r-- | audio/out/ao.c | 3 | ||||
-rw-r--r-- | audio/out/internal.h | 4 | ||||
-rw-r--r-- | audio/out/push.c | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/audio/out/ao.c b/audio/out/ao.c index 8e1ceb4bf1..f63f3fd09b 100644 --- a/audio/out/ao.c +++ b/audio/out/ao.c @@ -152,6 +152,7 @@ static struct ao *ao_create(bool probing, struct mpv_global *global, .channels = channels, .format = format, .log = mp_log_new(ao, log, name), + .def_buffer = global->opts->audio_buffer, }; if (ao->driver->encode != !!ao->encode_lavc_ctx) goto error; @@ -187,7 +188,7 @@ static struct ao *ao_create(bool probing, struct mpv_global *global, ao->device_buffer = ao->driver->get_space(ao); MP_VERBOSE(ao, "device buffer: %d samples.\n", ao->device_buffer); } - ao->buffer = MPMAX(ao->device_buffer, MIN_BUFFER * ao->samplerate); + ao->buffer = MPMAX(ao->device_buffer, ao->def_buffer * ao->samplerate); MP_VERBOSE(ao, "using soft-buffer of %d samples.\n", ao->buffer); if (ao->api->init(ao) < 0) diff --git a/audio/out/internal.h b/audio/out/internal.h index 75f5798bff..4ee7f00f8a 100644 --- a/audio/out/internal.h +++ b/audio/out/internal.h @@ -25,9 +25,6 @@ #include "audio/chmap.h" #include "audio/chmap_sel.h" -// Minimum buffer size in seconds. -#define MIN_BUFFER 0.2 - // If ao_get_delay() reaches this value after ao_play() was called with the // AOPLAY_FINAL_CHUNK flag set, the playback core expects that the audio has // all been played. @@ -56,6 +53,7 @@ struct ao { struct mp_log *log; // Using e.g. "[ao/coreaudio]" as prefix int buffer; + double def_buffer; void *api_priv; }; diff --git a/audio/out/push.c b/audio/out/push.c index 95df7dfb56..4a1f2a06c4 100644 --- a/audio/out/push.c +++ b/audio/out/push.c @@ -168,11 +168,11 @@ static int unlocked_get_space(struct ao *ao) int space = mp_audio_buffer_get_write_available(p->buffer); if (ao->driver->get_space) { // The following code attempts to keep the total buffered audio to - // MIN_BUFFER/2+device_buffer in order to improve latency. + // def_buffer/2+device_buffer in order to improve latency. int device_space = ao->driver->get_space(ao); int device_buffered = ao->device_buffer - device_space; int soft_buffered = mp_audio_buffer_samples(p->buffer); - int min_buffer = MIN_BUFFER / 2 * ao->samplerate + ao->device_buffer; + int min_buffer = ao->def_buffer / 2 * ao->samplerate + ao->device_buffer; int total_buffer = device_buffered + soft_buffered; int missing = min_buffer - total_buffer; space = MPMIN(space, missing); |