diff options
Diffstat (limited to 'apps/codecs/libmad/bit.c')
-rw-r--r-- | apps/codecs/libmad/bit.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/apps/codecs/libmad/bit.c b/apps/codecs/libmad/bit.c index f132347c25..f3cca84b2b 100644 --- a/apps/codecs/libmad/bit.c +++ b/apps/codecs/libmad/bit.c | |||
@@ -87,8 +87,8 @@ unsigned short const crc_table[256] = { | |||
87 | #endif | 87 | #endif |
88 | 88 | ||
89 | /* | 89 | /* |
90 | * NAME: bit->init() | 90 | * NAME: bit->init() |
91 | * DESCRIPTION: initialize bit pointer struct | 91 | * DESCRIPTION: initialize bit pointer struct |
92 | */ | 92 | */ |
93 | void mad_bit_init(struct mad_bitptr *bitptr, unsigned char const *byte) | 93 | void mad_bit_init(struct mad_bitptr *bitptr, unsigned char const *byte) |
94 | { | 94 | { |
@@ -97,11 +97,11 @@ void mad_bit_init(struct mad_bitptr *bitptr, unsigned char const *byte) | |||
97 | } | 97 | } |
98 | 98 | ||
99 | /* | 99 | /* |
100 | * NAME: bit->length() | 100 | * NAME: bit->length() |
101 | * DESCRIPTION: return number of bits between start and end points | 101 | * DESCRIPTION: return number of bits between start and end points |
102 | */ | 102 | */ |
103 | unsigned int mad_bit_length(struct mad_bitptr const *begin, | 103 | unsigned int mad_bit_length(struct mad_bitptr const *begin, |
104 | struct mad_bitptr const *end) | 104 | struct mad_bitptr const *end) |
105 | { | 105 | { |
106 | return end->readbit - begin->readbit; | 106 | return end->readbit - begin->readbit; |
107 | } | 107 | } |
@@ -111,8 +111,8 @@ unsigned char mad_bit_bitsleft(struct mad_bitptr const *bitptr) | |||
111 | return 8 - (bitptr->readbit & 7); | 111 | return 8 - (bitptr->readbit & 7); |
112 | } | 112 | } |
113 | /* | 113 | /* |
114 | * NAME: bit->nextbyte() | 114 | * NAME: bit->nextbyte() |
115 | * DESCRIPTION: return pointer to next unprocessed byte | 115 | * DESCRIPTION: return pointer to next unprocessed byte |
116 | */ | 116 | */ |
117 | unsigned char const *mad_bit_nextbyte(struct mad_bitptr const *bitptr) | 117 | unsigned char const *mad_bit_nextbyte(struct mad_bitptr const *bitptr) |
118 | { | 118 | { |
@@ -120,8 +120,8 @@ unsigned char const *mad_bit_nextbyte(struct mad_bitptr const *bitptr) | |||
120 | } | 120 | } |
121 | 121 | ||
122 | /* | 122 | /* |
123 | * NAME: bit->skip() | 123 | * NAME: bit->skip() |
124 | * DESCRIPTION: advance bit pointer | 124 | * DESCRIPTION: advance bit pointer |
125 | */ | 125 | */ |
126 | void mad_bit_skip(struct mad_bitptr *bitptr, unsigned int len) | 126 | void mad_bit_skip(struct mad_bitptr *bitptr, unsigned int len) |
127 | { | 127 | { |
@@ -129,8 +129,8 @@ void mad_bit_skip(struct mad_bitptr *bitptr, unsigned int len) | |||
129 | } | 129 | } |
130 | 130 | ||
131 | /* | 131 | /* |
132 | * NAME: bit->read() | 132 | * NAME: bit->read() |
133 | * DESCRIPTION: read an arbitrary number of bits and return their UIMSBF value | 133 | * DESCRIPTION: read an arbitrary number of bits and return their UIMSBF value |
134 | */ | 134 | */ |
135 | 135 | ||
136 | uint32_t mad_bit_read(struct mad_bitptr *bitptr, unsigned int len) ICODE_ATTR; | 136 | uint32_t mad_bit_read(struct mad_bitptr *bitptr, unsigned int len) ICODE_ATTR; |
@@ -154,11 +154,11 @@ uint32_t mad_bit_read(struct mad_bitptr *bitptr, unsigned int len) | |||
154 | 154 | ||
155 | # if 0 | 155 | # if 0 |
156 | /* | 156 | /* |
157 | * NAME: bit->write() | 157 | * NAME: bit->write() |
158 | * DESCRIPTION: write an arbitrary number of bits | 158 | * DESCRIPTION: write an arbitrary number of bits |
159 | */ | 159 | */ |
160 | void mad_bit_write(struct mad_bitptr *bitptr, unsigned int len, | 160 | void mad_bit_write(struct mad_bitptr *bitptr, unsigned int len, |
161 | uint32_t value) | 161 | uint32_t value) |
162 | { | 162 | { |
163 | unsigned char *ptr; | 163 | unsigned char *ptr; |
164 | 164 | ||
@@ -169,11 +169,11 @@ void mad_bit_write(struct mad_bitptr *bitptr, unsigned int len, | |||
169 | # endif | 169 | # endif |
170 | 170 | ||
171 | /* | 171 | /* |
172 | * NAME: bit->crc() | 172 | * NAME: bit->crc() |
173 | * DESCRIPTION: compute CRC-check word | 173 | * DESCRIPTION: compute CRC-check word |
174 | */ | 174 | */ |
175 | unsigned short mad_bit_crc(struct mad_bitptr bitptr, unsigned int len, | 175 | unsigned short mad_bit_crc(struct mad_bitptr bitptr, unsigned int len, |
176 | unsigned short init) | 176 | unsigned short init) |
177 | { | 177 | { |
178 | register unsigned int crc; | 178 | register unsigned int crc; |
179 | 179 | ||
@@ -190,11 +190,11 @@ unsigned short mad_bit_crc(struct mad_bitptr bitptr, unsigned int len, | |||
190 | 190 | ||
191 | switch (len / 8) { | 191 | switch (len / 8) { |
192 | case 3: crc = (crc << 8) ^ | 192 | case 3: crc = (crc << 8) ^ |
193 | crc_table[((crc >> 8) ^ mad_bit_read(&bitptr, 8)) & 0xff]; | 193 | crc_table[((crc >> 8) ^ mad_bit_read(&bitptr, 8)) & 0xff]; |
194 | case 2: crc = (crc << 8) ^ | 194 | case 2: crc = (crc << 8) ^ |
195 | crc_table[((crc >> 8) ^ mad_bit_read(&bitptr, 8)) & 0xff]; | 195 | crc_table[((crc >> 8) ^ mad_bit_read(&bitptr, 8)) & 0xff]; |
196 | case 1: crc = (crc << 8) ^ | 196 | case 1: crc = (crc << 8) ^ |
197 | crc_table[((crc >> 8) ^ mad_bit_read(&bitptr, 8)) & 0xff]; | 197 | crc_table[((crc >> 8) ^ mad_bit_read(&bitptr, 8)) & 0xff]; |
198 | 198 | ||
199 | len %= 8; | 199 | len %= 8; |
200 | 200 | ||