From 9c0f1a9e395a4a680e7b2532ebdb468cbeccaca5 Mon Sep 17 00:00:00 2001 From: Miika Pekkarinen Date: Fri, 18 Nov 2005 20:21:13 +0000 Subject: 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 --- apps/codecs/a52.c | 1 - apps/codecs/aac.c | 1 - apps/codecs/alac.c | 1 - apps/codecs/flac.c | 1 - apps/codecs/mpa.c | 1 - apps/codecs/mpc.c | 1 - apps/codecs/shorten.c | 1 - apps/codecs/vorbis.c | 1 - apps/codecs/wav.c | 1 - apps/codecs/wavpack.c | 1 - 10 files changed, 10 deletions(-) (limited to 'apps/codecs') 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) ci->configure(DSP_SET_SAMPLE_DEPTH, (long *)30); ci->configure(DSP_SET_CLIP_MAX, (long *)((1 << 30) - 1)); ci->configure(DSP_SET_CLIP_MIN, (long *)-(1 << 30)); - ci->configure(CODEC_SET_FILEBUF_LIMIT, (long *)(1024*1024*2)); ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, (long *)(1024*128)); next_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) rb->memcpy(iramstart, iramcopy, iramend-iramstart); #endif - ci->configure(CODEC_SET_FILEBUF_LIMIT, (int *)(1024*1024*2)); ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, (int *)(1024*16)); ci->configure(CODEC_SET_FILEBUF_WATERMARK, (int *)(1024*512)); 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) rb->memcpy(iramstart, iramcopy, iramend-iramstart); #endif - ci->configure(CODEC_SET_FILEBUF_LIMIT, (int *)(1024*1024*10)); ci->configure(CODEC_SET_FILEBUF_WATERMARK, (int *)(1024*512)); ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, (int *)(1024*128)); 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) ci->memcpy(iramstart, iramcopy, iramend-iramstart); #endif - ci->configure(CODEC_SET_FILEBUF_LIMIT, (int *)(1024*1024*10)); ci->configure(CODEC_SET_FILEBUF_WATERMARK, (int *)(1024*512)); ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, (int *)(1024*128)); 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) ci->configure(DSP_SET_SAMPLE_DEPTH, (int *)(MAD_F_FRACBITS)); ci->configure(DSP_SET_CLIP_MIN, (int *)-MAD_F_ONE); ci->configure(DSP_SET_CLIP_MAX, (int *)(MAD_F_ONE - 1)); - ci->configure(CODEC_SET_FILEBUF_LIMIT, (int *)(1024*1024*2)); ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, (int *)(1024*16)); 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) /* disable these until we can figure out what's going on. ci->configure(DSP_SET_CLIP_MAX, (long *)MPC_FIXED_POINT_SCALE); ci->configure(DSP_SET_CLIP_MIN, (long *)-MPC_FIXED_POINT_SCALE);*/ - ci->configure(CODEC_SET_FILEBUF_LIMIT, (long *)(1024*1024*2)); ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, (long *)(1024*16)); /* 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) ci->memcpy(iramstart, iramcopy, iramend-iramstart); #endif - ci->configure(CODEC_SET_FILEBUF_LIMIT, (int *)(1024*1024*10)); ci->configure(CODEC_SET_FILEBUF_WATERMARK, (int *)(1024*512)); ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, (int *)(1024*128)); 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) /* Note: These are sane defaults for these values. Perhaps * they should be set differently based on quality setting */ - rb->configure(CODEC_SET_FILEBUF_LIMIT, (long *)(1024*1024*2)); /* The chunk size below is magic. If set any lower, resume * 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) ci->memcpy(iramstart, iramcopy, iramend-iramstart); #endif - ci->configure(CODEC_SET_FILEBUF_LIMIT, (int *)(1024*1024*10)); ci->configure(CODEC_SET_FILEBUF_WATERMARK, (int *)(1024*512)); ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, (int *)(1024*256)); 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) ci->memcpy(iramstart, iramcopy, iramend-iramstart); #endif - ci->configure(CODEC_SET_FILEBUF_LIMIT, (int *)(1024*1024*10)); ci->configure(CODEC_SET_FILEBUF_WATERMARK, (int *)(1024*512)); ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, (int *)(1024*128)); -- cgit v1.2.3