Calculate watermark from bitrate and harddisk spinup time.

Use a smaller PCM buffer on targets with 2MB or less ram.
(FS#9703)


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19743 a1c6a512-1295-4272-9138-f99709370657

21 files changed, 8 insertions, 35 deletions

diff --git a/apps/codecs/aac.c b/apps/codecs/aac.c
index b781102469..60460355da 100644
--- a/apps/codecs/aac.c
+++ b/apps/codecs/aac.c
@@ -55,8 +55,6 @@ enum codec_status codec_main(void)
     unsigned char c = 0;
 
     /* Generic codec initialisation */
-    ci->configure(CODEC_SET_FILEBUF_WATERMARK, 1024*512);
-
     ci->configure(DSP_SET_STEREO_MODE, STEREO_NONINTERLEAVED);
     ci->configure(DSP_SET_SAMPLE_DEPTH, 29);
 
diff --git a/apps/codecs/aiff.c b/apps/codecs/aiff.c
index 53593fcaa8..9a675415e2 100644
--- a/apps/codecs/aiff.c
+++ b/apps/codecs/aiff.c
@@ -66,7 +66,6 @@ enum codec_status codec_main(void)
 
     /* Generic codec initialisation */
     ci->configure(DSP_SET_SAMPLE_DEPTH, 28);
-    ci->configure(CODEC_SET_FILEBUF_WATERMARK, 1024*512);
   
 next_track:
     if (codec_init()) {
diff --git a/apps/codecs/alac.c b/apps/codecs/alac.c
index 367be14824..fdc6748a95 100644
--- a/apps/codecs/alac.c
+++ b/apps/codecs/alac.c
@@ -44,8 +44,6 @@ enum codec_status codec_main(void)
   int retval;
 
   /* Generic codec initialisation */
-  ci->configure(CODEC_SET_FILEBUF_WATERMARK, 1024*512);
-
   ci->configure(DSP_SET_STEREO_MODE, STEREO_NONINTERLEAVED);
   ci->configure(DSP_SET_SAMPLE_DEPTH, ALAC_OUTPUT_DEPTH-1);
 
diff --git a/apps/codecs/ape.c b/apps/codecs/ape.c
index dbe6e0fc9e..6c829c3863 100644
--- a/apps/codecs/ape.c
+++ b/apps/codecs/ape.c
@@ -147,8 +147,6 @@ enum codec_status codec_main(void)
     size_t resume_offset;
 
     /* Generic codec initialisation */
-    ci->configure(CODEC_SET_FILEBUF_WATERMARK, 1024*512);
-
     ci->configure(DSP_SET_SAMPLE_DEPTH, APE_OUTPUT_DEPTH-1);
 
     next_track:
diff --git a/apps/codecs/asap.c b/apps/codecs/asap.c
index 9e2228bf84..bb627ad06c 100644
--- a/apps/codecs/asap.c
+++ b/apps/codecs/asap.c
@@ -38,9 +38,6 @@ enum codec_status codec_main(void)
     char* module;
     int bytesPerSample =2;
     
-    /* Generic codec initialisation */
-    ci->configure(CODEC_SET_FILEBUF_WATERMARK, 1024*512);
-    
 next_track:
     if (codec_init()) {
         DEBUGF("codec init failed\n");
diff --git a/apps/codecs/demac/libdemac/decoder.h b/apps/codecs/demac/libdemac/decoder.h
index 0c3bd15b37..aeac569509 100644
--- a/apps/codecs/demac/libdemac/decoder.h
+++ b/apps/codecs/demac/libdemac/decoder.h
@@ -2,7 +2,7 @@
 
 libdemac - A Monkey's Audio decoder
 
-$Id:$
+$Id$
 
 Copyright (C) Dave Chapman 2007
 
diff --git a/apps/codecs/demac/libdemac/demac.h b/apps/codecs/demac/libdemac/demac.h
index d1bb361574..696b2aba73 100644
--- a/apps/codecs/demac/libdemac/demac.h
+++ b/apps/codecs/demac/libdemac/demac.h
@@ -2,7 +2,7 @@
 
 libdemac - A Monkey's Audio decoder
 
-$Id:$
+$Id$
 
 Copyright (C) Dave Chapman 2007
 
diff --git a/apps/codecs/demac/libdemac/filter_1280_15.c b/apps/codecs/demac/libdemac/filter_1280_15.c
index edf1ce1bb1..7077e0ee8e 100644
--- a/apps/codecs/demac/libdemac/filter_1280_15.c
+++ b/apps/codecs/demac/libdemac/filter_1280_15.c
@@ -2,7 +2,7 @@
 
 libdemac - A Monkey's Audio decoder
 
-$Id:$
+$Id$
 
 Copyright (C) Dave Chapman 2007
 
diff --git a/apps/codecs/demac/libdemac/filter_16_11.c b/apps/codecs/demac/libdemac/filter_16_11.c
index 07e4b96dc2..94c56e247f 100644
--- a/apps/codecs/demac/libdemac/filter_16_11.c
+++ b/apps/codecs/demac/libdemac/filter_16_11.c
@@ -2,7 +2,7 @@
 
 libdemac - A Monkey's Audio decoder
 
-$Id:$
+$Id$
 
 Copyright (C) Dave Chapman 2007
 
diff --git a/apps/codecs/demac/libdemac/filter_256_13.c b/apps/codecs/demac/libdemac/filter_256_13.c
index 370dec1d5a..69cf638903 100644
--- a/apps/codecs/demac/libdemac/filter_256_13.c
+++ b/apps/codecs/demac/libdemac/filter_256_13.c
@@ -2,7 +2,7 @@
 
 libdemac - A Monkey's Audio decoder
 
-$Id:$
+$Id$
 
 Copyright (C) Dave Chapman 2007
 
diff --git a/apps/codecs/demac/libdemac/filter_32_10.c b/apps/codecs/demac/libdemac/filter_32_10.c
index b585de98a4..5ec85089db 100644
--- a/apps/codecs/demac/libdemac/filter_32_10.c
+++ b/apps/codecs/demac/libdemac/filter_32_10.c
@@ -2,7 +2,7 @@
 
 libdemac - A Monkey's Audio decoder
 
-$Id:$
+$Id$
 
 Copyright (C) Dave Chapman 2007
 
diff --git a/apps/codecs/demac/libdemac/filter_64_11.c b/apps/codecs/demac/libdemac/filter_64_11.c
index 8b8d326d1d..cd74fa5f6b 100644
--- a/apps/codecs/demac/libdemac/filter_64_11.c
+++ b/apps/codecs/demac/libdemac/filter_64_11.c
@@ -2,7 +2,7 @@
 
 libdemac - A Monkey's Audio decoder
 
-$Id:$
+$Id$
 
 Copyright (C) Dave Chapman 2007
 
diff --git a/apps/codecs/demac/wavwrite.h b/apps/codecs/demac/wavwrite.h
index eba8ac7e31..a124353229 100644
--- a/apps/codecs/demac/wavwrite.h
+++ b/apps/codecs/demac/wavwrite.h
@@ -2,7 +2,7 @@
 
 demac - A Monkey's Audio decoder
 
-$Id:$
+$Id$
 
 Copyright (C) Dave Chapman 2007
 
diff --git a/apps/codecs/flac.c b/apps/codecs/flac.c
index 3a23d0b951..00d2c16993 100644
--- a/apps/codecs/flac.c
+++ b/apps/codecs/flac.c
@@ -423,8 +423,6 @@ enum codec_status codec_main(void)
     int retval;
 
     /* Generic codec initialisation */
-    ci->configure(CODEC_SET_FILEBUF_WATERMARK, 1024*512);
-
     ci->configure(DSP_SET_SAMPLE_DEPTH, FLAC_OUTPUT_DEPTH-1);
 
     next_track:
diff --git a/apps/codecs/mod.c b/apps/codecs/mod.c
index 91b5955b40..523e1c7d0b 100644
--- a/apps/codecs/mod.c
+++ b/apps/codecs/mod.c
@@ -1229,9 +1229,6 @@ enum codec_status codec_main(void)
 
     int bytesdone;
 
-    ci->configure(CODEC_SET_FILEBUF_WATERMARK, 1024*512);
-
-
 next_track:
     if (codec_init()) {
         return CODEC_ERROR;
diff --git a/apps/codecs/shorten.c b/apps/codecs/shorten.c
index 4e00b9a579..9b5c2e2f17 100644
--- a/apps/codecs/shorten.c
+++ b/apps/codecs/shorten.c
@@ -47,8 +47,6 @@ enum codec_status codec_main(void)
     size_t bytesleft;
 
     /* Generic codec initialisation */
-    ci->configure(CODEC_SET_FILEBUF_WATERMARK, 1024*512);
-
     ci->configure(DSP_SET_STEREO_MODE, STEREO_NONINTERLEAVED);
     ci->configure(DSP_SET_SAMPLE_DEPTH, SHN_OUTPUT_DEPTH-1);
     
diff --git a/apps/codecs/sid.c b/apps/codecs/sid.c
index 087ad754fb..c00aa22142 100644
--- a/apps/codecs/sid.c
+++ b/apps/codecs/sid.c
@@ -1215,9 +1215,6 @@ enum codec_status codec_main(void)
     int nSamplesPerCall = 882;  /* This is PAL SID single speed (44100/50Hz) */
     int nSamplesToRender = 0;
 
-    /* Generic codec initialisation */
-    ci->configure(CODEC_SET_FILEBUF_WATERMARK, 1024*512);
-
 next_track:
     if (codec_init()) {
         return CODEC_ERROR;
diff --git a/apps/codecs/spc.c b/apps/codecs/spc.c
index 14d28dfca8..5ac594431a 100644
--- a/apps/codecs/spc.c
+++ b/apps/codecs/spc.c
@@ -559,8 +559,6 @@ enum codec_status codec_main(void)
 
         /* Read the entire file */
         DEBUGF("SPC: request initial buffer\n");
-        ci->configure(CODEC_SET_FILEBUF_WATERMARK, ci->filesize);
-
         ci->seek_buffer(0);
         size_t buffersize;
         uint8_t* buffer = ci->request_buffer(&buffersize, ci->filesize);
diff --git a/apps/codecs/wav.c b/apps/codecs/wav.c
index 4657891595..b3efbc10ce 100644
--- a/apps/codecs/wav.c
+++ b/apps/codecs/wav.c
@@ -228,7 +228,6 @@ enum codec_status codec_main(void)
  
     /* Generic codec initialisation */
     ci->configure(DSP_SET_SAMPLE_DEPTH, 28);
-    ci->configure(CODEC_SET_FILEBUF_WATERMARK, 1024*512);
   
 next_track:
     if (codec_init()) {
diff --git a/apps/codecs/wavpack.c b/apps/codecs/wavpack.c
index c93e2e0dcd..c85c254580 100644
--- a/apps/codecs/wavpack.c
+++ b/apps/codecs/wavpack.c
@@ -44,8 +44,6 @@ enum codec_status codec_main(void)
     int retval;
 
     /* Generic codec initialisation */
-    ci->configure(CODEC_SET_FILEBUF_WATERMARK, 1024*512);
-  
     ci->configure(DSP_SET_SAMPLE_DEPTH, 28);
 
     next_track:
diff --git a/apps/codecs/wma.c b/apps/codecs/wma.c
index 93f4e27136..b5dfa4cb00 100644
--- a/apps/codecs/wma.c
+++ b/apps/codecs/wma.c
@@ -468,8 +468,6 @@ enum codec_status codec_main(void)
     int errcount = 0;
 
     /* Generic codec initialisation */
-    ci->configure(CODEC_SET_FILEBUF_WATERMARK, 1024*512);
-
     ci->configure(DSP_SET_SAMPLE_DEPTH, 29);
 
 next_track: