len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-06 21:25:03 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

plugins: Add plugin_release_audio_buffer().

Browse source 
Some plugins grab the whole audio buffer and still want to start playback
somehow (e.g. random_folder_advance_config). Since 22e802e the plugin buffer
is allocated via buflib and has to be released explicitely. For these plugins
the automatic free on exit is not sufficient and they need an API function for
that.

Fixes OOM panic on random_folder_advance_config when using start
shuffled playback.

Change-Id: I0d351daa782cb829f4ff80d34c05f40a2e0c142f
This commit is contained in:
Thomas Martitz 2014-04-09 09:00:36 +02:00
parent 924a3c48d2
commit 957613420e
4 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

19
apps/plugin.c
View file

@ -129,6 +129,10 @@ static int close_wrapper(int fd);
static int creat_wrapper(const char *pathname, mode_t mode);
#endif
static void* plugin_get_audio_buffer(size_t *buffer_size);
static void plugin_release_audio_buffer(void);
static void plugin_tsr(bool (*exit_callback)(bool));
static const struct plugin_api rockbox_api = {
/* lcd */
@ -692,8 +696,8 @@ static const struct plugin_api rockbox_api = {
mktime,
#endif
plugin_get_buffer,
plugin_get_audio_buffer,
plugin_tsr,
plugin_get_audio_buffer, /* defined in plugin.c */
plugin_tsr, /* defined in plugin.c */
plugin_get_current_filename,
#if defined(DEBUG) || defined(SIMULATOR)
debugf,
@ -800,6 +804,7 @@ static const struct plugin_api rockbox_api = {
/* new stuff at the end, sort into place next time
the API gets incompatible */
plugin_release_audio_buffer, /* defined in plugin.c */
};
static int plugin_buffer_handle;
@ -994,7 +999,7 @@ void* plugin_get_buffer(size_t *buffer_size)
Playback gets stopped, to avoid conflicts.
Talk buffer is stolen as well.
*/
void* plugin_get_audio_buffer(size_t *buffer_size)
static void* plugin_get_audio_buffer(size_t *buffer_size)
{
/* dummy ops with no callbacks, needed because by
* default buflib buffers can be moved around which must be avoided */
@ -1004,10 +1009,16 @@ void* plugin_get_audio_buffer(size_t *buffer_size)
return core_get_data(plugin_buffer_handle);
}
static void plugin_release_audio_buffer(void)
{
if (plugin_buffer_handle > 0)
plugin_buffer_handle = core_free(plugin_buffer_handle);
}
/* The plugin wants to stay resident after leaving its main function, e.g.
runs from timer or own thread. The callback is registered to later
instruct it to free its resources before a new plugin gets loaded. */
void plugin_tsr(bool (*exit_callback)(bool))
static void plugin_tsr(bool (*exit_callback)(bool))
{
pfn_tsr_exit = exit_callback; /* remember the callback for later */
}