devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Better update of the watermark when changing tracks

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2951 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Linus Nielsen Feltzing 2002-12-05 15:23:46 +00:00
parent a5587d0298
commit ce882bba24
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
firmware/mpeg.c
View file

@ -884,7 +884,6 @@ void DEI3(void)
closed. */ closed. */
if(mpeg_file >= 0) if(mpeg_file >= 0)
{ {
/* Update the watermark debug level */ /* Update the watermark debug level */
if(unplayed_space_left < lowest_watermark_level) if(unplayed_space_left < lowest_watermark_level)
lowest_watermark_level = unplayed_space_left; lowest_watermark_level = unplayed_space_left;
@ -1037,6 +1036,15 @@ static int new_file(int steps)
SEEK_SET); SEEK_SET);
id3tags[new_tag_idx]->id3.index = steps; id3tags[new_tag_idx]->id3.index = steps;
id3tags[new_tag_idx]->id3.offset = 0; id3tags[new_tag_idx]->id3.offset = 0;
if(id3tags[new_tag_idx]->id3.vbr)
/* Average bitrate * 1.5 */
recalculate_watermark(
(id3tags[new_tag_idx]->id3.bitrate * 3) / 2);
else
recalculate_watermark(
id3tags[new_tag_idx]->id3.bitrate);
} }
} }
} while ( mpeg_file < 0 ); } while ( mpeg_file < 0 );
@ -1637,7 +1645,7 @@ static void mpeg_thread(void)
DEBUGF("R\n"); DEBUGF("R\n");
t1 = current_tick; t1 = current_tick;
len = read(mpeg_file, mp3buf+mp3buf_write, amount_to_read); len = read(mpeg_file, mp3buf+mp3buf_write, amount_to_read);
#if 0
if(id3tags[tag_read_idx]->id3.vbr) if(id3tags[tag_read_idx]->id3.vbr)
/* Average bitrate * 1.5 */ /* Average bitrate * 1.5 */
recalculate_watermark( recalculate_watermark(
@ -1645,7 +1653,7 @@ static void mpeg_thread(void)
else else
recalculate_watermark( recalculate_watermark(
id3tags[tag_read_idx]->id3.bitrate); id3tags[tag_read_idx]->id3.bitrate);
#endif
if(len > 0) if(len > 0)
{ {
t2 = current_tick; t2 = current_tick;