From 87f83cd60537de472248311f48b6eb4cde6801d4 Mon Sep 17 00:00:00 2001 From: Brad Midgley Date: Fri, 30 Nov 2007 15:53:04 +0000 Subject: combine two conditionals in bit packing --- sbc/sbc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'sbc') diff --git a/sbc/sbc.c b/sbc/sbc.c index a785c48d..001910a5 100644 --- a/sbc/sbc.c +++ b/sbc/sbc.c @@ -1153,15 +1153,11 @@ static int sbc_pack_frame(uint8_t *data, struct sbc_frame *frame, size_t len) for (blk = 0; blk < frame->blocks; blk++) { for (ch = 0; ch < frame->channels; ch++) { for (sb = 0; sb < frame->subbands; sb++) { - if (levels[ch][sb] > 0) + if (levels[ch][sb] > 0) { audio_sample = (uint16_t) ((((frame->sb_sample_f[blk][ch][sb]*levels[ch][sb]) >> (frame->scale_factor[ch][sb] + 1)) + levels[ch][sb]) >> 1); - else - audio_sample = 0; - - if (bits[ch][sb] != 0) { audio_sample <<= 16 - bits[ch][sb]; for (bit = 0; bit < bits[ch][sb]; bit++) { data[produced >> 3] <<= 1; -- cgit