OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

dsoundaudio: reduce effective playback buffer size

Browse Source 
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>
Message-Id: <20220301191311.26695-12-vr_qemu@t-online.de>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Volker Rümelin 2022-03-01 20:13:08 +01:00 committed by Gerd Hoffmann
parent ddf2050ce6
commit c93a593372
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
audio/dsoundaudio.c
View File

@ -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; DSoundVoiceOut *ds = (DSoundVoiceOut *) hw;
LPDIRECTSOUNDBUFFER dsb = ds->dsound_buffer; LPDIRECTSOUNDBUFFER dsb = ds->dsound_buffer;
HRESULT hr; HRESULT hr;
DWORD ppos, wpos, act_size; DWORD ppos, wpos;
size_t req_size;
int err;
void *ret;
hr = IDirectSoundBuffer_GetCurrentPosition( hr = IDirectSoundBuffer_GetCurrentPosition(
dsb, &ppos, ds->first_time ? &wpos : NULL); dsb, &ppos, ds->first_time ? &wpos : NULL);
if (FAILED(hr)) { if (FAILED(hr)) {
dsound_logerr(hr, "Could not get playback buffer position\n"); dsound_logerr(hr, "Could not get playback buffer position\n");
*size = 0; return 0;
return NULL;
} }
if (ds->first_time) { if (ds->first_time) {
@ -450,13 +446,20 @@ static void *dsound_get_buffer_out(HWVoiceOut *hw, size_t *size)
ds->first_time = false; ds->first_time = false;
} }
req_size = audio_ring_dist(ppos, hw->pos_emul, hw->size_emul); return audio_ring_dist(ppos, hw->pos_emul, hw->size_emul);
req_size = MIN(req_size, hw->size_emul - hw->pos_emul); }
if (req_size == 0) { static void *dsound_get_buffer_out(HWVoiceOut *hw, size_t *size)
*size = 0; {
return NULL; 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, err = dsound_lock_out(dsb, &hw->info, hw->pos_emul, req_size, &ret, NULL,
&act_size, NULL, false, ds->s); &act_size, NULL, false, ds->s);
@ -699,6 +702,7 @@ static struct audio_pcm_ops dsound_pcm_ops = {
.init_out = dsound_init_out, .init_out = dsound_init_out,
.fini_out = dsound_fini_out, .fini_out = dsound_fini_out,
.write = audio_generic_write, .write = audio_generic_write,
.buffer_get_free = dsound_buffer_get_free,
.get_buffer_out = dsound_get_buffer_out, .get_buffer_out = dsound_get_buffer_out,
.put_buffer_out = dsound_put_buffer_out, .put_buffer_out = dsound_put_buffer_out,
.enable_out = dsound_enable_out, .enable_out = dsound_enable_out,