From 8083e8c0de4d03985afe72f83bd9c76ce715ce41 Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Sun, 26 Mar 2006 17:41:36 +0000 Subject: Fixed potential sample overflow in variable stereo width > 100% and karaoke mode, both hwcodec and swcodec. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9263 a1c6a512-1295-4272-9138-f99709370657 --- firmware/sound.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'firmware') diff --git a/firmware/sound.c b/firmware/sound.c index 88412c4094..70f7346599 100644 --- a/firmware/sound.c +++ b/firmware/sound.c @@ -504,12 +504,12 @@ static void set_channel_config(void) } else { - fp_straight = - (1<<19); - fp_cross = ((2 * fp_width / (((1<<19) + fp_width) >> 10)) - << 9) - (1<<19); + /* straight = - (1 + width) / (2 * width) */ + fp_straight = - ((((1<<19) + fp_width) / (fp_width >> 9)) << 9); + fp_cross = (1<<19) + fp_straight; } - val_ll = val_rr = fp_straight & 0xFFFFF; - val_lr = val_rl = fp_cross & 0xFFFFF; + val_ll = val_rr = fp_straight & 0xfffff; + val_lr = val_rl = fp_cross & 0xfffff; } break; @@ -528,10 +528,10 @@ static void set_channel_config(void) break; case SOUND_CHAN_KARAOKE: - val_ll = 0x80001; - val_lr = 0x7ffff; - val_rl = 0x7ffff; - val_rr = 0x80001; + val_ll = 0xc0000; + val_lr = 0x40000; + val_rl = 0x40000; + val_rr = 0xc0000; break; } -- cgit v1.2.3