Revert "Might improve audio performance in SL."

This broke stuff.
This commit is contained in:
Themaister 2012-10-30 00:37:00 +01:00
parent 5812a5e445
commit d9a903b293

View File

@ -59,28 +59,17 @@ static void opensl_callback(SLAndroidSimpleBufferQueueItf bq, void *ctx)
{ {
sl_t *sl = (sl_t*)ctx; sl_t *sl = (sl_t*)ctx;
for (;;) slock_lock(sl->lock);
{ size_t read_avail = fifo_read_avail(sl->fifo);
slock_lock(sl->lock); if (read_avail > BUFFER_SIZE)
size_t read_avail = fifo_read_avail(sl->fifo); read_avail = BUFFER_SIZE;
if (read_avail > BUFFER_SIZE) fifo_read(sl->fifo, sl->buffer, read_avail);
read_avail = BUFFER_SIZE; slock_unlock(sl->lock);
if (read_avail) memset(sl->buffer + read_avail, 0, BUFFER_SIZE - read_avail);
{ (*bq)->Enqueue(bq, sl->buffer, BUFFER_SIZE);
fifo_read(sl->fifo, sl->buffer, read_avail);
slock_unlock(sl->lock);
scond_signal(sl->cond);
}
else
{
slock_unlock(sl->lock);
break;
}
memset(sl->buffer + read_avail, 0, BUFFER_SIZE - read_avail); scond_signal(sl->cond);
(*bq)->Enqueue(bq, sl->buffer, BUFFER_SIZE);
}
} }
#define GOTO_IF_FAIL(x) do { \ #define GOTO_IF_FAIL(x) do { \