commit 635e9348a95ee44b208acfb9712ea18f5a10be68
author Siarhei Siamashka <siarhei.siamashka@nokia.com> Sat Dec 27 19:36:14 2008 +0200
committer Marcel Holtmann <marcel@holtmann.org> Mon Dec 29 11:31:59 2008 +0100
tree fc73081960c94ce5e212514ea7e40f3be83e6c5e
parent 741d1bf2589472c9c18ce2a5b4dbf93e1ffa1681

Fixed subbands selection for joint-stereo in SBC encoder

sbc/sbc.c

diff --git a/sbc/sbc.c b/sbc/sbc.c
index a3a3ac1..d3dcd9a 100644
--- a/sbc/sbc.c
+++ b/sbc/sbc.c
@@ -1051,15 +1051,15 @@
 			}
 
 			/* 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];