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

Fixed buffering problems with dynamic playlist handling. Increased

Browse source 
codec buffer default watermark to prevent skipping.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6922 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Miika Pekkarinen 2005-06-29 14:46:27 +00:00
parent ee34053903
commit de3b04ee28
1 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

29
apps/playback.c
View file

@ -73,7 +73,7 @@ static volatile bool paused;
#define CODEC_WAVPACK "/.rockbox/codecs/wavpack.codec"; #define CODEC_WAVPACK "/.rockbox/codecs/wavpack.codec";
#define AUDIO_FILL_CYCLE (1024*256) #define AUDIO_FILL_CYCLE (1024*256)
#define AUDIO_DEFAULT_WATERMARK (1024*256) #define AUDIO_DEFAULT_WATERMARK (1024*512)
#define AUDIO_DEFAULT_FILECHUNK (1024*32) #define AUDIO_DEFAULT_FILECHUNK (1024*32)
#define AUDIO_PLAY 1 #define AUDIO_PLAY 1
@ -724,11 +724,12 @@ bool audio_load_track(int offset, bool start_play, int peek_offset)
off_t size; off_t size;
int rc, i; int rc, i;
int copy_n; int copy_n;
if (track_count >= MAX_TRACK || tracks[track_widx].filesize != 0 if (track_count >= MAX_TRACK || tracks[track_widx].filesize != 0
|| current_fd >= 0) || current_fd >= 0)
return false; return false;
logf("Buffering track:%d/%d", track_widx, track_ridx);
trackname = playlist_peek(peek_offset); trackname = playlist_peek(peek_offset);
if (!trackname) { if (!trackname) {
logf("End-of-playlist"); logf("End-of-playlist");
@ -737,8 +738,10 @@ bool audio_load_track(int offset, bool start_play, int peek_offset)
} }
fd = open(trackname, O_RDONLY); fd = open(trackname, O_RDONLY);
if (fd < 0) if (fd < 0) {
logf("Open failed");
return false; return false;
}
size = filesize(fd); size = filesize(fd);
tracks[track_widx].filerem = size; tracks[track_widx].filerem = size;
@ -770,7 +773,6 @@ bool audio_load_track(int offset, bool start_play, int peek_offset)
tracks[track_widx].start_pos = 0; tracks[track_widx].start_pos = 0;
//logf("%s", trackname); //logf("%s", trackname);
logf("Buffering track:%d/%d", track_widx, track_ridx);
if (!get_metadata(&tracks[track_widx],fd,trackname,v1first)) { if (!get_metadata(&tracks[track_widx],fd,trackname,v1first)) {
close(fd); close(fd);
@ -896,10 +898,15 @@ void initialize_buffer_fill(void)
{ {
int cur_idx, i; int cur_idx, i;
pcm_set_boost_mode(true);
fill_bytesleft = codecbuflen - codecbufused; fill_bytesleft = codecbuflen - codecbufused;
tracks[track_widx].start_pos = ci.curpos; tracks[track_widx].start_pos = ci.curpos;
if (filling)
return ;
filling = true;
pcm_set_boost_mode(true);
/* Calculate real track count after throwing away old tracks. */ /* Calculate real track count after throwing away old tracks. */
cur_idx = track_ridx; cur_idx = track_ridx;
@ -926,10 +933,7 @@ void audio_check_buffer(void)
|| !playing || ci.stop_codec || ci.reload_codec) && !filling) || !playing || ci.stop_codec || ci.reload_codec) && !filling)
return ; return ;
if (!filling) { initialize_buffer_fill();
initialize_buffer_fill();
filling = true;
}
/* Limit buffering size at first run. */ /* Limit buffering size at first run. */
if (conf_bufferlimit && (int)fill_bytesleft >= conf_bufferlimit) { if (conf_bufferlimit && (int)fill_bytesleft >= conf_bufferlimit) {
@ -1097,6 +1101,11 @@ void audio_invalidate_tracks(void)
} }
track_count = 1; track_count = 1;
last_peek_offset = 1;
if (cur_ti->filerem == 0 && current_fd >= 0) {
close(current_fd);
current_fd = -1;
}
track_widx = track_ridx; track_widx = track_ridx;
audio_clear_track_entries(); audio_clear_track_entries();
codecbufused = cur_ti->available; codecbufused = cur_ti->available;