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

Do not assume two pops are enough

Browse Source
This commit is contained in:
Jacob Vosmaer 2016-08-06 15:19:10 +02:00
parent c28cefeeb0
commit 9835a2545d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/output/plugins/OSXOutputPlugin.cxx
View File

@ -410,18 +410,18 @@ osx_render(void *vdata,
requested_bytes = od->render_buffer_size; requested_bytes = od->render_buffer_size;
size_t available_bytes = od->ring_buffer->pop(od->render_buffer, requested_bytes); size_t available_bytes = od->ring_buffer->pop(od->render_buffer, requested_bytes);
size_t wraparound_remainder = available_bytes % input_buffer_frame_size;
/* /*
Maybe this is paranoid but we have no way of knowing Maybe this is paranoid but we have no way of knowing
if the 'pop' above ended at a frame boundary. In case if the 'pop' above ended at a frame boundary. In case
of an incomplete last frame, do a second pop to get of an incomplete last frame, keep popping until the
enough bytes to complete the last frame. last frame is complete.
*/ */
if (wraparound_remainder > 0) size_t remainder;
while ((remainder = available_bytes % input_buffer_frame_size) > 0)
available_bytes += od->ring_buffer->pop( available_bytes += od->ring_buffer->pop(
od->render_buffer + available_bytes, od->render_buffer + available_bytes,
input_buffer_frame_size - wraparound_remainder input_buffer_frame_size - remainder
); );
od->condition.signal(); // We are done consuming from ring_buffer od->condition.signal(); // We are done consuming from ring_buffer