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

playback,talk: Share audiobuffer via core_alloc_maximum().

Browse source 
This fixes the radioart crash that was the result of buffering.c working
on a freed buffer at the same time as buflib (radioart uses buffering.c for the
images). With this change the buffer is owned by buflib exclusively so this
cannot happen.

As a result, audio_get_buffer() doesn't exist anymore. Callers should call
core_alloc_maximum() directly. This buffer needs to be protected as usual
against movement if necessary (previously it was not protected at all which
cased the radioart crash), To get most of it they can adjust the willingness of
the talk engine to give its buffer away (at the expense of disabling voice
interface) with the new talk_buffer_set_policy() function.

Change-Id: I52123012208d04967876a304451d634e2bef3a33
This commit is contained in:
Thomas Martitz 2013-05-30 11:24:16 +02:00
parent 64b9e1fa7b
commit 22e802e800
15 changed files with 676 additions and 587 deletions
Download patch file Download diff file Expand all files Collapse all files

40
apps/radio/radioart.c
View file

@ -32,6 +32,7 @@
#include "kernel.h"
#include "string-extra.h"
#include "filefuncs.h"
#include "core_alloc.h"
#define MAX_RADIOART_IMAGES 10
struct radioart {
@ -158,14 +159,49 @@ static void buffer_reset_handler(void *data)
(void)data;
}
static int shrink_callback(int handle, unsigned hints, void* start, size_t old_size)
{
(void)start;
(void)old_size;
ssize_t old_size_s = old_size;
size_t size_hint = (hints & BUFLIB_SHRINK_SIZE_MASK);
ssize_t wanted_size = old_size_s - size_hint;
if (wanted_size <= 0)
{
core_free(handle);
buffering_reset(NULL, 0);
}
else
{
if (hints & BUFLIB_SHRINK_POS_FRONT)
start += size_hint;
buffering_reset(start, wanted_size);
core_shrink(handle, start, wanted_size);
buf = start;
/* one-shot */
add_event(BUFFER_EVENT_BUFFER_RESET, true, buffer_reset_handler);
}
return BUFLIB_CB_OK;
}
static struct buflib_callbacks radioart_ops = {
.shrink_callback = shrink_callback,
};
void radioart_init(bool entering_screen)
{
if (entering_screen)
{
/* grab control over buffering */
size_t bufsize;
buf = audio_get_buffer(false, &bufsize);
buffering_reset(buf, bufsize);
int handle = core_alloc_maximum("radioart", &bufsize, &radioart_ops);
buffering_reset(core_get_data(handle), bufsize);
buf = core_get_data(handle);
/* one-shot */
add_event(BUFFER_EVENT_BUFFER_RESET, true, buffer_reset_handler);
}