forked from len0rd/rockbox
Minor corrections to FLAC seeking calculations
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11687 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
a5ececcfef
commit
5931ab2e13
1 changed files with 3 additions and 3 deletions
|
|
@ -219,7 +219,7 @@ bool frame_sync(FLACContext* fc) {
|
||||||
|
|
||||||
/* Advance and init bit buffer to the new frame. */
|
/* Advance and init bit buffer to the new frame. */
|
||||||
ci->advance_buffer((get_bits_count(&fc->gb)-16)>>3); /* consumed bytes */
|
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);
|
init_get_bits(&fc->gb, bit_buffer, buff_size*8);
|
||||||
|
|
||||||
/* Decode the frame to verify the frame crc and
|
/* 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))
|
if(!ci->seek_buffer(pos))
|
||||||
return false;
|
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);
|
init_get_bits(&fc->gb, bit_buffer, buff_size*8);
|
||||||
|
|
||||||
/* Now we need to get a frame. It is possible for our seek
|
/* 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. */
|
/* We need to narrow the search. */
|
||||||
if(target_sample < this_frame_sample) {
|
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;
|
upper_bound = ci->curpos;
|
||||||
}
|
}
|
||||||
else { /* Target is beyond this frame. */
|
else { /* Target is beyond this frame. */
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue