diff options
Diffstat (limited to 'apps/codecs/libpcm/dvi_adpcm.c')
-rw-r--r-- | apps/codecs/libpcm/dvi_adpcm.c | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/apps/codecs/libpcm/dvi_adpcm.c b/apps/codecs/libpcm/dvi_adpcm.c index c1b90e04e7..6774b14473 100644 --- a/apps/codecs/libpcm/dvi_adpcm.c +++ b/apps/codecs/libpcm/dvi_adpcm.c | |||
@@ -20,7 +20,6 @@ | |||
20 | * | 20 | * |
21 | ****************************************************************************/ | 21 | ****************************************************************************/ |
22 | #include "codeclib.h" | 22 | #include "codeclib.h" |
23 | #include "pcm_common.h" | ||
24 | #include "ima_adpcm_common.h" | 23 | #include "ima_adpcm_common.h" |
25 | #include "support_formats.h" | 24 | #include "support_formats.h" |
26 | 25 | ||
@@ -85,13 +84,13 @@ static inline void decode_2bit(const uint8_t **inbuf, | |||
85 | pcmbuf = *outbuf + ch; | 84 | pcmbuf = *outbuf + ch; |
86 | for (i = 0; i < 4; i++) | 85 | for (i = 0; i < 4; i++) |
87 | { | 86 | { |
88 | *pcmbuf = create_pcmdata(ch, **inbuf ) << 13; | 87 | *pcmbuf = create_pcmdata(ch, **inbuf ) << IMA_ADPCM_INC_DEPTH; |
89 | pcmbuf += fmt->channels; | 88 | pcmbuf += fmt->channels; |
90 | *pcmbuf = create_pcmdata(ch, **inbuf >> 2) << 13; | 89 | *pcmbuf = create_pcmdata(ch, **inbuf >> 2) << IMA_ADPCM_INC_DEPTH; |
91 | pcmbuf += fmt->channels; | 90 | pcmbuf += fmt->channels; |
92 | *pcmbuf = create_pcmdata(ch, **inbuf >> 4) << 13; | 91 | *pcmbuf = create_pcmdata(ch, **inbuf >> 4) << IMA_ADPCM_INC_DEPTH; |
93 | pcmbuf += fmt->channels; | 92 | pcmbuf += fmt->channels; |
94 | *pcmbuf = create_pcmdata(ch, **inbuf >> 6) << 13; | 93 | *pcmbuf = create_pcmdata(ch, **inbuf >> 6) << IMA_ADPCM_INC_DEPTH; |
95 | pcmbuf += fmt->channels; | 94 | pcmbuf += fmt->channels; |
96 | (*inbuf)++; | 95 | (*inbuf)++; |
97 | } | 96 | } |
@@ -123,7 +122,7 @@ static inline void decode_3bit(const uint8_t **inbuf, | |||
123 | adpcms |= (*adpcmbuf++) << 16; | 122 | adpcms |= (*adpcmbuf++) << 16; |
124 | for (i = 0; i < 8; i++) | 123 | for (i = 0; i < 8; i++) |
125 | { | 124 | { |
126 | *pcmbuf = create_pcmdata(ch, adpcms >> (3 * i)) << 13; | 125 | *pcmbuf = create_pcmdata(ch, adpcms >> (3 * i)) << IMA_ADPCM_INC_DEPTH; |
127 | pcmbuf += fmt->channels; | 126 | pcmbuf += fmt->channels; |
128 | } | 127 | } |
129 | adpcms = *adpcmbuf++; | 128 | adpcms = *adpcmbuf++; |
@@ -132,7 +131,7 @@ static inline void decode_3bit(const uint8_t **inbuf, | |||
132 | adpcms |= (*adpcmbuf++) << 16; | 131 | adpcms |= (*adpcmbuf++) << 16; |
133 | for (i = 0; i < 8; i++) | 132 | for (i = 0; i < 8; i++) |
134 | { | 133 | { |
135 | *pcmbuf = create_pcmdata(ch, adpcms >> (3 * i)) << 13; | 134 | *pcmbuf = create_pcmdata(ch, adpcms >> (3 * i)) << IMA_ADPCM_INC_DEPTH; |
136 | pcmbuf += fmt->channels; | 135 | pcmbuf += fmt->channels; |
137 | } | 136 | } |
138 | adpcms = *adpcmbuf++; | 137 | adpcms = *adpcmbuf++; |
@@ -141,7 +140,7 @@ static inline void decode_3bit(const uint8_t **inbuf, | |||
141 | adpcms |= (*adpcmbuf++) << 16; | 140 | adpcms |= (*adpcmbuf++) << 16; |
142 | for (i = 0; i < 8; i++) | 141 | for (i = 0; i < 8; i++) |
143 | { | 142 | { |
144 | *pcmbuf = create_pcmdata(ch, adpcms >> (3 * i)) << 13; | 143 | *pcmbuf = create_pcmdata(ch, adpcms >> (3 * i)) << IMA_ADPCM_INC_DEPTH; |
145 | pcmbuf += fmt->channels; | 144 | pcmbuf += fmt->channels; |
146 | } | 145 | } |
147 | adpcms = *adpcmbuf++; | 146 | adpcms = *adpcmbuf++; |
@@ -149,7 +148,7 @@ static inline void decode_3bit(const uint8_t **inbuf, | |||
149 | adpcms |= (*adpcmbuf++) << 16; | 148 | adpcms |= (*adpcmbuf++) << 16; |
150 | for (i = 0; i < 8; i++) | 149 | for (i = 0; i < 8; i++) |
151 | { | 150 | { |
152 | *pcmbuf = create_pcmdata(ch, adpcms >> (3 * i)) << 13; | 151 | *pcmbuf = create_pcmdata(ch, adpcms >> (3 * i)) << IMA_ADPCM_INC_DEPTH; |
153 | pcmbuf += fmt->channels; | 152 | pcmbuf += fmt->channels; |
154 | } | 153 | } |
155 | } | 154 | } |
@@ -175,9 +174,9 @@ static inline void decode_4bit(const uint8_t **inbuf, | |||
175 | pcmbuf = *outbuf + ch; | 174 | pcmbuf = *outbuf + ch; |
176 | for (i = 0; i < 4; i++) | 175 | for (i = 0; i < 4; i++) |
177 | { | 176 | { |
178 | *pcmbuf = create_pcmdata_size4(ch, **inbuf ) << 13; | 177 | *pcmbuf = create_pcmdata_size4(ch, **inbuf ) << IMA_ADPCM_INC_DEPTH; |
179 | pcmbuf += fmt->channels; | 178 | pcmbuf += fmt->channels; |
180 | *pcmbuf = create_pcmdata_size4(ch, **inbuf >> 4) << 13; | 179 | *pcmbuf = create_pcmdata_size4(ch, **inbuf >> 4) << IMA_ADPCM_INC_DEPTH; |
181 | pcmbuf += fmt->channels; | 180 | pcmbuf += fmt->channels; |
182 | (*inbuf)++; | 181 | (*inbuf)++; |
183 | } | 182 | } |
@@ -212,7 +211,7 @@ static inline void decode_5bit(const uint8_t **inbuf, | |||
212 | adpcms |= (uint64_t)(*adpcmbuf++) << 32; | 211 | adpcms |= (uint64_t)(*adpcmbuf++) << 32; |
213 | for (i = 0; i < 8; i++) | 212 | for (i = 0; i < 8; i++) |
214 | { | 213 | { |
215 | *pcmbuf = create_pcmdata(ch, adpcms >> (5 * i)) << 13; | 214 | *pcmbuf = create_pcmdata(ch, adpcms >> (5 * i)) << IMA_ADPCM_INC_DEPTH; |
216 | pcmbuf += fmt->channels; | 215 | pcmbuf += fmt->channels; |
217 | } | 216 | } |
218 | adpcms = *adpcmbuf++; | 217 | adpcms = *adpcmbuf++; |
@@ -223,7 +222,7 @@ static inline void decode_5bit(const uint8_t **inbuf, | |||
223 | adpcms |= (uint64_t)(*adpcmbuf++) << 32; | 222 | adpcms |= (uint64_t)(*adpcmbuf++) << 32; |
224 | for (i = 0; i < 8; i++) | 223 | for (i = 0; i < 8; i++) |
225 | { | 224 | { |
226 | *pcmbuf = create_pcmdata(ch, adpcms >> (5 * i)) << 13; | 225 | *pcmbuf = create_pcmdata(ch, adpcms >> (5 * i)) << IMA_ADPCM_INC_DEPTH; |
227 | pcmbuf += fmt->channels; | 226 | pcmbuf += fmt->channels; |
228 | } | 227 | } |
229 | adpcms = *adpcmbuf++; | 228 | adpcms = *adpcmbuf++; |
@@ -234,7 +233,7 @@ static inline void decode_5bit(const uint8_t **inbuf, | |||
234 | adpcms |= (uint64_t)(*adpcmbuf++) << 32; | 233 | adpcms |= (uint64_t)(*adpcmbuf++) << 32; |
235 | for (i = 0; i < 8; i++) | 234 | for (i = 0; i < 8; i++) |
236 | { | 235 | { |
237 | *pcmbuf = create_pcmdata(ch, adpcms >> (5 * i)) << 13; | 236 | *pcmbuf = create_pcmdata(ch, adpcms >> (5 * i)) << IMA_ADPCM_INC_DEPTH; |
238 | pcmbuf += fmt->channels; | 237 | pcmbuf += fmt->channels; |
239 | } | 238 | } |
240 | adpcms = *adpcmbuf++; | 239 | adpcms = *adpcmbuf++; |
@@ -245,7 +244,7 @@ static inline void decode_5bit(const uint8_t **inbuf, | |||
245 | adpcms |= (uint64_t)(*adpcmbuf++) << 32; | 244 | adpcms |= (uint64_t)(*adpcmbuf++) << 32; |
246 | for (i = 0; i < 8; i++) | 245 | for (i = 0; i < 8; i++) |
247 | { | 246 | { |
248 | *pcmbuf = create_pcmdata(ch, adpcms >> (5 * i)) << 13; | 247 | *pcmbuf = create_pcmdata(ch, adpcms >> (5 * i)) << IMA_ADPCM_INC_DEPTH; |
249 | pcmbuf += fmt->channels; | 248 | pcmbuf += fmt->channels; |
250 | } | 249 | } |
251 | } | 250 | } |
@@ -283,7 +282,7 @@ static int decode(const uint8_t *inbuf, size_t inbufsize, | |||
283 | } | 282 | } |
284 | inbuf += 4; | 283 | inbuf += 4; |
285 | 284 | ||
286 | *outbuf++ = init_pcmdata[ch] << 13; | 285 | *outbuf++ = init_pcmdata[ch] << IMA_ADPCM_INC_DEPTH; |
287 | } | 286 | } |
288 | 287 | ||
289 | *outbufcount += 1; | 288 | *outbufcount += 1; |