From f405d27c56610b4cd466cf3cf81d4079924168dd Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 24 Dec 2011 17:56:10 +0100 Subject: output/osx: remove sleep call from render callback Blocking inside the render callback is forbidden, and this sleep call didn't make any sense. --- src/output/osx_plugin.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/output') diff --git a/src/output/osx_plugin.c b/src/output/osx_plugin.c index 7639f3bd9..d7abae096 100644 --- a/src/output/osx_plugin.c +++ b/src/output/osx_plugin.c @@ -142,10 +142,6 @@ osx_render(void *vdata, buffer->mDataByteSize = buffer_size; - if (!buffer_size) { - g_usleep(1000); - } - return 0; } -- cgit v1.2.3 From 97b4a6b51f146b16eeac9334605f8a6fff1c0af7 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 24 Dec 2011 17:54:41 +0100 Subject: output/osx: clear render buffer when there's not enough data When we don't have enough data, generate some silence, hoping the input buffer will fill soon. Reducing the render buffer size is not legal. --- src/output/osx_plugin.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/output') diff --git a/src/output/osx_plugin.c b/src/output/osx_plugin.c index d7abae096..5284afc29 100644 --- a/src/output/osx_plugin.c +++ b/src/output/osx_plugin.c @@ -118,7 +118,6 @@ osx_render(void *vdata, g_mutex_lock(od->mutex); bytes_to_copy = MIN(od->len, buffer_size); - buffer_size = bytes_to_copy; od->len -= bytes_to_copy; trailer_length = od->buffer_size - od->pos; @@ -140,7 +139,9 @@ osx_render(void *vdata, g_cond_signal(od->condition); g_mutex_unlock(od->mutex); - buffer->mDataByteSize = buffer_size; + if (bytes_to_copy < buffer_size) + memset((unsigned char*)buffer->mData + bytes_to_copy, 0, + buffer_size - bytes_to_copy); return 0; } -- cgit v1.2.3