len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-08 12:45:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed a problem that caused playback to stop on certain situations. Fixed

Browse source 
buffer filling issue if we try to buffer more than MAX_TRACK tracks at
a same time.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7026 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Miika Pekkarinen 2005-07-05 13:34:52 +00:00
parent eaf8b2d76d
commit 2d79df5086
1 changed files with 39 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

42
apps/playback.c
View file

@ -819,9 +819,19 @@ bool audio_load_track(int offset, bool start_play, int peek_offset)
int rc, i;
int copy_n;
if (track_count >= MAX_TRACK || tracks[track_widx].filesize != 0)
/* Stop buffer filling if there is no free track entries. */
if (track_count >= MAX_TRACK) {
fill_bytesleft = 0;
return false;
}
/* Don't start loading track if the current write position already
contains a BUFFERED track. The entry may contain the metadata
which is ok. */
if (tracks[track_widx].filesize != 0)
return false;
/* Get track name from current playlist read position. */
logf("Buffering track:%d/%d", track_widx, track_ridx);
trackname = playlist_peek(peek_offset);
if (!trackname) {
@ -836,6 +846,7 @@ bool audio_load_track(int offset, bool start_play, int peek_offset)
return false;
}
/* Initialize track entry. */
size = filesize(fd);
tracks[track_widx].filerem = size;
tracks[track_widx].filesize = size;
@ -844,7 +855,6 @@ bool audio_load_track(int offset, bool start_play, int peek_offset)
tracks[track_widx].taginfo_ready = false;
tracks[track_widx].playlist_offset = offset;
/* Load the codec */
if (buf_widx >= codecbuflen)
buf_widx -= codecbuflen;
@ -857,16 +867,18 @@ bool audio_load_track(int offset, bool start_play, int peek_offset)
ci.configure(CODEC_DSP_ENABLE, false);
}
/* Load the codec. */
tracks[track_widx].codecbuf = &codecbuf[buf_widx];
if (!loadcodec(trackname, start_play)) {
close(fd);
/* Stop buffer filling if codec load failed. */
fill_bytesleft = 0;
return false;
}
// tracks[track_widx].filebuf = &codecbuf[buf_widx];
tracks[track_widx].start_pos = 0;
//logf("%s", trackname);
/* Get track metadata if we don't already have it. */
if (!tracks[track_widx].taginfo_ready) {
if (!get_metadata(&tracks[track_widx],fd,trackname,v1first)) {
close(fd);
@ -903,6 +915,7 @@ bool audio_load_track(int offset, bool start_play, int peek_offset)
audiobuffer_add_event(codec_track_changed);
}
/* Do some initial file buffering. */
i = tracks[track_widx].start_pos;
size = MIN(size, AUDIO_FILL_CYCLE);
while (i < size) {
@ -1189,9 +1202,16 @@ static void audio_stop_playback(void)
filling = false;
}
/* Request the next track with new codec. */
void audio_change_track(void)
{
logf("change track");
/* Wait for new track data. */
while (track_ridx == track_widx && filling)
yield();
/* If we are not filling, then it must be end-of-playlist. */
if (track_ridx == track_widx) {
logf("No more tracks");
while (pcm_is_playing())
@ -1216,9 +1236,13 @@ bool codec_request_next_track_callback(void)
/* Advance to next track. */
if (ci.reload_codec && new_track > 0) {
last_peek_offset--;
/* Wait for new track data. */
while (track_ridx == track_widx && filling)
yield();
if (!playlist_check(1))
return false;
last_peek_offset--;
playlist_next(1);
if (++track_ridx == MAX_TRACK)
track_ridx = 0;
@ -1232,9 +1256,9 @@ bool codec_request_next_track_callback(void)
/* Advance to previous track. */
else if (ci.reload_codec && new_track < 0) {
last_peek_offset++;
if (!playlist_check(-1))
return false;
last_peek_offset++;
playlist_next(-1);
if (--track_ridx < 0)
track_ridx = MAX_TRACK-1;
@ -1250,9 +1274,13 @@ bool codec_request_next_track_callback(void)
/* Codec requested track change (next track). */
else {
last_peek_offset--;
/* Wait for new track data. */
while (track_ridx == track_widx && filling)
yield();
if (!playlist_check(1))
return false;
last_peek_offset--;
playlist_next(1);
if (++track_ridx >= MAX_TRACK)
track_ridx = 0;