Mercurial > libavcodec.hg
comparison pcm.c @ 10501:bdf4a9ca162a libavcodec
Move ff_reverse in libavcodec to av_reverse in libavutil.
Patch by Francesco Lavra, francescolavra interfree it
author | cehoyos |
---|---|
date | Mon, 09 Nov 2009 09:11:35 +0000 |
parents | 7955db355703 |
children | 8a4984c5cacc |
comparison
equal
deleted
inserted
replaced
10500:6d653bb57c58 | 10501:bdf4a9ca162a |
---|---|
23 * @file libavcodec/pcm.c | 23 * @file libavcodec/pcm.c |
24 * PCM codecs | 24 * PCM codecs |
25 */ | 25 */ |
26 | 26 |
27 #include "avcodec.h" | 27 #include "avcodec.h" |
28 #include "get_bits.h" // for ff_reverse | 28 #include "libavutil/common.h" /* for av_reverse */ |
29 #include "bytestream.h" | 29 #include "bytestream.h" |
30 | 30 |
31 #define MAX_CHANNELS 64 | 31 #define MAX_CHANNELS 64 |
32 | 32 |
33 /* from g711.c by SUN microsystems (unrestricted use) */ | 33 /* from g711.c by SUN microsystems (unrestricted use) */ |
192 case CODEC_ID_PCM_U24BE: | 192 case CODEC_ID_PCM_U24BE: |
193 ENCODE(uint32_t, be24, samples, dst, n, 8, 0x800000) | 193 ENCODE(uint32_t, be24, samples, dst, n, 8, 0x800000) |
194 break; | 194 break; |
195 case CODEC_ID_PCM_S24DAUD: | 195 case CODEC_ID_PCM_S24DAUD: |
196 for(;n>0;n--) { | 196 for(;n>0;n--) { |
197 uint32_t tmp = ff_reverse[(*samples >> 8) & 0xff] + | 197 uint32_t tmp = av_reverse[(*samples >> 8) & 0xff] + |
198 (ff_reverse[*samples & 0xff] << 8); | 198 (av_reverse[*samples & 0xff] << 8); |
199 tmp <<= 4; // sync flags would go here | 199 tmp <<= 4; // sync flags would go here |
200 bytestream_put_be24(&dst, tmp); | 200 bytestream_put_be24(&dst, tmp); |
201 samples++; | 201 samples++; |
202 } | 202 } |
203 break; | 203 break; |
394 break; | 394 break; |
395 case CODEC_ID_PCM_S24DAUD: | 395 case CODEC_ID_PCM_S24DAUD: |
396 for(;n>0;n--) { | 396 for(;n>0;n--) { |
397 uint32_t v = bytestream_get_be24(&src); | 397 uint32_t v = bytestream_get_be24(&src); |
398 v >>= 4; // sync flags are here | 398 v >>= 4; // sync flags are here |
399 *samples++ = ff_reverse[(v >> 8) & 0xff] + | 399 *samples++ = av_reverse[(v >> 8) & 0xff] + |
400 (ff_reverse[v & 0xff] << 8); | 400 (av_reverse[v & 0xff] << 8); |
401 } | 401 } |
402 break; | 402 break; |
403 case CODEC_ID_PCM_S16LE_PLANAR: | 403 case CODEC_ID_PCM_S16LE_PLANAR: |
404 n /= avctx->channels; | 404 n /= avctx->channels; |
405 for(c=0;c<avctx->channels;c++) | 405 for(c=0;c<avctx->channels;c++) |