diff options
author | Max Kellermann <max@duempel.org> | 2008-12-24 03:08:39 +0100 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2008-12-24 03:08:39 +0100 |
commit | 0d9d82a932d7fc022bfc410e206fb8edb6f3db03 (patch) | |
tree | 6499d12b4c1e4a59858859a45214f7f74ef2ea84 /src/output | |
parent | d2d11d70a80bde0b348ccfd59bf1ec82bb997cb7 (diff) | |
download | mpd-0d9d82a932d7fc022bfc410e206fb8edb6f3db03.tar.gz mpd-0d9d82a932d7fc022bfc410e206fb8edb6f3db03.tar.xz mpd-0d9d82a932d7fc022bfc410e206fb8edb6f3db03.zip |
pcm_utils: check pcm_convert()==0
It is illegal to pass an empty audio buffer around. pcm_resample()
sometimes seems to result in 0 samples, maybe related to
libsamplerate. To work around that problem, add special checks after
both pcm_convert() invocations. Removed the pcm_resample()==0 checks
from pcm_convert().
Diffstat (limited to '')
-rw-r--r-- | src/output_thread.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/output_thread.c b/src/output_thread.c index b65a601a3..c887828bb 100644 --- a/src/output_thread.c +++ b/src/output_thread.c @@ -69,9 +69,17 @@ static void ao_play(struct audio_output *ao) assert(size > 0); - if (!audio_format_equals(&ao->inAudioFormat, &ao->outAudioFormat)) + if (!audio_format_equals(&ao->inAudioFormat, &ao->outAudioFormat)) { convertAudioFormat(ao, &data, &size); + /* under certain circumstances, pcm_convert() may + return an empty buffer - this condition should be + investigated further, but for now, do this check as + a workaround: */ + if (size == 0) + return; + } + ret = ao->plugin->play(ao->data, data, size); if (!ret) { ao->plugin->cancel(ao->data); |