ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

audio: handle buf == NULL in put_buffer_out() 

With the next patch all audio backends put_buffer_out() functions
have to handle the buf == NULL case, provided the get_buffer_out()
function may return buf = NULL and size > 0.

It turns out that all audio backends get_buffer_out() functions
either can't return buf = NULL or return buf = NULL and size = 0
at the same time. The only exception is the spiceaudio backend
where size may be uninitialized.

Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
Message-id: 20200920171729.15861-1-vr_qemu@t-online.de
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Volker Rümelin 2020-09-20 19:17:21 +02:00 committed by Gerd Hoffmann
parent 0fc0142828
commit d4b70fa4ed
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
audio/spiceaudio.c
View File

@ -135,6 +135,7 @@ static void *line_out_get_buffer(HWVoiceOut *hw, size_t *size)
(out->fsize - out->fpos) * hw->info.bytes_per_frame); (out->fsize - out->fpos) * hw->info.bytes_per_frame);
} else { } else {
audio_rate_start(&out->rate); audio_rate_start(&out->rate);
*size = LINE_OUT_SAMPLES << 2;
} }
return out->frame + out->fpos; return out->frame + out->fpos;
} }
@ -143,12 +144,14 @@ static size_t line_out_put_buffer(HWVoiceOut *hw, void *buf, size_t size)
{ {
SpiceVoiceOut *out = container_of(hw, SpiceVoiceOut, hw); SpiceVoiceOut *out = container_of(hw, SpiceVoiceOut, hw);
assert(buf == out->frame + out->fpos && out->fpos <= out->fsize); if (buf) {
out->fpos += size >> 2; assert(buf == out->frame + out->fpos && out->fpos <= out->fsize);
out->fpos += size >> 2;
if (out->fpos == out->fsize) { /* buffer full */ if (out->fpos == out->fsize) { /* buffer full */
spice_server_playback_put_samples(&out->sin, out->frame); spice_server_playback_put_samples(&out->sin, out->frame);
out->frame = NULL; out->frame = NULL;
}
} }
return size; return size;