Mercurial > libavcodec.hg
annotate pcm.c @ 4694:f5fa13dfd3c8 libavcodec
remove dithering of filter coefficients, improves precision by 1-2 bits and
improves subjective sound quality on artificial sample (udial.wav resampling
to 32khz)
| author | michael |
|---|---|
| date | Wed, 21 Mar 2007 22:02:52 +0000 |
| parents | c800e1a03b9c |
| children | ea7519d7649f |
| rev | line source |
|---|---|
| 92 | 1 /* |
| 2 * PCM codecs | |
| 429 | 3 * Copyright (c) 2001 Fabrice Bellard. |
| 92 | 4 * |
|
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3036
diff
changeset
|
5 * This file is part of FFmpeg. |
|
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3036
diff
changeset
|
6 * |
|
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3036
diff
changeset
|
7 * FFmpeg is free software; you can redistribute it and/or |
| 429 | 8 * modify it under the terms of the GNU Lesser General Public |
| 9 * License as published by the Free Software Foundation; either | |
|
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3036
diff
changeset
|
10 * version 2.1 of the License, or (at your option) any later version. |
| 92 | 11 * |
|
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3036
diff
changeset
|
12 * FFmpeg is distributed in the hope that it will be useful, |
| 92 | 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 429 | 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 15 * Lesser General Public License for more details. | |
| 92 | 16 * |
| 429 | 17 * You should have received a copy of the GNU Lesser General Public |
|
3947
c8c591fe26f8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents:
3036
diff
changeset
|
18 * License along with FFmpeg; if not, write to the Free Software |
|
3036
0b546eab515d
Update licensing information: The FSF changed postal address.
diego
parents:
2979
diff
changeset
|
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 92 | 20 */ |
| 2967 | 21 |
| 1108 | 22 /** |
| 23 * @file pcm.c | |
| 24 * PCM codecs | |
| 25 */ | |
| 2967 | 26 |
| 92 | 27 #include "avcodec.h" |
|
2852
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
28 #include "bitstream.h" // for ff_reverse |
| 92 | 29 |
| 30 /* from g711.c by SUN microsystems (unrestricted use) */ | |
| 31 | |
| 2979 | 32 #define SIGN_BIT (0x80) /* Sign bit for a A-law byte. */ |
| 33 #define QUANT_MASK (0xf) /* Quantization field mask. */ | |
| 34 #define NSEGS (8) /* Number of A-law segments. */ | |
| 35 #define SEG_SHIFT (4) /* Left shift for segment number. */ | |
| 36 #define SEG_MASK (0x70) /* Segment field mask. */ | |
| 92 | 37 |
| 2979 | 38 #define BIAS (0x84) /* Bias for linear code. */ |
| 92 | 39 |
| 40 /* | |
| 41 * alaw2linear() - Convert an A-law value to 16-bit linear PCM | |
| 42 * | |
| 43 */ | |
| 2979 | 44 static int alaw2linear(unsigned char a_val) |
| 92 | 45 { |
| 2979 | 46 int t; |
| 47 int seg; | |
| 92 | 48 |
| 2979 | 49 a_val ^= 0x55; |
| 92 | 50 |
| 2979 | 51 t = a_val & QUANT_MASK; |
| 52 seg = ((unsigned)a_val & SEG_MASK) >> SEG_SHIFT; | |
| 53 if(seg) t= (t + t + 1 + 32) << (seg + 2); | |
| 54 else t= (t + t + 1 ) << 3; | |
| 1485 | 55 |
| 2979 | 56 return ((a_val & SIGN_BIT) ? t : -t); |
| 92 | 57 } |
| 58 | |
| 2979 | 59 static int ulaw2linear(unsigned char u_val) |
| 92 | 60 { |
| 2979 | 61 int t; |
| 92 | 62 |
| 2979 | 63 /* Complement to obtain normal u-law value. */ |
| 64 u_val = ~u_val; | |
| 92 | 65 |
| 2979 | 66 /* |
| 67 * Extract and bias the quantization bits. Then | |
| 68 * shift up by the segment number and subtract out the bias. | |
| 69 */ | |
| 70 t = ((u_val & QUANT_MASK) << 3) + BIAS; | |
| 71 t <<= ((unsigned)u_val & SEG_MASK) >> SEG_SHIFT; | |
| 92 | 72 |
| 2979 | 73 return ((u_val & SIGN_BIT) ? (BIAS - t) : (t - BIAS)); |
| 92 | 74 } |
| 75 | |
| 76 /* 16384 entries per table */ | |
| 4660 | 77 static uint8_t linear_to_alaw[16384]; |
| 78 static uint8_t linear_to_ulaw[16384]; | |
| 92 | 79 |
| 2967 | 80 static void build_xlaw_table(uint8_t *linear_to_xlaw, |
| 92 | 81 int (*xlaw2linear)(unsigned char), |
| 2967 | 82 int mask) |
| 92 | 83 { |
| 84 int i, j, v, v1, v2; | |
| 85 | |
| 86 j = 0; | |
| 87 for(i=0;i<128;i++) { | |
| 88 if (i != 127) { | |
| 89 v1 = xlaw2linear(i ^ mask); | |
| 90 v2 = xlaw2linear((i + 1) ^ mask); | |
| 91 v = (v1 + v2 + 4) >> 3; | |
| 92 } else { | |
| 93 v = 8192; | |
| 94 } | |
| 95 for(;j<v;j++) { | |
| 96 linear_to_xlaw[8192 + j] = (i ^ mask); | |
| 97 if (j > 0) | |
| 98 linear_to_xlaw[8192 - j] = (i ^ (mask ^ 0x80)); | |
| 99 } | |
| 100 } | |
| 101 linear_to_xlaw[0] = linear_to_xlaw[1]; | |
| 102 } | |
| 103 | |
|
440
000aeeac27a2
* started to cleanup name clashes for onetime compilation
kabi
parents:
429
diff
changeset
|
104 static int pcm_encode_init(AVCodecContext *avctx) |
| 92 | 105 { |
| 106 avctx->frame_size = 1; | |
| 107 switch(avctx->codec->id) { | |
| 108 case CODEC_ID_PCM_ALAW: | |
| 4660 | 109 build_xlaw_table(linear_to_alaw, alaw2linear, 0xd5); |
| 92 | 110 break; |
| 111 case CODEC_ID_PCM_MULAW: | |
| 4660 | 112 build_xlaw_table(linear_to_ulaw, ulaw2linear, 0xff); |
| 92 | 113 break; |
| 114 default: | |
| 115 break; | |
| 116 } | |
| 2967 | 117 |
| 2340 | 118 switch(avctx->codec->id) { |
|
2852
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
119 case CODEC_ID_PCM_S32LE: |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
120 case CODEC_ID_PCM_S32BE: |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
121 case CODEC_ID_PCM_U32LE: |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
122 case CODEC_ID_PCM_U32BE: |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
123 avctx->block_align = 4 * avctx->channels; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
124 break; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
125 case CODEC_ID_PCM_S24LE: |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
126 case CODEC_ID_PCM_S24BE: |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
127 case CODEC_ID_PCM_U24LE: |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
128 case CODEC_ID_PCM_U24BE: |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
129 case CODEC_ID_PCM_S24DAUD: |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
130 avctx->block_align = 3 * avctx->channels; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
131 break; |
| 2340 | 132 case CODEC_ID_PCM_S16LE: |
| 133 case CODEC_ID_PCM_S16BE: | |
| 134 case CODEC_ID_PCM_U16LE: | |
| 135 case CODEC_ID_PCM_U16BE: | |
| 136 avctx->block_align = 2 * avctx->channels; | |
| 137 break; | |
| 138 case CODEC_ID_PCM_S8: | |
| 139 case CODEC_ID_PCM_U8: | |
| 140 case CODEC_ID_PCM_MULAW: | |
| 141 case CODEC_ID_PCM_ALAW: | |
| 142 avctx->block_align = avctx->channels; | |
| 143 break; | |
| 144 default: | |
| 145 break; | |
| 146 } | |
| 147 | |
| 925 | 148 avctx->coded_frame= avcodec_alloc_frame(); |
| 149 avctx->coded_frame->key_frame= 1; | |
| 2967 | 150 |
| 92 | 151 return 0; |
| 152 } | |
| 153 | |
|
440
000aeeac27a2
* started to cleanup name clashes for onetime compilation
kabi
parents:
429
diff
changeset
|
154 static int pcm_encode_close(AVCodecContext *avctx) |
| 92 | 155 { |
| 925 | 156 av_freep(&avctx->coded_frame); |
| 157 | |
| 92 | 158 return 0; |
| 159 } | |
| 160 | |
|
2852
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
161 /** |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
162 * \brief convert samples from 16 bit |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
163 * \param bps byte per sample for the destination format, must be >= 2 |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
164 * \param le 0 for big-, 1 for little-endian |
|
2853
87c11495e393
Document "us" parameter for PCM conversion functions.
reimar
parents:
2852
diff
changeset
|
165 * \param us 0 for signed, 1 for unsigned output |
|
2852
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
166 * \param samples input samples |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
167 * \param dst output samples |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
168 * \param n number of samples in samples buffer. |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
169 */ |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
170 static inline void encode_from16(int bps, int le, int us, |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
171 short **samples, uint8_t **dst, int n) { |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
172 if (bps > 2) |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
173 memset(*dst, 0, n * bps); |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
174 if (le) *dst += bps - 2; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
175 for(;n>0;n--) { |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
176 register int v = *(*samples)++; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
177 if (us) v += 0x8000; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
178 (*dst)[le] = v >> 8; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
179 (*dst)[1 - le] = v; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
180 *dst += bps; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
181 } |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
182 if (le) *dst -= bps - 2; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
183 } |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
184 |
|
440
000aeeac27a2
* started to cleanup name clashes for onetime compilation
kabi
parents:
429
diff
changeset
|
185 static int pcm_encode_frame(AVCodecContext *avctx, |
| 2979 | 186 unsigned char *frame, int buf_size, void *data) |
| 92 | 187 { |
| 188 int n, sample_size, v; | |
| 189 short *samples; | |
| 190 unsigned char *dst; | |
| 191 | |
| 192 switch(avctx->codec->id) { | |
|
2852
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
193 case CODEC_ID_PCM_S32LE: |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
194 case CODEC_ID_PCM_S32BE: |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
195 case CODEC_ID_PCM_U32LE: |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
196 case CODEC_ID_PCM_U32BE: |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
197 sample_size = 4; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
198 break; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
199 case CODEC_ID_PCM_S24LE: |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
200 case CODEC_ID_PCM_S24BE: |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
201 case CODEC_ID_PCM_U24LE: |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
202 case CODEC_ID_PCM_U24BE: |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
203 case CODEC_ID_PCM_S24DAUD: |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
204 sample_size = 3; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
205 break; |
| 92 | 206 case CODEC_ID_PCM_S16LE: |
| 207 case CODEC_ID_PCM_S16BE: | |
| 208 case CODEC_ID_PCM_U16LE: | |
| 209 case CODEC_ID_PCM_U16BE: | |
| 210 sample_size = 2; | |
| 211 break; | |
| 212 default: | |
| 213 sample_size = 1; | |
| 214 break; | |
| 215 } | |
| 216 n = buf_size / sample_size; | |
| 217 samples = data; | |
| 218 dst = frame; | |
| 219 | |
| 220 switch(avctx->codec->id) { | |
|
2852
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
221 case CODEC_ID_PCM_S32LE: |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
222 encode_from16(4, 1, 0, &samples, &dst, n); |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
223 break; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
224 case CODEC_ID_PCM_S32BE: |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
225 encode_from16(4, 0, 0, &samples, &dst, n); |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
226 break; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
227 case CODEC_ID_PCM_U32LE: |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
228 encode_from16(4, 1, 1, &samples, &dst, n); |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
229 break; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
230 case CODEC_ID_PCM_U32BE: |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
231 encode_from16(4, 0, 1, &samples, &dst, n); |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
232 break; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
233 case CODEC_ID_PCM_S24LE: |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
234 encode_from16(3, 1, 0, &samples, &dst, n); |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
235 break; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
236 case CODEC_ID_PCM_S24BE: |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
237 encode_from16(3, 0, 0, &samples, &dst, n); |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
238 break; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
239 case CODEC_ID_PCM_U24LE: |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
240 encode_from16(3, 1, 1, &samples, &dst, n); |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
241 break; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
242 case CODEC_ID_PCM_U24BE: |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
243 encode_from16(3, 0, 1, &samples, &dst, n); |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
244 break; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
245 case CODEC_ID_PCM_S24DAUD: |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
246 for(;n>0;n--) { |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
247 uint32_t tmp = ff_reverse[*samples >> 8] + |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
248 (ff_reverse[*samples & 0xff] << 8); |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
249 tmp <<= 4; // sync flags would go here |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
250 dst[2] = tmp & 0xff; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
251 tmp >>= 8; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
252 dst[1] = tmp & 0xff; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
253 dst[0] = tmp >> 8; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
254 samples++; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
255 dst += 3; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
256 } |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
257 break; |
| 92 | 258 case CODEC_ID_PCM_S16LE: |
| 259 for(;n>0;n--) { | |
| 260 v = *samples++; | |
| 261 dst[0] = v & 0xff; | |
| 262 dst[1] = v >> 8; | |
| 263 dst += 2; | |
| 264 } | |
| 265 break; | |
| 266 case CODEC_ID_PCM_S16BE: | |
| 267 for(;n>0;n--) { | |
| 268 v = *samples++; | |
| 269 dst[0] = v >> 8; | |
| 270 dst[1] = v; | |
| 271 dst += 2; | |
| 272 } | |
| 273 break; | |
| 274 case CODEC_ID_PCM_U16LE: | |
| 275 for(;n>0;n--) { | |
| 276 v = *samples++; | |
| 277 v += 0x8000; | |
| 278 dst[0] = v & 0xff; | |
| 279 dst[1] = v >> 8; | |
| 280 dst += 2; | |
| 281 } | |
| 282 break; | |
| 283 case CODEC_ID_PCM_U16BE: | |
| 284 for(;n>0;n--) { | |
| 285 v = *samples++; | |
| 286 v += 0x8000; | |
| 287 dst[0] = v >> 8; | |
| 288 dst[1] = v; | |
| 289 dst += 2; | |
| 290 } | |
| 291 break; | |
| 292 case CODEC_ID_PCM_S8: | |
| 293 for(;n>0;n--) { | |
| 294 v = *samples++; | |
|
649
5a8f80522cf8
fixing overflow in 16->8 bit conversion, patch by (Nikolai Zhubr <s001 at hotbox dot ru>)
michaelni
parents:
440
diff
changeset
|
295 dst[0] = v >> 8; |
| 92 | 296 dst++; |
| 297 } | |
| 298 break; | |
| 299 case CODEC_ID_PCM_U8: | |
| 300 for(;n>0;n--) { | |
| 301 v = *samples++; | |
|
649
5a8f80522cf8
fixing overflow in 16->8 bit conversion, patch by (Nikolai Zhubr <s001 at hotbox dot ru>)
michaelni
parents:
440
diff
changeset
|
302 dst[0] = (v >> 8) + 128; |
| 92 | 303 dst++; |
| 304 } | |
| 305 break; | |
| 306 case CODEC_ID_PCM_ALAW: | |
| 307 for(;n>0;n--) { | |
| 308 v = *samples++; | |
| 309 dst[0] = linear_to_alaw[(v + 32768) >> 2]; | |
| 310 dst++; | |
| 311 } | |
| 312 break; | |
| 313 case CODEC_ID_PCM_MULAW: | |
| 314 for(;n>0;n--) { | |
| 315 v = *samples++; | |
| 316 dst[0] = linear_to_ulaw[(v + 32768) >> 2]; | |
| 317 dst++; | |
| 318 } | |
| 319 break; | |
| 320 default: | |
| 321 return -1; | |
| 322 } | |
|
381
0d6178e4d503
* Mea culpa: it seems that I broke encoding to 8-bit pcm files. This fixes it.
philipjsg
parents:
372
diff
changeset
|
323 //avctx->frame_size = (dst - frame) / (sample_size * avctx->channels); |
| 372 | 324 |
| 92 | 325 return dst - frame; |
| 326 } | |
| 327 | |
| 328 typedef struct PCMDecode { | |
| 329 short table[256]; | |
| 330 } PCMDecode; | |
| 331 | |
|
440
000aeeac27a2
* started to cleanup name clashes for onetime compilation
kabi
parents:
429
diff
changeset
|
332 static int pcm_decode_init(AVCodecContext * avctx) |
| 92 | 333 { |
| 334 PCMDecode *s = avctx->priv_data; | |
| 335 int i; | |
| 336 | |
| 337 switch(avctx->codec->id) { | |
| 338 case CODEC_ID_PCM_ALAW: | |
| 339 for(i=0;i<256;i++) | |
| 340 s->table[i] = alaw2linear(i); | |
| 341 break; | |
| 342 case CODEC_ID_PCM_MULAW: | |
| 343 for(i=0;i<256;i++) | |
| 344 s->table[i] = ulaw2linear(i); | |
| 345 break; | |
| 346 default: | |
| 347 break; | |
| 348 } | |
| 349 return 0; | |
| 350 } | |
| 351 | |
|
2852
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
352 /** |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
353 * \brief convert samples to 16 bit |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
354 * \param bps byte per sample for the source format, must be >= 2 |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
355 * \param le 0 for big-, 1 for little-endian |
|
2853
87c11495e393
Document "us" parameter for PCM conversion functions.
reimar
parents:
2852
diff
changeset
|
356 * \param us 0 for signed, 1 for unsigned input |
|
2852
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
357 * \param src input samples |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
358 * \param samples output samples |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
359 * \param src_len number of bytes in src |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
360 */ |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
361 static inline void decode_to16(int bps, int le, int us, |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
362 uint8_t **src, short **samples, int src_len) |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
363 { |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
364 register int n = src_len / bps; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
365 if (le) *src += bps - 2; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
366 for(;n>0;n--) { |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
367 *(*samples)++ = ((*src)[le] << 8 | (*src)[1 - le]) - (us?0x8000:0); |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
368 *src += bps; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
369 } |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
370 if (le) *src -= bps - 2; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
371 } |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
372 |
|
440
000aeeac27a2
* started to cleanup name clashes for onetime compilation
kabi
parents:
429
diff
changeset
|
373 static int pcm_decode_frame(AVCodecContext *avctx, |
| 2979 | 374 void *data, int *data_size, |
| 375 uint8_t *buf, int buf_size) | |
| 92 | 376 { |
| 377 PCMDecode *s = avctx->priv_data; | |
| 378 int n; | |
| 379 short *samples; | |
| 1064 | 380 uint8_t *src; |
| 92 | 381 |
| 382 samples = data; | |
| 383 src = buf; | |
| 384 | |
| 4506 | 385 n= av_get_bits_per_sample(avctx->codec_id)/8; |
| 386 if(n && buf_size % n){ | |
| 387 av_log(avctx, AV_LOG_ERROR, "invalid PCM packet\n"); | |
| 388 return -1; | |
| 389 } | |
| 390 | |
| 4351 | 391 buf_size= FFMIN(buf_size, *data_size/2); |
| 392 *data_size=0; | |
| 2506 | 393 |
| 92 | 394 switch(avctx->codec->id) { |
|
2852
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
395 case CODEC_ID_PCM_S32LE: |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
396 decode_to16(4, 1, 0, &src, &samples, buf_size); |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
397 break; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
398 case CODEC_ID_PCM_S32BE: |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
399 decode_to16(4, 0, 0, &src, &samples, buf_size); |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
400 break; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
401 case CODEC_ID_PCM_U32LE: |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
402 decode_to16(4, 1, 1, &src, &samples, buf_size); |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
403 break; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
404 case CODEC_ID_PCM_U32BE: |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
405 decode_to16(4, 0, 1, &src, &samples, buf_size); |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
406 break; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
407 case CODEC_ID_PCM_S24LE: |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
408 decode_to16(3, 1, 0, &src, &samples, buf_size); |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
409 break; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
410 case CODEC_ID_PCM_S24BE: |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
411 decode_to16(3, 0, 0, &src, &samples, buf_size); |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
412 break; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
413 case CODEC_ID_PCM_U24LE: |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
414 decode_to16(3, 1, 1, &src, &samples, buf_size); |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
415 break; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
416 case CODEC_ID_PCM_U24BE: |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
417 decode_to16(3, 0, 1, &src, &samples, buf_size); |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
418 break; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
419 case CODEC_ID_PCM_S24DAUD: |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
420 n = buf_size / 3; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
421 for(;n>0;n--) { |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
422 uint32_t v = src[0] << 16 | src[1] << 8 | src[2]; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
423 v >>= 4; // sync flags are here |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
424 *samples++ = ff_reverse[(v >> 8) & 0xff] + |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
425 (ff_reverse[v & 0xff] << 8); |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
426 src += 3; |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
427 } |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
428 break; |
| 92 | 429 case CODEC_ID_PCM_S16LE: |
| 430 n = buf_size >> 1; | |
| 431 for(;n>0;n--) { | |
| 432 *samples++ = src[0] | (src[1] << 8); | |
| 433 src += 2; | |
| 434 } | |
| 435 break; | |
| 436 case CODEC_ID_PCM_S16BE: | |
| 437 n = buf_size >> 1; | |
| 438 for(;n>0;n--) { | |
| 439 *samples++ = (src[0] << 8) | src[1]; | |
| 440 src += 2; | |
| 441 } | |
| 442 break; | |
| 443 case CODEC_ID_PCM_U16LE: | |
| 444 n = buf_size >> 1; | |
| 445 for(;n>0;n--) { | |
| 446 *samples++ = (src[0] | (src[1] << 8)) - 0x8000; | |
| 447 src += 2; | |
| 448 } | |
| 449 break; | |
| 450 case CODEC_ID_PCM_U16BE: | |
| 451 n = buf_size >> 1; | |
| 452 for(;n>0;n--) { | |
| 453 *samples++ = ((src[0] << 8) | src[1]) - 0x8000; | |
| 454 src += 2; | |
| 455 } | |
| 456 break; | |
| 457 case CODEC_ID_PCM_S8: | |
| 458 n = buf_size; | |
| 459 for(;n>0;n--) { | |
| 460 *samples++ = src[0] << 8; | |
| 461 src++; | |
| 462 } | |
| 463 break; | |
| 464 case CODEC_ID_PCM_U8: | |
| 465 n = buf_size; | |
| 466 for(;n>0;n--) { | |
| 467 *samples++ = ((int)src[0] - 128) << 8; | |
| 468 src++; | |
| 469 } | |
| 470 break; | |
| 471 case CODEC_ID_PCM_ALAW: | |
| 472 case CODEC_ID_PCM_MULAW: | |
| 473 n = buf_size; | |
| 474 for(;n>0;n--) { | |
| 475 *samples++ = s->table[src[0]]; | |
| 476 src++; | |
| 477 } | |
| 478 break; | |
| 479 default: | |
| 480 return -1; | |
| 481 } | |
| 1064 | 482 *data_size = (uint8_t *)samples - (uint8_t *)data; |
| 92 | 483 return src - buf; |
| 484 } | |
| 485 | |
| 486 #define PCM_CODEC(id, name) \ | |
| 487 AVCodec name ## _encoder = { \ | |
| 488 #name, \ | |
| 489 CODEC_TYPE_AUDIO, \ | |
| 490 id, \ | |
| 491 0, \ | |
| 2979 | 492 pcm_encode_init, \ |
| 493 pcm_encode_frame, \ | |
| 494 pcm_encode_close, \ | |
| 92 | 495 NULL, \ |
| 496 }; \ | |
| 497 AVCodec name ## _decoder = { \ | |
| 498 #name, \ | |
| 499 CODEC_TYPE_AUDIO, \ | |
| 500 id, \ | |
| 501 sizeof(PCMDecode), \ | |
| 2979 | 502 pcm_decode_init, \ |
| 92 | 503 NULL, \ |
| 504 NULL, \ | |
|
440
000aeeac27a2
* started to cleanup name clashes for onetime compilation
kabi
parents:
429
diff
changeset
|
505 pcm_decode_frame, \ |
|
1014
48349e11c9b2
C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M?ns Rullg?rd))
michaelni
parents:
925
diff
changeset
|
506 } |
| 92 | 507 |
|
2852
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
508 PCM_CODEC(CODEC_ID_PCM_S32LE, pcm_s32le); |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
509 PCM_CODEC(CODEC_ID_PCM_S32BE, pcm_s32be); |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
510 PCM_CODEC(CODEC_ID_PCM_U32LE, pcm_u32le); |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
511 PCM_CODEC(CODEC_ID_PCM_U32BE, pcm_u32be); |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
512 PCM_CODEC(CODEC_ID_PCM_S24LE, pcm_s24le); |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
513 PCM_CODEC(CODEC_ID_PCM_S24BE, pcm_s24be); |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
514 PCM_CODEC(CODEC_ID_PCM_U24LE, pcm_u24le); |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
515 PCM_CODEC(CODEC_ID_PCM_U24BE, pcm_u24be); |
|
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
516 PCM_CODEC(CODEC_ID_PCM_S24DAUD, pcm_s24daud); |
| 92 | 517 PCM_CODEC(CODEC_ID_PCM_S16LE, pcm_s16le); |
| 518 PCM_CODEC(CODEC_ID_PCM_S16BE, pcm_s16be); | |
| 519 PCM_CODEC(CODEC_ID_PCM_U16LE, pcm_u16le); | |
| 520 PCM_CODEC(CODEC_ID_PCM_U16BE, pcm_u16be); | |
| 521 PCM_CODEC(CODEC_ID_PCM_S8, pcm_s8); | |
| 522 PCM_CODEC(CODEC_ID_PCM_U8, pcm_u8); | |
| 523 PCM_CODEC(CODEC_ID_PCM_ALAW, pcm_alaw); | |
| 524 PCM_CODEC(CODEC_ID_PCM_MULAW, pcm_mulaw); | |
|
440
000aeeac27a2
* started to cleanup name clashes for onetime compilation
kabi
parents:
429
diff
changeset
|
525 |
|
000aeeac27a2
* started to cleanup name clashes for onetime compilation
kabi
parents:
429
diff
changeset
|
526 #undef PCM_CODEC |
