ref: 6f5ed87b5d7aa73bd598018025cd655135c4c166
parent: 0d1f2bd7bb45a4915cff6f4d1d5e6a8fafb8c26a
author: menno <menno>
date: Tue Jan 18 09:16:33 EST 2000
Fixed encoding of some samplerates
--- a/psych.c
+++ b/psych.c
@@ -52,9 +52,9 @@
Source file:
-$Id: psych.c,v 1.24 2000/01/10 19:50:24 menno Exp $
-$Id: psych.c,v 1.24 2000/01/10 19:50:24 menno Exp $
-$Id: psych.c,v 1.24 2000/01/10 19:50:24 menno Exp $
+$Id: psych.c,v 1.25 2000/01/18 14:16:33 menno Exp $
+$Id: psych.c,v 1.25 2000/01/18 14:16:33 menno Exp $
+$Id: psych.c,v 1.25 2000/01/18 14:16:33 menno Exp $
**********************************************************************/
@@ -80,8 +80,8 @@
}, { 11025, 43, 15, {8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 12, 12, 12,
- 12, 12, 12, 12, 12, 12, 16, 16, 16, 16, 20, 20, 20, 20,
- 24, 28, 28, 32, 40, 40, 44, 44, 48, 52, 56, 60, 64, 64, 64
+ 12, 12, 12, 12, 12, 12, 16, 16, 16, 16, 20, 20, 20, 24,
+ 24, 28, 28, 32, 36, 40, 40, 44, 48, 52, 56, 60, 64, 64, 64
}, {4, 4, 4, 4, 4, 4, 4, 4, 8, 8, 12, 12, 16, 20, 20
}
@@ -88,8 +88,8 @@
}, { 12000, 43, 15, {8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 12, 12, 12,
- 12, 12, 12, 12, 12, 12, 16, 16, 16, 16, 20, 20, 20, 20,
- 24, 28, 28, 32, 40, 40, 44, 44, 48, 52, 56, 60, 64, 64, 64
+ 12, 12, 12, 12, 12, 12, 16, 16, 16, 16, 20, 20, 20, 24,
+ 24, 28, 28, 32, 36, 40, 40, 44, 48, 52, 56, 60, 64, 64, 64
}, {4, 4, 4, 4, 4, 4, 4, 4, 8, 8, 12, 12, 16, 20, 20
}
@@ -96,8 +96,8 @@
}, { 16000, 43, 15, {8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 12, 12, 12,
- 12, 12, 12, 12, 12, 12, 16, 16, 16, 16, 20, 20, 20, 20,
- 24, 28, 28, 32, 40, 40, 44, 44, 48, 52, 56, 60, 64, 64, 64
+ 12, 12, 12, 12, 12, 12, 16, 16, 16, 16, 20, 20, 20, 24,
+ 24, 28, 28, 32, 36, 40, 40, 44, 48, 52, 56, 60, 64, 64, 64
}, {4, 4, 4, 4, 4, 4, 4, 4, 8, 8, 12, 12, 16, 20, 20
}
@@ -355,7 +355,7 @@
b1 = dyn_long.bval[bb];
//tmpx = (b2 >= b1) ? 3.0*(b2-b1) : 1.5*(b2-b1);
- tmpx = (bb >= b) ? 3.0*(b2-b1) : 1.5*(b2-b1);
+ tmpx = (b >= bb) ? 3.0*(b2-b1) : 1.5*(b2-b1);
tmpz = 8.0 * psy_min( (tmpx-0.5)*(tmpx-0.5) - 2.0*(tmpx-0.5),0.0 );
@@ -371,7 +371,7 @@
b1 = dyn_short.bval[bb];
//tmpx = (b2 >= b1) ? 3.0*(b2-b1) : 1.5*(b2-b1);
- tmpx = (bb >= b) ? 3.0*(b2-b1) : 1.5*(b2-b1);
+ tmpx = (b >= bb) ? 3.0*(b2-b1) : 1.5*(b2-b1);
tmpz = 8.0 * psy_min( (tmpx-0.5)*(tmpx-0.5) - 2.0*(tmpx-0.5),0.0 );