summaryrefslogtreecommitdiff
path: root/apps/plugins/vbrfix.c
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2011-08-14 15:13:00 +0000
committerThomas Martitz <kugel@rockbox.org>2011-08-14 15:13:00 +0000
commitd1322b71595336740eb5e18e5deed056ddb71c7a (patch)
tree812db6a9c2e9d78405ec0ed38465fd88dc5be748 /apps/plugins/vbrfix.c
parent9b9bd73dfb212d4192fccc5fc5e269fc6499139c (diff)
downloadrockbox-d1322b71595336740eb5e18e5deed056ddb71c7a.tar.gz
rockbox-d1322b71595336740eb5e18e5deed056ddb71c7a.zip
GSoC/Buflib: 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. Buffer init is moved up in the init chain and handles ipodvideo64mb internally. 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 mp3data.c and talk mess with the buffer. mpeg.c now implements some buffer related functions of playback.h, especially audio_get_buffer(), allowing to reduce #ifdef hell a tiny bit. audiobuf and audiobufend are local to buffer.c now. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30308 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/vbrfix.c')
-rw-r--r--apps/plugins/vbrfix.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/plugins/vbrfix.c b/apps/plugins/vbrfix.c
index 98ca15b6a8..af7b817002 100644
--- a/apps/plugins/vbrfix.c
+++ b/apps/plugins/vbrfix.c
@@ -157,14 +157,15 @@ static bool vbr_fix(const char *selected_file)
157 xingupdate(0); 157 xingupdate(0);
158 158
159 num_frames = rb->count_mp3_frames(fd, entry.first_frame_offset, 159 num_frames = rb->count_mp3_frames(fd, entry.first_frame_offset,
160 flen, xingupdate); 160 flen, xingupdate, audiobuf, audiobuflen);
161 161
162 if(num_frames) { 162 if(num_frames) {
163 /* Note: We don't need to pass a template header because it will be 163 /* Note: We don't need to pass a template header because it will be
164 taken from the mpeg stream */ 164 taken from the mpeg stream */
165 framelen = rb->create_xing_header(fd, entry.first_frame_offset, 165 framelen = rb->create_xing_header(fd, entry.first_frame_offset,
166 flen, xingbuf, num_frames, 0, 166 flen, xingbuf, num_frames, 0,
167 0, xingupdate, true); 167 0, xingupdate, true,
168 audiobuf, audiobuflen);
168 169
169 /* Try to fit the Xing header first in the stream. Replace the existing 170 /* Try to fit the Xing header first in the stream. Replace the existing
170 VBR header if there is one, else see if there is room between the 171 VBR header if there is one, else see if there is room between the