diff options
author | Miika Pekkarinen <miipekk@ihme.org> | 2005-06-11 13:47:01 +0000 |
---|---|---|
committer | Miika Pekkarinen <miipekk@ihme.org> | 2005-06-11 13:47:01 +0000 |
commit | 1c5b392080fc263db370ba1d92a581390e13fa96 (patch) | |
tree | ca87fce08775c1fd717c624ad70f9c0adf36650c /apps | |
parent | 2f2d7d49135966bf52a360e3a94b134851b358e9 (diff) | |
download | rockbox-1c5b392080fc263db370ba1d92a581390e13fa96.tar.gz rockbox-1c5b392080fc263db370ba1d92a581390e13fa96.zip |
Fixed codec buffering problem.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6671 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/playback.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/apps/playback.c b/apps/playback.c index 35aa59e760..d27a9aae64 100644 --- a/apps/playback.c +++ b/apps/playback.c | |||
@@ -984,13 +984,13 @@ void audio_update_trackinfo(void) | |||
984 | pcm_set_boost_mode(false); | 984 | pcm_set_boost_mode(false); |
985 | #endif | 985 | #endif |
986 | } else { | 986 | } else { |
987 | buf_ridx -= ci.curpos; | 987 | buf_ridx -= ci.curpos + cur_ti->codecsize; |
988 | codecbufused += ci.curpos; | 988 | codecbufused += ci.curpos + cur_ti->codecsize; |
989 | cur_ti->available = cur_ti->filesize; | 989 | cur_ti->available = cur_ti->filesize; |
990 | 990 | ||
991 | cur_ti = &tracks[track_ridx]; | 991 | cur_ti = &tracks[track_ridx]; |
992 | buf_ridx -= cur_ti->filesize + cur_ti->codecsize; | 992 | buf_ridx -= cur_ti->filesize; |
993 | codecbufused += cur_ti->filesize + cur_ti->codecsize; | 993 | codecbufused += cur_ti->filesize; |
994 | cur_ti->available = cur_ti->filesize; | 994 | cur_ti->available = cur_ti->filesize; |
995 | if (buf_ridx < 0) | 995 | if (buf_ridx < 0) |
996 | buf_ridx = codecbuflen + buf_ridx; | 996 | buf_ridx = codecbuflen + buf_ridx; |
@@ -1168,8 +1168,6 @@ void codec_thread(void) | |||
1168 | playing = false; | 1168 | playing = false; |
1169 | break ; | 1169 | break ; |
1170 | } | 1170 | } |
1171 | codecbufused -=codecsize; | ||
1172 | // cur_ti->codecsize = 0; | ||
1173 | 1171 | ||
1174 | ci.stop_codec = false; | 1172 | ci.stop_codec = false; |
1175 | wrap = (int)&codecbuf[codecbuflen] - (int)cur_ti->codecbuf; | 1173 | wrap = (int)&codecbuf[codecbuflen] - (int)cur_ti->codecbuf; |