[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/9] audio: handle buf == NULL in put_buffer_out()
From: |
Volker Rümelin |
Subject: |
[PATCH 1/9] audio: handle buf == NULL in put_buffer_out() |
Date: |
Sun, 20 Sep 2020 19:17:21 +0200 |
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>
---
audio/spiceaudio.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/audio/spiceaudio.c b/audio/spiceaudio.c
index b6b5da4812..c8d81ba442 100644
--- a/audio/spiceaudio.c
+++ b/audio/spiceaudio.c
@@ -135,6 +135,7 @@ static void *line_out_get_buffer(HWVoiceOut *hw, size_t
*size)
(out->fsize - out->fpos) * hw->info.bytes_per_frame);
} else {
audio_rate_start(&out->rate);
+ *size = LINE_OUT_SAMPLES << 2;
}
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);
- assert(buf == out->frame + out->fpos && out->fpos <= out->fsize);
- out->fpos += size >> 2;
+ if (buf) {
+ assert(buf == out->frame + out->fpos && out->fpos <= out->fsize);
+ out->fpos += size >> 2;
- if (out->fpos == out->fsize) { /* buffer full */
- spice_server_playback_put_samples(&out->sin, out->frame);
- out->frame = NULL;
+ if (out->fpos == out->fsize) { /* buffer full */
+ spice_server_playback_put_samples(&out->sin, out->frame);
+ out->frame = NULL;
+ }
}
return size;
--
2.26.2
- [PATCH 0/9] Audio fixes and improvements, Volker Rümelin, 2020/09/20
- [PATCH 1/9] audio: handle buf == NULL in put_buffer_out(),
Volker Rümelin <=
- [PATCH 3/9] audio/spiceaudio: always rate limit playback stream, Volker Rümelin, 2020/09/20
- [PATCH 2/9] audio/audio: fix video playback slowdown with spiceaudio, Volker Rümelin, 2020/09/20
- [PATCH 4/9] audio: align audio_generic_read with audio_pcm_hw_run_in, Volker Rümelin, 2020/09/20
- [PATCH 7/9] audio: run downstream playback queue unconditionally, Volker Rümelin, 2020/09/20
- [PATCH 8/9] audio: restore mixing-engine playback buffer size, Volker Rümelin, 2020/09/20
- [PATCH 6/9] audio: align audio_generic_write with audio_pcm_hw_run_out, Volker Rümelin, 2020/09/20
- [PATCH 5/9] audio: remove unnecessary calls to put_buffer_in, Volker Rümelin, 2020/09/20
- [PATCH 9/9] audio: revert tests for pcm_ops table, Volker Rümelin, 2020/09/20