aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Munaut <tnt@246tNt.com>2013-03-01 16:35:46 +0100
committerSylvain Munaut <tnt@246tNt.com>2013-03-01 16:35:46 +0100
commited8170ac676a0a59df39f9c73ec84996fc222145 (patch)
tree0ab3d6a90a6ca37216953b90201961c56af92411
parenta6428d2376034d619f342897d3ce415b3f9a3584 (diff)
codec: Fix the GSM 06.20 ordering tables
Seems the script I used to parse those had a bug where range of bits in the 'decreasing' direction ( like 6..0 ) were not processed properly. Thanks to Andreas for noticing this ! Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
-rw-r--r--src/codec/gsm620.c82
1 files changed, 41 insertions, 41 deletions
diff --git a/src/codec/gsm620.c b/src/codec/gsm620.c
index fa570e4f..f4ac9ad8 100644
--- a/src/codec/gsm620.c
+++ b/src/codec/gsm620.c
@@ -35,36 +35,36 @@ const uint16_t gsm620_unvoiced_bitorder[112] = {
90, /* GSP 0-3:2 */
109, /* GSP 0-4:2 */
15, /* LPC 1:0 */
- 23, /* LPC 2:1 */
- 22, /* LPC 2:2 */
- 21, /* LPC 2:3 */
- 20, /* LPC 2:4 */
19, /* LPC 2:5 */
- 31, /* LPC 3:1 */
- 30, /* LPC 3:2 */
- 29, /* LPC 3:3 */
- 28, /* LPC 3:4 */
- 27, /* LPC 3:5 */
+ 20, /* LPC 2:4 */
+ 21, /* LPC 2:3 */
+ 22, /* LPC 2:2 */
+ 23, /* LPC 2:1 */
26, /* LPC 3:6 */
+ 27, /* LPC 3:5 */
+ 28, /* LPC 3:4 */
+ 29, /* LPC 3:3 */
+ 30, /* LPC 3:2 */
+ 31, /* LPC 3:1 */
61, /* Code 1-2:0 */
- 68, /* Code 2-2:0 */
- 67, /* Code 2-2:1 */
- 66, /* Code 2-2:2 */
- 65, /* Code 2-2:3 */
- 64, /* Code 2-2:4 */
- 63, /* Code 2-2:5 */
62, /* Code 2-2:6 */
- 80, /* Code 1-3:0 */
- 79, /* Code 1-3:1 */
- 78, /* Code 1-3:2 */
- 77, /* Code 1-3:3 */
- 76, /* Code 1-3:4 */
- 75, /* Code 1-3:5 */
+ 63, /* Code 2-2:5 */
+ 64, /* Code 2-2:4 */
+ 65, /* Code 2-2:3 */
+ 66, /* Code 2-2:2 */
+ 67, /* Code 2-2:1 */
+ 68, /* Code 2-2:0 */
74, /* Code 1-3:6 */
- 84, /* Code 2-3:3 */
- 83, /* Code 2-3:4 */
- 82, /* Code 2-3:5 */
+ 75, /* Code 1-3:5 */
+ 76, /* Code 1-3:4 */
+ 77, /* Code 1-3:3 */
+ 78, /* Code 1-3:2 */
+ 79, /* Code 1-3:1 */
+ 80, /* Code 1-3:0 */
81, /* Code 2-3:6 */
+ 82, /* Code 2-3:5 */
+ 83, /* Code 2-3:4 */
+ 84, /* Code 2-3:3 */
32, /* LPC 3:0 */
4, /* R0:0 */
33, /* INT-LPC:0 */
@@ -106,9 +106,9 @@ const uint16_t gsm620_unvoiced_bitorder[112] = {
89, /* GSP 0-3:3 */
70, /* GSP 0-2:3 */
51, /* GSP 0-1:3 */
- 18, /* LPC 2:6 */
- 17, /* LPC 2:7 */
16, /* LPC 2:8 */
+ 17, /* LPC 2:7 */
+ 18, /* LPC 2:6 */
107, /* GSP 0-4:4 */
88, /* GSP 0-3:4 */
69, /* GSP 0-2:4 */
@@ -149,9 +149,9 @@ const uint16_t gsm620_unvoiced_bitorder[112] = {
const uint16_t gsm620_voiced_bitorder[112] = {
13, /* LPC 1:2 */
14, /* LPC 1:1 */
- 20, /* LPC 2:4 */
- 19, /* LPC 2:5 */
18, /* LPC 2:6 */
+ 19, /* LPC 2:5 */
+ 20, /* LPC 2:4 */
53, /* GSP 0-1:4 */
71, /* GSP 0-2:4 */
89, /* GSP 0-3:4 */
@@ -164,22 +164,22 @@ const uint16_t gsm620_voiced_bitorder[112] = {
73, /* GSP 0-2:2 */
91, /* GSP 0-3:2 */
109, /* GSP 0-4:2 */
- 52, /* Code 1:0 */
- 51, /* Code 1:1 */
- 50, /* Code 1:2 */
- 49, /* Code 1:3 */
- 48, /* Code 1:4 */
- 47, /* Code 1:5 */
- 46, /* Code 1:6 */
- 45, /* Code 1:7 */
44, /* Code 1:8 */
- 65, /* Code 2:5 */
- 64, /* Code 2:6 */
- 63, /* Code 2:7 */
+ 45, /* Code 1:7 */
+ 46, /* Code 1:6 */
+ 47, /* Code 1:5 */
+ 48, /* Code 1:4 */
+ 49, /* Code 1:3 */
+ 50, /* Code 1:2 */
+ 51, /* Code 1:1 */
+ 52, /* Code 1:0 */
62, /* Code 2:8 */
- 70, /* Code 2:0 */
- 69, /* Code 2:1 */
+ 63, /* Code 2:7 */
+ 64, /* Code 2:6 */
+ 65, /* Code 2:5 */
68, /* Code 2:2 */
+ 69, /* Code 2:1 */
+ 70, /* Code 2:0 */
80, /* Code 3:8 */
66, /* Code 2:4 */
67, /* Code 2:3 */