Revert a previous change, works around the problem of freezing on stop-while-paused, and skipping with crossfade

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

2 files changed, 5 insertions, 1 deletions

diff --git a/apps/pcmbuf.c b/apps/pcmbuf.c
index 8d5f4e71c9..fda7543c02 100644
--- a/apps/pcmbuf.c
+++ b/apps/pcmbuf.c
@@ -353,7 +353,7 @@ int pcmbuf_used_descs(void) {
 }
 
 int pcmbuf_descs(void) {
-    return pcmbuf_size / PCMBUF_TARGET_CHUNK;
+    return pcmbuf_size / PCMBUF_MINAVG_CHUNK;
 }
 
 size_t get_pcmbuf_descsize(void) {
diff --git a/apps/pcmbuf.h b/apps/pcmbuf.h
index ffd62ed1b6..15633d5214 100644
--- a/apps/pcmbuf.h
+++ b/apps/pcmbuf.h
@@ -21,6 +21,10 @@
 
 #define PCMBUF_TARGET_CHUNK 32768 /* This is the target fill size of chunks
                                      on the pcm buffer */
+#define PCMBUF_MINAVG_CHUNK 24576 /* This is the minimum average size of
+                                     chunks on the pcm buffer (or we run out
+                                     of buffer descriptors, which is
+                                     non-fatal) */
 #define PCMBUF_MIN_CHUNK     4096 /* We try to never feed a chunk smaller than
                                      this to the DMA */
 #define PCMBUF_MIX_CHUNK     8192 /* This is the maximum size of one packet