summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Low <lostlogic@rockbox.org>2006-04-25 10:39:56 +0000
committerBrandon Low <lostlogic@rockbox.org>2006-04-25 10:39:56 +0000
commit192476963129e50d1a064efec9053239593fbbbc (patch)
tree057e2aa18b1422d4fd885e17e94ca30552762f71
parent9aa49a436037dce7d891bb9f4ee63a7920a7c5bd (diff)
downloadrockbox-192476963129e50d1a064efec9053239593fbbbc.zip
rockbox-192476963129e50d1a064efec9053239593fbbbc.tar.gz
rockbox-192476963129e50d1a064efec9053239593fbbbc.tar.bz2
rockbox-192476963129e50d1a064efec9053239593fbbbc.tar.xz
Fix crossfade. Again.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9797 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/pcmbuf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/pcmbuf.c b/apps/pcmbuf.c
index 817f68b..f95baf9 100644
--- a/apps/pcmbuf.c
+++ b/apps/pcmbuf.c
@@ -470,7 +470,7 @@ static void crossfade_process_buffer(size_t fade_in_delay,
while (fade_out_rem > 0)
{
/* Each 1/10 second of audio will have the same fade applied */
- size_t block_rem = MIN(NATIVE_FREQUENCY * 2 / 10, fade_out_rem);
+ size_t block_rem = MIN(NATIVE_FREQUENCY * 4 / 10, fade_out_rem);
int factor = (fade_out_rem << 8) / total_fade_out;
fade_out_rem -= block_rem;
@@ -483,7 +483,7 @@ static void crossfade_process_buffer(size_t fade_in_delay,
int sample = buf[fade_out_sample];
buf[fade_out_sample++] = (sample * factor) >> 8;
- block_rem--;
+ block_rem -= 2;
/* Move to the next chunk as needed */
if (fade_out_sample * 2 >= fade_out_chunk->size)
{