oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output/alsa: fix endless loop at end of file in dsd_usb mode

This commit is contained in:
Max Kellermann 2014-08-31 13:58:04 +02:00
parent af260b5a64
commit 2406152576
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -3,6 +3,8 @@ ver 0.18.13 (not yet released)
- dsdiff, dsf: fix endless loop on malformed file - dsdiff, dsf: fix endless loop on malformed file
- ffmpeg: support ffmpeg/libav version 11 - ffmpeg: support ffmpeg/libav version 11
- gme: fix song duration - gme: fix song duration
* output
- alsa: fix endless loop at end of file in dsd_usb mode
* fix state file saver * fix state file saver
* fix build failure on Darwin * fix build failure on Darwin

9
src/output/AlsaOutputPlugin.cxx
View File

@ -815,7 +815,16 @@ alsa_play(struct audio_output *ao, const void *chunk, size_t size,
} }
} }
const size_t original_size = size;
chunk = ad->pcm_export->Export(chunk, size, size); chunk = ad->pcm_export->Export(chunk, size, size);
if (size == 0)
/* the DoP (DSD over PCM) filter converts two frames
at a time and ignores the last odd frame; if there
was only one frame (e.g. the last frame in the
file), the result is empty; to avoid an endless
loop, bail out here, and pretend the one frame has
been played */
return original_size;
assert(size % ad->out_frame_size == 0); assert(size % ad->out_frame_size == 0);