diff options
author | Brandon Low <lostlogic@rockbox.org> | 2006-05-08 11:03:19 +0000 |
---|---|---|
committer | Brandon Low <lostlogic@rockbox.org> | 2006-05-08 11:03:19 +0000 |
commit | ddaf5f096c4b47cdc250bbb739bd2952b3d1129f (patch) | |
tree | 5fcf31d54965d75031cf3c20d59a9cf89b31bfc5 | |
parent | b9b2bcd9b9706abe5898813ac26c33d02ba1a996 (diff) | |
download | rockbox-ddaf5f096c4b47cdc250bbb739bd2952b3d1129f.tar.gz rockbox-ddaf5f096c4b47cdc250bbb739bd2952b3d1129f.zip |
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
-rw-r--r-- | apps/pcmbuf.c | 2 | ||||
-rw-r--r-- | apps/pcmbuf.h | 4 |
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) { | |||
353 | } | 353 | } |
354 | 354 | ||
355 | int pcmbuf_descs(void) { | 355 | int pcmbuf_descs(void) { |
356 | return pcmbuf_size / PCMBUF_TARGET_CHUNK; | 356 | return pcmbuf_size / PCMBUF_MINAVG_CHUNK; |
357 | } | 357 | } |
358 | 358 | ||
359 | size_t get_pcmbuf_descsize(void) { | 359 | 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 @@ | |||
21 | 21 | ||
22 | #define PCMBUF_TARGET_CHUNK 32768 /* This is the target fill size of chunks | 22 | #define PCMBUF_TARGET_CHUNK 32768 /* This is the target fill size of chunks |
23 | on the pcm buffer */ | 23 | on the pcm buffer */ |
24 | #define PCMBUF_MINAVG_CHUNK 24576 /* This is the minimum average size of | ||
25 | chunks on the pcm buffer (or we run out | ||
26 | of buffer descriptors, which is | ||
27 | non-fatal) */ | ||
24 | #define PCMBUF_MIN_CHUNK 4096 /* We try to never feed a chunk smaller than | 28 | #define PCMBUF_MIN_CHUNK 4096 /* We try to never feed a chunk smaller than |
25 | this to the DMA */ | 29 | this to the DMA */ |
26 | #define PCMBUF_MIX_CHUNK 8192 /* This is the maximum size of one packet | 30 | #define PCMBUF_MIX_CHUNK 8192 /* This is the maximum size of one packet |