summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSiarhei Siamashka <siarhei.siamashka@nokia.com>2008-12-27 19:36:14 +0200
committerMarcel Holtmann <marcel@holtmann.org>2008-12-29 11:31:59 +0100
commit635e9348a95ee44b208acfb9712ea18f5a10be68 (patch)
treefc73081960c94ce5e212514ea7e40f3be83e6c5e
parent741d1bf2589472c9c18ce2a5b4dbf93e1ffa1681 (diff)
Fixed subbands selection for joint-stereo in SBC encoder
-rw-r--r--sbc/sbc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sbc/sbc.c b/sbc/sbc.c
index a3a3ac10..d3dcd9a3 100644
--- a/sbc/sbc.c
+++ b/sbc/sbc.c
@@ -1051,15 +1051,15 @@ static int sbc_pack_frame(uint8_t *data, struct sbc_frame *frame, size_t len)
}
/* decide whether to join this subband */
- if ((scalefactor[0][sb] + scalefactor[1][sb]) >
- (scalefactor_j[0] + scalefactor_j[1]) ) {
+ if ((frame->scale_factor[0][sb] +
+ frame->scale_factor[1][sb]) >
+ (scale_factor_j[0] +
+ scale_factor_j[1])) {
/* use joint stereo for this subband */
joint |= 1 << (frame->subbands - 1 - sb);
frame->joint |= 1 << sb;
frame->scale_factor[0][sb] = scale_factor_j[0];
frame->scale_factor[1][sb] = scale_factor_j[1];
- scalefactor[0][sb] = scalefactor_j[0];
- scalefactor[1][sb] = scalefactor_j[1];
for (blk = 0; blk < frame->blocks; blk++) {
frame->sb_sample_f[blk][0][sb] =
sb_sample_j[blk][0];