len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

can_add_handle() can be removed, but its logic must remain: before adding a handle, we need to make sure the there'll be space left for the curent one to finish buffering. This should fix the audio dropout problems people were experiencing.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15374 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Nicolas Pennequin 2007-10-30 14:11:03 +00:00
parent be6e85dc59
commit 4ff2f9f372
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
apps/buffering.c
View file

@ -231,9 +231,20 @@ static struct memory_handle *add_handle(size_t data_size, const bool can_wrap,
mutex_lock(&llist_mutex); mutex_lock(&llist_mutex);
/* Allocate the remainder of the space for the current handle */ if (cur_handle && cur_handle->filerem > 0) {
if (cur_handle) /* the current handle hasn't finished buffering. We can only add
new_widx = RINGBUF_ADD(cur_handle->widx, cur_handle->filerem); a new one if there is already enough free space to finish
the buffering. */
size_t req = cur_handle->filerem + sizeof(struct memory_handle);
if (RINGBUF_ADD_CROSS(cur_handle->widx, req, buf_ridx) >= 0) {
/* Not enough space */
mutex_unlock(&llist_mutex);
return NULL;
} else {
/* Allocate the remainder of the space for the current handle */
new_widx = RINGBUF_ADD(cur_handle->widx, cur_handle->filerem);
}
}
/* align buf_widx to 4 bytes up */ /* align buf_widx to 4 bytes up */
new_widx = (RINGBUF_ADD(new_widx, 3)) & ~3; new_widx = (RINGBUF_ADD(new_widx, 3)) & ~3;