annotate libfaad2/huffman.c @ 11896:71a4c2eb1340

100l for forgetting to update this. It would brake building after distclean.
author wight
date Fri, 30 Jan 2004 21:32:42 +0000
parents 3185f64f6350
children 4a370c80fe5c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
10989
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
1 /*
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
2 ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
3 ** Copyright (C) 2003 M. Bakker, Ahead Software AG, http://www.nero.com
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
4 **
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
5 ** This program is free software; you can redistribute it and/or modify
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
6 ** it under the terms of the GNU General Public License as published by
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
7 ** the Free Software Foundation; either version 2 of the License, or
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
8 ** (at your option) any later version.
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
9 **
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
10 ** This program is distributed in the hope that it will be useful,
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
11 ** but WITHOUT ANY WARRANTY; without even the implied warranty of
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
12 ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
13 ** GNU General Public License for more details.
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
14 **
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
15 ** You should have received a copy of the GNU General Public License
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
16 ** along with this program; if not, write to the Free Software
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
17 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
18 **
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
19 ** Any non-GPL usage of this software or parts of this software is strictly
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
20 ** forbidden.
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
21 **
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
22 ** Commercial non-GPL licensing of this software is possible.
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
23 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
24 **
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
25 ** $Id: huffman.c,v 1.4 2003/09/09 18:12:00 menno Exp $
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
26 **/
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
27
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
28 #include "common.h"
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
29 #include "structs.h"
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
30
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
31 #include <stdlib.h>
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
32 #ifdef ANALYSIS
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
33 #include <stdio.h>
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
34 #endif
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
35
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
36 #include "bits.h"
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
37 #include "huffman.h"
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
38 #include "codebook/hcb.h"
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
39
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
40
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
41 int8_t huffman_scale_factor(bitfile *ld)
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
42 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
43 uint16_t offset = 0;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
44
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
45 while (hcb_sf[offset][1])
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
46 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
47 uint8_t b = faad_get1bit(ld
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
48 DEBUGVAR(1,255,"huffman_scale_factor()"));
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
49 offset += hcb_sf[offset][b];
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
50
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
51 if (offset > 240)
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
52 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
53 /* printf("ERROR: offset into hcb_sf = %d >240!\n", offset); */
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
54 return -1;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
55 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
56 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
57
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
58 return hcb_sf[offset][0];
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
59 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
60
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
61
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
62 hcb *hcb_table[] = {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
63 0, hcb1_1, hcb2_1, 0, hcb4_1, 0, hcb6_1, 0, hcb8_1, 0, hcb10_1, hcb11_1
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
64 };
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
65
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
66 hcb_2_quad *hcb_2_quad_table[] = {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
67 0, hcb1_2, hcb2_2, 0, hcb4_2, 0, 0, 0, 0, 0, 0, 0
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
68 };
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
69
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
70 hcb_2_pair *hcb_2_pair_table[] = {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
71 0, 0, 0, 0, 0, 0, hcb6_2, 0, hcb8_2, 0, hcb10_2, hcb11_2
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
72 };
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
73
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
74 hcb_bin_pair *hcb_bin_table[] = {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
75 0, 0, 0, 0, 0, hcb5, 0, hcb7, 0, hcb9, 0, 0
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
76 };
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
77
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
78 uint8_t hcbN[] = { 0, 5, 5, 0, 5, 0, 5, 0, 5, 0, 6, 5 };
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
79
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
80 /* defines whether a huffman codebook is unsigned or not */
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
81 /* Table 4.6.2 */
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
82 uint8_t unsigned_cb[] = { 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0,
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
83 /* codebook 16 to 31 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
84 };
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
85
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
86 int hcb_2_quad_table_size[] = { 0, 114, 86, 0, 185, 0, 0, 0, 0, 0, 0, 0 };
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
87 int hcb_2_pair_table_size[] = { 0, 0, 0, 0, 0, 0, 126, 0, 83, 0, 210, 373 };
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
88 int hcb_bin_table_size[] = { 0, 0, 0, 161, 0, 161, 0, 127, 0, 337, 0, 0 };
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
89
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
90 static INLINE void huffman_sign_bits(bitfile *ld, int16_t *sp, uint8_t len)
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
91 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
92 uint8_t i;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
93
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
94 for (i = 0; i < len; i++)
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
95 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
96 if(sp[i])
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
97 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
98 if(faad_get1bit(ld
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
99 DEBUGVAR(1,5,"huffman_sign_bits(): sign bit")) & 1)
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
100 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
101 sp[i] = -sp[i];
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
102 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
103 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
104 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
105 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
106
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
107 static INLINE int16_t huffman_getescape(bitfile *ld, int16_t sp)
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
108 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
109 uint8_t neg, i;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
110 int16_t j;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
111 int32_t off;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
112
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
113 if (sp < 0)
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
114 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
115 if (sp != -16)
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
116 return sp;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
117 neg = 1;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
118 } else {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
119 if(sp != 16)
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
120 return sp;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
121 neg = 0;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
122 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
123
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
124 for (i = 4; ; i++)
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
125 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
126 if (faad_get1bit(ld
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
127 DEBUGVAR(1,6,"huffman_getescape(): escape size")) == 0)
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
128 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
129 break;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
130 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
131 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
132
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
133 off = faad_getbits(ld, i
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
134 DEBUGVAR(1,9,"huffman_getescape(): escape"));
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
135
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
136 j = off + (1<<i);
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
137 if (neg)
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
138 j = -j;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
139
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
140 return j;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
141 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
142
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
143 static uint8_t huffman_2step_quad(uint8_t cb, bitfile *ld, int16_t *sp)
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
144 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
145 uint32_t cw;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
146 uint16_t offset = 0;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
147 uint8_t extra_bits;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
148
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
149 cw = faad_showbits(ld, hcbN[cb]);
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
150 offset = hcb_table[cb][cw].offset;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
151 extra_bits = hcb_table[cb][cw].extra_bits;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
152
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
153 if (extra_bits)
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
154 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
155 /* we know for sure it's more than hcbN[cb] bits long */
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
156 faad_flushbits(ld, hcbN[cb]);
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
157 offset += (uint16_t)faad_showbits(ld, extra_bits);
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
158 faad_flushbits(ld, hcb_2_quad_table[cb][offset].bits - hcbN[cb]);
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
159 } else {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
160 faad_flushbits(ld, hcb_2_quad_table[cb][offset].bits);
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
161 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
162
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
163 if (offset > hcb_2_quad_table_size[cb])
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
164 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
165 /* printf("ERROR: offset into hcb_2_quad_table = %d >%d!\n", offset,
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
166 hcb_2_quad_table_size[cb]); */
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
167 return 10;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
168 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
169
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
170 sp[0] = hcb_2_quad_table[cb][offset].x;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
171 sp[1] = hcb_2_quad_table[cb][offset].y;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
172 sp[2] = hcb_2_quad_table[cb][offset].v;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
173 sp[3] = hcb_2_quad_table[cb][offset].w;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
174
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
175 return 0;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
176 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
177
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
178 static uint8_t huffman_2step_quad_sign(uint8_t cb, bitfile *ld, int16_t *sp)
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
179 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
180 uint8_t err = huffman_2step_quad(cb, ld, sp);
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
181 huffman_sign_bits(ld, sp, QUAD_LEN);
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
182
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
183 return err;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
184 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
185
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
186 static uint8_t huffman_2step_pair(uint8_t cb, bitfile *ld, int16_t *sp)
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
187 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
188 uint32_t cw;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
189 uint16_t offset = 0;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
190 uint8_t extra_bits;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
191
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
192 cw = faad_showbits(ld, hcbN[cb]);
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
193 offset = hcb_table[cb][cw].offset;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
194 extra_bits = hcb_table[cb][cw].extra_bits;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
195
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
196 if (extra_bits)
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
197 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
198 /* we know for sure it's more than hcbN[cb] bits long */
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
199 faad_flushbits(ld, hcbN[cb]);
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
200 offset += (uint16_t)faad_showbits(ld, extra_bits);
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
201 faad_flushbits(ld, hcb_2_pair_table[cb][offset].bits - hcbN[cb]);
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
202 } else {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
203 faad_flushbits(ld, hcb_2_pair_table[cb][offset].bits);
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
204 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
205
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
206 if (offset > hcb_2_pair_table_size[cb])
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
207 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
208 /* printf("ERROR: offset into hcb_2_pair_table = %d >%d!\n", offset,
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
209 hcb_2_pair_table_size[cb]); */
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
210 return 10;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
211 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
212
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
213 sp[0] = hcb_2_pair_table[cb][offset].x;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
214 sp[1] = hcb_2_pair_table[cb][offset].y;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
215
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
216 return 0;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
217 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
218
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
219 static huffman_2step_pair_sign(uint8_t cb, bitfile *ld, int16_t *sp)
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
220 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
221 uint8_t err = huffman_2step_pair(cb, ld, sp);
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
222 huffman_sign_bits(ld, sp, PAIR_LEN);
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
223
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
224 return err;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
225 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
226
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
227 static uint8_t huffman_binary_quad(uint8_t cb, bitfile *ld, int16_t *sp)
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
228 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
229 uint16_t offset = 0;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
230
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
231 while (!hcb3[offset].is_leaf)
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
232 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
233 uint8_t b = faad_get1bit(ld
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
234 DEBUGVAR(1,255,"huffman_spectral_data():3"));
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
235 offset += hcb3[offset].data[b];
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
236 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
237
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
238 if (offset > hcb_bin_table_size[cb])
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
239 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
240 /* printf("ERROR: offset into hcb_bin_table = %d >%d!\n", offset,
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
241 hcb_bin_table_size[cb]); */
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
242 return 10;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
243 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
244
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
245 sp[0] = hcb3[offset].data[0];
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
246 sp[1] = hcb3[offset].data[1];
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
247 sp[2] = hcb3[offset].data[2];
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
248 sp[3] = hcb3[offset].data[3];
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
249
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
250 return 0;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
251 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
252
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
253 static uint8_t huffman_binary_quad_sign(uint8_t cb, bitfile *ld, int16_t *sp)
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
254 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
255 uint8_t err = huffman_binary_quad(cb, ld, sp);
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
256 huffman_sign_bits(ld, sp, QUAD_LEN);
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
257
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
258 return err;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
259 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
260
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
261 static uint8_t huffman_binary_pair(uint8_t cb, bitfile *ld, int16_t *sp)
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
262 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
263 uint16_t offset = 0;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
264
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
265 while (!hcb_bin_table[cb][offset].is_leaf)
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
266 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
267 uint8_t b = faad_get1bit(ld
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
268 DEBUGVAR(1,255,"huffman_spectral_data():9"));
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
269 offset += hcb_bin_table[cb][offset].data[b];
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
270 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
271
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
272 if (offset > hcb_bin_table_size[cb])
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
273 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
274 /* printf("ERROR: offset into hcb_bin_table = %d >%d!\n", offset,
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
275 hcb_bin_table_size[cb]); */
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
276 return 10;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
277 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
278
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
279 sp[0] = hcb_bin_table[cb][offset].data[0];
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
280 sp[1] = hcb_bin_table[cb][offset].data[1];
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
281
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
282 return 0;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
283 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
284
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
285 static uint8_t huffman_binary_pair_sign(uint8_t cb, bitfile *ld, int16_t *sp)
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
286 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
287 uint8_t err = huffman_binary_pair(cb, ld, sp);
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
288 huffman_sign_bits(ld, sp, PAIR_LEN);
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
289
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
290 return err;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
291 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
292
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
293 static int16_t huffman_codebook(uint8_t i)
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
294 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
295 static const uint32_t data = 16428320;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
296 if (i == 0) return (int16_t)(data >> 16) & 0xFFFF;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
297 else return (int16_t)data & 0xFFFF;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
298 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
299
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
300 uint8_t huffman_spectral_data(uint8_t cb, bitfile *ld, int16_t *sp)
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
301 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
302 switch (cb)
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
303 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
304 case 1: /* 2-step method for data quadruples */
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
305 case 2:
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
306 return huffman_2step_quad(cb, ld, sp);
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
307 case 3: /* binary search for data quadruples */
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
308 return huffman_binary_quad_sign(cb, ld, sp);
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
309 case 4: /* 2-step method for data quadruples */
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
310 return huffman_2step_quad_sign(cb, ld, sp);
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
311 case 5: /* binary search for data pairs */
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
312 return huffman_binary_pair(cb, ld, sp);
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
313 case 6: /* 2-step method for data pairs */
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
314 return huffman_2step_pair(cb, ld, sp);
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
315 case 7: /* binary search for data pairs */
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
316 case 9:
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
317 return huffman_binary_pair_sign(cb, ld, sp);
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
318 case 8: /* 2-step method for data pairs */
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
319 case 10:
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
320 return huffman_2step_pair_sign(cb, ld, sp);
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
321 case 12: {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
322 uint8_t err = huffman_2step_quad(1, ld, sp);
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
323 sp[0] = huffman_codebook(0); sp[1] = huffman_codebook(1);
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
324 return err; }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
325 case 11:
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
326 #ifdef ERROR_RESILIENCE
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
327 /* VCB11 uses codebook 11 */
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
328 case 16: case 17: case 18: case 19: case 20: case 21: case 22: case 23:
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
329 case 24: case 25: case 26: case 27: case 28: case 29: case 30: case 31:
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
330 /* TODO: If ER is used, some extra error checking should be done */
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
331 #endif
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
332 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
333 uint8_t err = huffman_2step_pair_sign(11, ld, sp);
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
334 sp[0] = huffman_getescape(ld, sp[0]);
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
335 sp[1] = huffman_getescape(ld, sp[1]);
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
336 return err;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
337 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
338 default:
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
339 /* Non existent codebook number, something went wrong */
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
340 return 11;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
341 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
342
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
343 return 0;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
344 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
345
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
346
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
347 #ifdef ERROR_RESILIENCE
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
348
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
349 /* Special version of huffman_spectral_data
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
350 Will not read from a bitfile but a bits_t structure.
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
351 Will keep track of the bits decoded and return the number of bits remaining.
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
352 Do not read more than ld->len, return -1 if codeword would be longer */
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
353
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
354 int8_t huffman_spectral_data_2(uint8_t cb, bits_t *ld, int16_t *sp)
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
355 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
356 uint32_t cw;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
357 uint16_t offset = 0;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
358 uint8_t extra_bits;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
359 uint8_t i;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
360 uint8_t save_cb = cb;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
361
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
362
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
363 switch (cb)
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
364 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
365 case 1: /* 2-step method for data quadruples */
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
366 case 2:
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
367 case 4:
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
368
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
369 cw = showbits_hcr(ld, hcbN[cb]);
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
370 offset = hcb_table[cb][cw].offset;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
371 extra_bits = hcb_table[cb][cw].extra_bits;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
372
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
373 if (extra_bits)
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
374 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
375 /* we know for sure it's more than hcbN[cb] bits long */
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
376 if ( flushbits_hcr(ld, hcbN[cb]) ) return -1;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
377 offset += (uint16_t)showbits_hcr(ld, extra_bits);
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
378 if ( flushbits_hcr(ld, hcb_2_quad_table[cb][offset].bits - hcbN[cb]) ) return -1;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
379 } else {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
380 if ( flushbits_hcr(ld, hcb_2_quad_table[cb][offset].bits) ) return -1;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
381 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
382
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
383 sp[0] = hcb_2_quad_table[cb][offset].x;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
384 sp[1] = hcb_2_quad_table[cb][offset].y;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
385 sp[2] = hcb_2_quad_table[cb][offset].v;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
386 sp[3] = hcb_2_quad_table[cb][offset].w;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
387 break;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
388
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
389 case 6: /* 2-step method for data pairs */
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
390 case 8:
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
391 case 10:
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
392 case 11:
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
393 /* VCB11 uses codebook 11 */
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
394 case 16: case 17: case 18: case 19: case 20: case 21: case 22: case 23:
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
395 case 24: case 25: case 26: case 27: case 28: case 29: case 30: case 31:
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
396
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
397 /* TODO: If ER is used, some extra error checking should be done */
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
398 if (cb >= 16)
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
399 cb = 11;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
400
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
401 cw = showbits_hcr(ld, hcbN[cb]);
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
402 offset = hcb_table[cb][cw].offset;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
403 extra_bits = hcb_table[cb][cw].extra_bits;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
404
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
405 if (extra_bits)
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
406 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
407 /* we know for sure it's more than hcbN[cb] bits long */
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
408 if ( flushbits_hcr(ld, hcbN[cb]) ) return -1;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
409 offset += (uint16_t)showbits_hcr(ld, extra_bits);
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
410 if ( flushbits_hcr(ld, hcb_2_pair_table[cb][offset].bits - hcbN[cb]) ) return -1;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
411 } else {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
412 if ( flushbits_hcr(ld, hcb_2_pair_table[cb][offset].bits) ) return -1;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
413 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
414 sp[0] = hcb_2_pair_table[cb][offset].x;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
415 sp[1] = hcb_2_pair_table[cb][offset].y;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
416 break;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
417
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
418 case 3: /* binary search for data quadruples */
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
419
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
420 while (!hcb3[offset].is_leaf)
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
421 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
422 uint8_t b;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
423
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
424 if ( get1bit_hcr(ld, &b) ) return -1;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
425 offset += hcb3[offset].data[b];
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
426 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
427
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
428 sp[0] = hcb3[offset].data[0];
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
429 sp[1] = hcb3[offset].data[1];
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
430 sp[2] = hcb3[offset].data[2];
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
431 sp[3] = hcb3[offset].data[3];
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
432
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
433 break;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
434
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
435 case 5: /* binary search for data pairs */
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
436 case 7:
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
437 case 9:
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
438
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
439 while (!hcb_bin_table[cb][offset].is_leaf)
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
440 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
441 uint8_t b;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
442
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
443 if (get1bit_hcr(ld, &b) ) return -1;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
444 offset += hcb_bin_table[cb][offset].data[b];
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
445 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
446
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
447 sp[0] = hcb_bin_table[cb][offset].data[0];
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
448 sp[1] = hcb_bin_table[cb][offset].data[1];
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
449
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
450 break;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
451 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
452
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
453 /* decode sign bits */
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
454 if (unsigned_cb[cb]) {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
455
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
456 for(i = 0; i < ((cb < FIRST_PAIR_HCB) ? QUAD_LEN : PAIR_LEN); i++)
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
457 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
458 if(sp[i])
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
459 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
460 uint8_t b;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
461 if ( get1bit_hcr(ld, &b) ) return -1;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
462 if (b != 0) {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
463 sp[i] = -sp[i];
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
464 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
465 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
466 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
467 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
468
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
469 /* decode huffman escape bits */
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
470 if ((cb == ESC_HCB) || (cb >= 16))
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
471 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
472 uint8_t k;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
473 for (k = 0; k < 2; k++)
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
474 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
475 if ((sp[k] == 16) || (sp[k] == -16))
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
476 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
477 uint8_t neg, i;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
478 int32_t j;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
479 uint32_t off;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
480
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
481 neg = (sp[k] < 0) ? 1 : 0;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
482
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
483 for (i = 4; ; i++)
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
484 {
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
485 uint8_t b;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
486 if (get1bit_hcr(ld, &b))
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
487 return -1;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
488 if (b == 0)
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
489 break;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
490 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
491 // TODO: here we would need to test "off" if VCB11 is used!
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
492 if (getbits_hcr(ld, i, &off))
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
493 return -1;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
494 j = off + (1<<i);
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
495 sp[k] = (int16_t)((neg) ? -j : j);
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
496 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
497 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
498 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
499 return ld->len;
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
500 }
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
501
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
502 #endif
3185f64f6350 synced with current cvs
alex
parents:
diff changeset
503