[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 12/15] dsoundaudio: reduce effective playback buffer size
From: |
Volker Rümelin |
Subject: |
[PATCH v3 12/15] dsoundaudio: reduce effective playback buffer size |
Date: |
Tue, 1 Mar 2022 20:13:08 +0100 |
Add the buffer_get_free pcm_ops function to reduce the effective
playback buffer size. All intermediate audio playback buffers
become temporary buffers.
Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
---
audio/dsoundaudio.c | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/audio/dsoundaudio.c b/audio/dsoundaudio.c
index 3dd2c4d4a6..231f3e65b3 100644
--- a/audio/dsoundaudio.c
+++ b/audio/dsoundaudio.c
@@ -427,22 +427,18 @@ static void dsound_enable_out(HWVoiceOut *hw, bool enable)
}
}
-static void *dsound_get_buffer_out(HWVoiceOut *hw, size_t *size)
+static size_t dsound_buffer_get_free(HWVoiceOut *hw)
{
DSoundVoiceOut *ds = (DSoundVoiceOut *) hw;
LPDIRECTSOUNDBUFFER dsb = ds->dsound_buffer;
HRESULT hr;
- DWORD ppos, wpos, act_size;
- size_t req_size;
- int err;
- void *ret;
+ DWORD ppos, wpos;
hr = IDirectSoundBuffer_GetCurrentPosition(
dsb, &ppos, ds->first_time ? &wpos : NULL);
if (FAILED(hr)) {
dsound_logerr(hr, "Could not get playback buffer position\n");
- *size = 0;
- return NULL;
+ return 0;
}
if (ds->first_time) {
@@ -450,13 +446,20 @@ static void *dsound_get_buffer_out(HWVoiceOut *hw, size_t
*size)
ds->first_time = false;
}
- req_size = audio_ring_dist(ppos, hw->pos_emul, hw->size_emul);
- req_size = MIN(req_size, hw->size_emul - hw->pos_emul);
+ return audio_ring_dist(ppos, hw->pos_emul, hw->size_emul);
+}
- if (req_size == 0) {
- *size = 0;
- return NULL;
- }
+static void *dsound_get_buffer_out(HWVoiceOut *hw, size_t *size)
+{
+ DSoundVoiceOut *ds = (DSoundVoiceOut *)hw;
+ LPDIRECTSOUNDBUFFER dsb = ds->dsound_buffer;
+ DWORD act_size;
+ size_t req_size;
+ int err;
+ void *ret;
+
+ req_size = MIN(*size, hw->size_emul - hw->pos_emul);
+ assert(req_size > 0);
err = dsound_lock_out(dsb, &hw->info, hw->pos_emul, req_size, &ret, NULL,
&act_size, NULL, false, ds->s);
@@ -699,6 +702,7 @@ static struct audio_pcm_ops dsound_pcm_ops = {
.init_out = dsound_init_out,
.fini_out = dsound_fini_out,
.write = audio_generic_write,
+ .buffer_get_free = dsound_buffer_get_free,
.get_buffer_out = dsound_get_buffer_out,
.put_buffer_out = dsound_put_buffer_out,
.enable_out = dsound_enable_out,
--
2.34.1
- Re: [PATCH v3 06/15] jackaudio: use more jack audio buffers, (continued)
- [PATCH v3 04/15] audio: inline function audio_pcm_sw_get_rpos_in(), Volker Rümelin, 2022/03/01
- [PATCH v3 08/15] audio: add pcm_ops function table for capture backend, Volker Rümelin, 2022/03/01
- [PATCH v3 09/15] Revert "audio: fix wavcapture segfault", Volker Rümelin, 2022/03/01
- [PATCH v3 14/15] paaudio: fix samples vs. frames mix-up, Volker Rümelin, 2022/03/01
- [PATCH v3 13/15] ossaudio: reduce effective playback buffer size, Volker Rümelin, 2022/03/01
- [PATCH v3 10/15] audio: restore mixing-engine playback buffer size, Volker Rümelin, 2022/03/01
- [PATCH v3 11/15] paaudio: reduce effective playback buffer size, Volker Rümelin, 2022/03/01
- [PATCH v3 12/15] dsoundaudio: reduce effective playback buffer size,
Volker Rümelin <=
- [PATCH v3 15/15] sdlaudio: fix samples vs. frames mix-up, Volker Rümelin, 2022/03/01