summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Boot <rotator@gmail.com>2006-12-07 20:13:58 +0000
committerAdam Boot <rotator@gmail.com>2006-12-07 20:13:58 +0000
commit5931ab2e1345fd897ded74c7f01a254777ea4018 (patch)
treeeaeb6c301c55c897d47c3c7500400a250f080546
parenta5ececcfef96840921f1d24df1d4adb0b00f8ad3 (diff)
downloadrockbox-5931ab2e1345fd897ded74c7f01a254777ea4018.tar.gz
rockbox-5931ab2e1345fd897ded74c7f01a254777ea4018.zip
Minor corrections to FLAC seeking calculations
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11687 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/codecs/flac.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/codecs/flac.c b/apps/codecs/flac.c
index b3cba32c82..4202763962 100644
--- a/apps/codecs/flac.c
+++ b/apps/codecs/flac.c
@@ -219,7 +219,7 @@ bool frame_sync(FLACContext* fc) {
/* Advance and init bit buffer to the new frame. */
ci->advance_buffer((get_bits_count(&fc->gb)-16)>>3); /* consumed bytes */
- bit_buffer = ci->request_buffer(&buff_size, MAX_FRAMESIZE);
+ bit_buffer = ci->request_buffer(&buff_size, MAX_FRAMESIZE+16);
init_get_bits(&fc->gb, bit_buffer, buff_size*8);
/* Decode the frame to verify the frame crc and
@@ -307,7 +307,7 @@ bool flac_seek(FLACContext* fc, uint32_t target_sample) {
if(!ci->seek_buffer(pos))
return false;
- bit_buffer = ci->request_buffer(&buff_size, MAX_FRAMESIZE);
+ bit_buffer = ci->request_buffer(&buff_size, MAX_FRAMESIZE+16);
init_get_bits(&fc->gb, bit_buffer, buff_size*8);
/* Now we need to get a frame. It is possible for our seek
@@ -368,7 +368,7 @@ bool flac_seek(FLACContext* fc, uint32_t target_sample) {
/* We need to narrow the search. */
if(target_sample < this_frame_sample) {
- upper_bound_sample = this_frame_sample + this_block_size;
+ upper_bound_sample = this_frame_sample;
upper_bound = ci->curpos;
}
else { /* Target is beyond this frame. */