Rockbox

This is the bug/patch tracker for Rockbox. Click here for more information.

Quick links: Bugs · Patches · Rockbox frontpage

Tasklist

FS#12159 - GSoC/Buflib: Remove direct audiobuf accesses

Attached to Project: Rockbox
Opened by Thomas Martitz (kugel.) - Tuesday, 14 June 2011, 18:06 GMT+2
Last edited by Thomas Martitz (kugel.) - Monday, 15 August 2011, 14:52 GMT+2
Task Type Patches
Category Operating System/Drivers
Status Closed
Assigned To No-one
Player Type All players
Severity Low
Priority Normal
Reported Version Release 3.8.1
Due in Version Undecided
Due Date Undecided
Percent Complete 100%
Private No

Details

Replace all direct accesses to audiobuf with buffer API functions.

Namely, introduce buffer_get_buffer() and buffer_release_buffer().
buffer_get_buffer() aquires all available and grabs a lock, attempting to
call buffer_alloc() or buffer_get_buffer() while this lock is locked will cause a panicf() (doesn't actually happen, but is for debugging purpose).
buffer_release_buffer() unlocks that lock and can additionally increment the audiobuf buffer to make an allocation. Pass 0 to only unlock if buffer was used temporarily only.
buffer_available() is a replacement function to query audiobuflen, i.e. what's left in the buffer.

Further changes happened to mp3data.c and talk.c as to not call the above API functions, but get the buffer from callers. The caller is the audio system which has the buffer lock while mp3dat and talk mess with the buffer.
mpeg.c now implements some buffer related functions of playback.h, that no #ifdefs are needed anymore around audio_get_buffer().

audiobuf and audiobufend are local to buffer.c now.
   0001-Replace-all-direct-accesses-to-audiobuf-with... (47.9 KiB) 
 b/apps/main.c                 |   11 ----
 b/apps/menus/main_menu.c      |    4 -
 b/apps/mp3data.c              |   41 +++++++++-------
 b/apps/mp3data.h              |   30 ++++++------
 b/apps/mpeg.c                 |   73 +++++++++++++++++++++--------
 b/apps/playback.c             |   39 ++++++++-------
 b/apps/playlist.c             |   18 -------
 b/apps/playlist_viewer.c      |    3 -
 b/apps/plugin.c               |    8 ---
 b/apps/plugin.h               |    8 ++-
 b/apps/plugins/vbrfix.c       |    5 +-
 b/apps/recorder/pcm_record.c  |    2 
 b/apps/tagcache.c             |    8 +--
 b/apps/talk.c                 |  104 ++++++++++++++++++++++++++++--------------
 b/apps/talk.h                 |    1 
 b/firmware/buffer.c           |   77 +++++++++++++++++++++++++++++--
 b/firmware/common/dircache.c  |   33 ++++++++-----
 b/firmware/export/audio.h     |    4 -
 b/firmware/export/buffer.h    |   18 ++-----
 b/firmware/include/dircache.h |    3 -
 b/firmware/rolo.c             |   30 ++++++++----
 21 files changed, 328 insertions(+), 192 deletions(-)

This task depends upon

Closed by  Thomas Martitz (kugel.)
Monday, 15 August 2011, 14:52 GMT+2
Reason for closing:  Accepted
Additional comments about closing:  r30308
Comment by Thomas Martitz (kugel.) - Monday, 20 June 2011, 23:48 GMT+2
Updated patch.
*) Rebased to current svn
*) Few bug fixes.
   0001-Replace-all-direct-accesses-to-audiobuf-with... (48.2 KiB) 
 b/apps/main.c                 |   11 ----
 b/apps/menus/main_menu.c      |    4 -
 b/apps/mp3data.c              |   41 +++++++++-------
 b/apps/mp3data.h              |   30 ++++++------
 b/apps/mpeg.c                 |   73 +++++++++++++++++++++--------
 b/apps/playback.c             |   40 +++++++++-------
 b/apps/playlist.c             |   18 -------
 b/apps/playlist_viewer.c      |    3 -
 b/apps/plugin.c               |    8 ---
 b/apps/plugin.h               |    8 ++-
 b/apps/plugins/vbrfix.c       |    5 +-
 b/apps/recorder/pcm_record.c  |    2 
 b/apps/tagcache.c             |    8 +--
 b/apps/talk.c                 |  104 ++++++++++++++++++++++++++++--------------
 b/apps/talk.h                 |    1 
 b/firmware/buffer.c           |   77 +++++++++++++++++++++++++++++--
 b/firmware/common/dircache.c  |   21 +++++---
 b/firmware/export/audio.h     |    4 -
 b/firmware/include/buffer.h   |   18 ++-----
 b/firmware/include/dircache.h |    3 -
 b/firmware/rolo.c             |   30 ++++++++----
 21 files changed, 321 insertions(+), 188 deletions(-)

Comment by Thomas Martitz (kugel.) - Sunday, 10 July 2011, 01:48 GMT+2
Sync to latest SVN.
   0001-Replace-all-direct-accesses-to-audiobuf-with... (48.2 KiB) 
 b/apps/main.c                 |   11 ----
 b/apps/menus/main_menu.c      |    4 -
 b/apps/mp3data.c              |   41 +++++++++-------
 b/apps/mp3data.h              |   30 ++++++------
 b/apps/mpeg.c                 |   73 +++++++++++++++++++++--------
 b/apps/playback.c             |   43 ++++++++++-------
 b/apps/playlist.c             |   18 -------
 b/apps/playlist_viewer.c      |    3 -
 b/apps/plugin.c               |    8 ---
 b/apps/plugin.h               |    8 ++-
 b/apps/plugins/vbrfix.c       |    5 +-
 b/apps/recorder/pcm_record.c  |    2 
 b/apps/tagcache.c             |    8 +--
 b/apps/talk.c                 |  104 ++++++++++++++++++++++++++++--------------
 b/apps/talk.h                 |    1 
 b/firmware/buffer.c           |   77 +++++++++++++++++++++++++++++--
 b/firmware/common/dircache.c  |   22 ++++++--
 b/firmware/export/audio.h     |    4 -
 b/firmware/include/buffer.h   |   18 ++-----
 b/firmware/include/dircache.h |    3 -
 b/firmware/rolo.c             |   30 ++++++++----
 21 files changed, 325 insertions(+), 188 deletions(-)

Comment by Frank Gevaerts (fg) - Friday, 29 July 2011, 23:35 GMT+2
This looks sane to me, with of course the caveat that I'm not an expert for most of the apps/ code
Comment by Thomas Martitz (kugel.) - Monday, 01 August 2011, 17:02 GMT+2
Updated version with a few bug fixes. Intent to commit this.
   0001-Replace-all-direct-accesses-to-audiobuf-with... (51 KiB) 
 b/apps/filetree.c             |    1 
 b/apps/main.c                 |   11 ----
 b/apps/menus/main_menu.c      |    4 -
 b/apps/misc.c                 |    3 +
 b/apps/mp3data.c              |   41 +++++++++-------
 b/apps/mp3data.h              |   30 ++++++------
 b/apps/mpeg.c                 |   89 ++++++++++++++++++++++++++---------
 b/apps/playback.c             |   45 ++++++++++--------
 b/apps/playback.h             |    1 
 b/apps/playlist.c             |   18 -------
 b/apps/playlist_viewer.c      |    3 -
 b/apps/plugin.c               |    8 ---
 b/apps/plugin.h               |    8 ++-
 b/apps/plugins/vbrfix.c       |    5 +-
 b/apps/recorder/pcm_record.c  |    2 
 b/apps/tagcache.c             |    8 +--
 b/apps/talk.c                 |  105 ++++++++++++++++++++++++++++--------------
 b/apps/talk.h                 |    1 
 b/firmware/buffer.c           |   75 ++++++++++++++++++++++++++++--
 b/firmware/common/dircache.c  |   22 ++++++--
 b/firmware/export/audio.h     |    6 +-
 b/firmware/include/buffer.h   |   18 ++-----
 b/firmware/include/dircache.h |    3 -
 b/firmware/rolo.c             |   28 ++++++++---
 24 files changed, 344 insertions(+), 191 deletions(-)

Comment by Thomas Martitz (kugel.) - Wednesday, 03 August 2011, 22:14 GMT+2
(Probably) final update of this patch. Just a resync to SVN.
   0001-Replace-all-direct-accesses-to-audiobuf-with... (51 KiB) 
 b/apps/filetree.c             |    1 
 b/apps/main.c                 |   11 ----
 b/apps/menus/main_menu.c      |    4 -
 b/apps/misc.c                 |    3 +
 b/apps/mp3data.c              |   41 +++++++++-------
 b/apps/mp3data.h              |   30 ++++++------
 b/apps/mpeg.c                 |   89 ++++++++++++++++++++++++++---------
 b/apps/playback.c             |   45 ++++++++++--------
 b/apps/playback.h             |    1 
 b/apps/playlist.c             |   18 -------
 b/apps/playlist_viewer.c      |    3 -
 b/apps/plugin.c               |    8 ---
 b/apps/plugin.h               |    8 ++-
 b/apps/plugins/vbrfix.c       |    5 +-
 b/apps/recorder/pcm_record.c  |    2 
 b/apps/tagcache.c             |    8 +--
 b/apps/talk.c                 |  105 ++++++++++++++++++++++++++++--------------
 b/apps/talk.h                 |    1 
 b/firmware/buffer.c           |   75 ++++++++++++++++++++++++++++--
 b/firmware/common/dircache.c  |   22 ++++++--
 b/firmware/export/audio.h     |    6 +-
 b/firmware/include/buffer.h   |   18 ++-----
 b/firmware/include/dircache.h |    3 -
 b/firmware/rolo.c             |   28 ++++++++---
 24 files changed, 344 insertions(+), 191 deletions(-)

Comment by Thomas Martitz (kugel.) - Tuesday, 09 August 2011, 20:48 GMT+2
Another updated patch with minor fixes.
   0001-Replace-all-direct-accesses-to-audiobuf-with... (51.2 KiB) 
 b/apps/filetree.c             |    1 
 b/apps/main.c                 |   11 ----
 b/apps/menus/main_menu.c      |    4 -
 b/apps/misc.c                 |    3 +
 b/apps/mp3data.c              |   41 +++++++++------
 b/apps/mp3data.h              |   30 +++++------
 b/apps/mpeg.c                 |   89 ++++++++++++++++++++++++---------
 b/apps/playback.c             |   45 ++++++++++-------
 b/apps/playback.h             |    1 
 b/apps/playlist.c             |   18 ------
 b/apps/playlist_viewer.c      |    3 -
 b/apps/plugin.c               |    8 ---
 b/apps/plugin.h               |    8 +--
 b/apps/plugins/vbrfix.c       |    5 +
 b/apps/recorder/pcm_record.c  |    2 
 b/apps/tagcache.c             |    8 +--
 b/apps/talk.c                 |  111 +++++++++++++++++++++++++++++-------------
 b/apps/talk.h                 |    1 
 b/firmware/buffer.c           |   75 +++++++++++++++++++++++++++-
 b/firmware/common/dircache.c  |   22 +++++---
 b/firmware/export/audio.h     |    6 +-
 b/firmware/include/buffer.h   |   18 +-----
 b/firmware/include/dircache.h |    3 -
 b/firmware/rolo.c             |   28 +++++++---
 24 files changed, 350 insertions(+), 191 deletions(-)

Loading...