summaryrefslogtreecommitdiff
path: root/apps/codecs
diff options
context:
space:
mode:
authorMiika Pekkarinen <miipekk@ihme.org>2005-11-18 20:21:13 +0000
committerMiika Pekkarinen <miipekk@ihme.org>2005-11-18 20:21:13 +0000
commit9c0f1a9e395a4a680e7b2532ebdb468cbeccaca5 (patch)
tree81c2f4619b1f12503c278dd71f71af47f57f19d0 /apps/codecs
parent88a2a8a53a875f6af90fa2b479dc281e752881d2 (diff)
downloadrockbox-9c0f1a9e395a4a680e7b2532ebdb468cbeccaca5.tar.gz
rockbox-9c0f1a9e395a4a680e7b2532ebdb468cbeccaca5.zip
More stable playback with reduced stuttering when skipping tracks.
Removed CODEC_SET_FILEBUF_LIMIT setting; now playback.c determines how to buffer the files. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7970 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs')
-rw-r--r--apps/codecs/a52.c1
-rw-r--r--apps/codecs/aac.c1
-rw-r--r--apps/codecs/alac.c1
-rw-r--r--apps/codecs/flac.c1
-rw-r--r--apps/codecs/mpa.c1
-rw-r--r--apps/codecs/mpc.c1
-rw-r--r--apps/codecs/shorten.c1
-rw-r--r--apps/codecs/vorbis.c1
-rw-r--r--apps/codecs/wav.c1
-rw-r--r--apps/codecs/wavpack.c1
10 files changed, 0 insertions, 10 deletions
diff --git a/apps/codecs/a52.c b/apps/codecs/a52.c
index 050bfff25d..ee80f66892 100644
--- a/apps/codecs/a52.c
+++ b/apps/codecs/a52.c
@@ -140,7 +140,6 @@ enum codec_status codec_start(struct codec_api *api)
140 ci->configure(DSP_SET_SAMPLE_DEPTH, (long *)30); 140 ci->configure(DSP_SET_SAMPLE_DEPTH, (long *)30);
141 ci->configure(DSP_SET_CLIP_MAX, (long *)((1 << 30) - 1)); 141 ci->configure(DSP_SET_CLIP_MAX, (long *)((1 << 30) - 1));
142 ci->configure(DSP_SET_CLIP_MIN, (long *)-(1 << 30)); 142 ci->configure(DSP_SET_CLIP_MIN, (long *)-(1 << 30));
143 ci->configure(CODEC_SET_FILEBUF_LIMIT, (long *)(1024*1024*2));
144 ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, (long *)(1024*128)); 143 ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, (long *)(1024*128));
145 144
146next_track: 145next_track:
diff --git a/apps/codecs/aac.c b/apps/codecs/aac.c
index f6a6de53da..c62fb2d007 100644
--- a/apps/codecs/aac.c
+++ b/apps/codecs/aac.c
@@ -60,7 +60,6 @@ enum codec_status codec_start(struct codec_api* api)
60 rb->memcpy(iramstart, iramcopy, iramend-iramstart); 60 rb->memcpy(iramstart, iramcopy, iramend-iramstart);
61#endif 61#endif
62 62
63 ci->configure(CODEC_SET_FILEBUF_LIMIT, (int *)(1024*1024*2));
64 ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, (int *)(1024*16)); 63 ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, (int *)(1024*16));
65 ci->configure(CODEC_SET_FILEBUF_WATERMARK, (int *)(1024*512)); 64 ci->configure(CODEC_SET_FILEBUF_WATERMARK, (int *)(1024*512));
66 65
diff --git a/apps/codecs/alac.c b/apps/codecs/alac.c
index 1ecaab6b85..deb1e289a7 100644
--- a/apps/codecs/alac.c
+++ b/apps/codecs/alac.c
@@ -57,7 +57,6 @@ enum codec_status codec_start(struct codec_api* api)
57 rb->memcpy(iramstart, iramcopy, iramend-iramstart); 57 rb->memcpy(iramstart, iramcopy, iramend-iramstart);
58#endif 58#endif
59 59
60 ci->configure(CODEC_SET_FILEBUF_LIMIT, (int *)(1024*1024*10));
61 ci->configure(CODEC_SET_FILEBUF_WATERMARK, (int *)(1024*512)); 60 ci->configure(CODEC_SET_FILEBUF_WATERMARK, (int *)(1024*512));
62 ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, (int *)(1024*128)); 61 ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, (int *)(1024*128));
63 62
diff --git a/apps/codecs/flac.c b/apps/codecs/flac.c
index b94152dec5..7639b9a352 100644
--- a/apps/codecs/flac.c
+++ b/apps/codecs/flac.c
@@ -233,7 +233,6 @@ enum codec_status codec_start(struct codec_api* api)
233 ci->memcpy(iramstart, iramcopy, iramend-iramstart); 233 ci->memcpy(iramstart, iramcopy, iramend-iramstart);
234#endif 234#endif
235 235
236 ci->configure(CODEC_SET_FILEBUF_LIMIT, (int *)(1024*1024*10));
237 ci->configure(CODEC_SET_FILEBUF_WATERMARK, (int *)(1024*512)); 236 ci->configure(CODEC_SET_FILEBUF_WATERMARK, (int *)(1024*512));
238 ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, (int *)(1024*128)); 237 ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, (int *)(1024*128));
239 238
diff --git a/apps/codecs/mpa.c b/apps/codecs/mpa.c
index c6342df262..0f575924d0 100644
--- a/apps/codecs/mpa.c
+++ b/apps/codecs/mpa.c
@@ -95,7 +95,6 @@ enum codec_status codec_start(struct codec_api *api)
95 ci->configure(DSP_SET_SAMPLE_DEPTH, (int *)(MAD_F_FRACBITS)); 95 ci->configure(DSP_SET_SAMPLE_DEPTH, (int *)(MAD_F_FRACBITS));
96 ci->configure(DSP_SET_CLIP_MIN, (int *)-MAD_F_ONE); 96 ci->configure(DSP_SET_CLIP_MIN, (int *)-MAD_F_ONE);
97 ci->configure(DSP_SET_CLIP_MAX, (int *)(MAD_F_ONE - 1)); 97 ci->configure(DSP_SET_CLIP_MAX, (int *)(MAD_F_ONE - 1));
98 ci->configure(CODEC_SET_FILEBUF_LIMIT, (int *)(1024*1024*2));
99 ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, (int *)(1024*16)); 98 ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, (int *)(1024*16));
100 99
101 ci->memset(&stream, 0, sizeof(struct mad_stream)); 100 ci->memset(&stream, 0, sizeof(struct mad_stream));
diff --git a/apps/codecs/mpc.c b/apps/codecs/mpc.c
index 0f113c7bdc..db2501525e 100644
--- a/apps/codecs/mpc.c
+++ b/apps/codecs/mpc.c
@@ -96,7 +96,6 @@ enum codec_status codec_start(struct codec_api *api)
96 /* disable these until we can figure out what's going on. 96 /* disable these until we can figure out what's going on.
97 ci->configure(DSP_SET_CLIP_MAX, (long *)MPC_FIXED_POINT_SCALE); 97 ci->configure(DSP_SET_CLIP_MAX, (long *)MPC_FIXED_POINT_SCALE);
98 ci->configure(DSP_SET_CLIP_MIN, (long *)-MPC_FIXED_POINT_SCALE);*/ 98 ci->configure(DSP_SET_CLIP_MIN, (long *)-MPC_FIXED_POINT_SCALE);*/
99 ci->configure(CODEC_SET_FILEBUF_LIMIT, (long *)(1024*1024*2));
100 ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, (long *)(1024*16)); 99 ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, (long *)(1024*16));
101 100
102 /* Create a decoder instance */ 101 /* Create a decoder instance */
diff --git a/apps/codecs/shorten.c b/apps/codecs/shorten.c
index 50d72997ce..26b5e09d6c 100644
--- a/apps/codecs/shorten.c
+++ b/apps/codecs/shorten.c
@@ -56,7 +56,6 @@ enum codec_status codec_start(struct codec_api* api)
56 ci->memcpy(iramstart, iramcopy, iramend-iramstart); 56 ci->memcpy(iramstart, iramcopy, iramend-iramstart);
57#endif 57#endif
58 58
59 ci->configure(CODEC_SET_FILEBUF_LIMIT, (int *)(1024*1024*10));
60 ci->configure(CODEC_SET_FILEBUF_WATERMARK, (int *)(1024*512)); 59 ci->configure(CODEC_SET_FILEBUF_WATERMARK, (int *)(1024*512));
61 ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, (int *)(1024*128)); 60 ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, (int *)(1024*128));
62 61
diff --git a/apps/codecs/vorbis.c b/apps/codecs/vorbis.c
index 1fbe131e10..69eba24bb8 100644
--- a/apps/codecs/vorbis.c
+++ b/apps/codecs/vorbis.c
@@ -135,7 +135,6 @@ enum codec_status codec_start(struct codec_api *api)
135 /* Note: These are sane defaults for these values. Perhaps 135 /* Note: These are sane defaults for these values. Perhaps
136 * they should be set differently based on quality setting 136 * they should be set differently based on quality setting
137 */ 137 */
138 rb->configure(CODEC_SET_FILEBUF_LIMIT, (long *)(1024*1024*2));
139 138
140 /* The chunk size below is magic. If set any lower, resume 139 /* The chunk size below is magic. If set any lower, resume
141 * doesn't work properly (ov_raw_seek() does the wrong thing). 140 * doesn't work properly (ov_raw_seek() does the wrong thing).
diff --git a/apps/codecs/wav.c b/apps/codecs/wav.c
index 6bf7bcd408..85e24124ab 100644
--- a/apps/codecs/wav.c
+++ b/apps/codecs/wav.c
@@ -237,7 +237,6 @@ enum codec_status codec_start(struct codec_api* api)
237 ci->memcpy(iramstart, iramcopy, iramend-iramstart); 237 ci->memcpy(iramstart, iramcopy, iramend-iramstart);
238#endif 238#endif
239 239
240 ci->configure(CODEC_SET_FILEBUF_LIMIT, (int *)(1024*1024*10));
241 ci->configure(CODEC_SET_FILEBUF_WATERMARK, (int *)(1024*512)); 240 ci->configure(CODEC_SET_FILEBUF_WATERMARK, (int *)(1024*512));
242 ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, (int *)(1024*256)); 241 ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, (int *)(1024*256));
243 242
diff --git a/apps/codecs/wavpack.c b/apps/codecs/wavpack.c
index 93f5002538..21c194773b 100644
--- a/apps/codecs/wavpack.c
+++ b/apps/codecs/wavpack.c
@@ -58,7 +58,6 @@ enum codec_status codec_start(struct codec_api* api)
58 ci->memcpy(iramstart, iramcopy, iramend-iramstart); 58 ci->memcpy(iramstart, iramcopy, iramend-iramstart);
59#endif 59#endif
60 60
61 ci->configure(CODEC_SET_FILEBUF_LIMIT, (int *)(1024*1024*10));
62 ci->configure(CODEC_SET_FILEBUF_WATERMARK, (int *)(1024*512)); 61 ci->configure(CODEC_SET_FILEBUF_WATERMARK, (int *)(1024*512));
63 ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, (int *)(1024*128)); 62 ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, (int *)(1024*128));
64 63