Mercurial > libavcodec.hg
annotate pcm.c @ 8966:328b7d545d0b libavcodec
Parse dpb_output_delay in SEI picture structure.
Patch by Ivan Schreter, schreter gmx net
author | cehoyos |
---|---|
date | Wed, 18 Feb 2009 00:36:07 +0000 |
parents | e9d9d946f213 |
children | e1b522d24270 |
rev | line source |
---|---|
92 | 1 /* |
2 * PCM codecs | |
8629
04423b2f6e0b
cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents:
8599
diff
changeset
|
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 /** |
8718
e9d9d946f213
Use full internal pathname in doxygen @file directives.
diego
parents:
8629
diff
changeset
|
23 * @file libavcodec/pcm.c |
1108 | 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 |
4959 | 29 #include "bytestream.h" |
92 | 30 |
5940
d63186919b60
add pcm_s16le_planar support for electronicarts files
aurel
parents:
5880
diff
changeset
|
31 #define MAX_CHANNELS 64 |
d63186919b60
add pcm_s16le_planar support for electronicarts files
aurel
parents:
5880
diff
changeset
|
32 |
92 | 33 /* from g711.c by SUN microsystems (unrestricted use) */ |
34 | |
2979 | 35 #define SIGN_BIT (0x80) /* Sign bit for a A-law byte. */ |
36 #define QUANT_MASK (0xf) /* Quantization field mask. */ | |
37 #define NSEGS (8) /* Number of A-law segments. */ | |
38 #define SEG_SHIFT (4) /* Left shift for segment number. */ | |
39 #define SEG_MASK (0x70) /* Segment field mask. */ | |
92 | 40 |
2979 | 41 #define BIAS (0x84) /* Bias for linear code. */ |
92 | 42 |
43 /* | |
44 * alaw2linear() - Convert an A-law value to 16-bit linear PCM | |
45 * | |
46 */ | |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6218
diff
changeset
|
47 static av_cold int alaw2linear(unsigned char a_val) |
92 | 48 { |
2979 | 49 int t; |
50 int seg; | |
92 | 51 |
2979 | 52 a_val ^= 0x55; |
92 | 53 |
2979 | 54 t = a_val & QUANT_MASK; |
55 seg = ((unsigned)a_val & SEG_MASK) >> SEG_SHIFT; | |
56 if(seg) t= (t + t + 1 + 32) << (seg + 2); | |
57 else t= (t + t + 1 ) << 3; | |
1485 | 58 |
6750 | 59 return (a_val & SIGN_BIT) ? t : -t; |
92 | 60 } |
61 | |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6218
diff
changeset
|
62 static av_cold int ulaw2linear(unsigned char u_val) |
92 | 63 { |
2979 | 64 int t; |
92 | 65 |
2979 | 66 /* Complement to obtain normal u-law value. */ |
67 u_val = ~u_val; | |
92 | 68 |
2979 | 69 /* |
70 * Extract and bias the quantization bits. Then | |
71 * shift up by the segment number and subtract out the bias. | |
72 */ | |
73 t = ((u_val & QUANT_MASK) << 3) + BIAS; | |
74 t <<= ((unsigned)u_val & SEG_MASK) >> SEG_SHIFT; | |
92 | 75 |
6750 | 76 return (u_val & SIGN_BIT) ? (BIAS - t) : (t - BIAS); |
92 | 77 } |
78 | |
79 /* 16384 entries per table */ | |
4660 | 80 static uint8_t linear_to_alaw[16384]; |
81 static uint8_t linear_to_ulaw[16384]; | |
92 | 82 |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6218
diff
changeset
|
83 static av_cold void build_xlaw_table(uint8_t *linear_to_xlaw, |
92 | 84 int (*xlaw2linear)(unsigned char), |
2967 | 85 int mask) |
92 | 86 { |
87 int i, j, v, v1, v2; | |
88 | |
89 j = 0; | |
90 for(i=0;i<128;i++) { | |
91 if (i != 127) { | |
92 v1 = xlaw2linear(i ^ mask); | |
93 v2 = xlaw2linear((i + 1) ^ mask); | |
94 v = (v1 + v2 + 4) >> 3; | |
95 } else { | |
96 v = 8192; | |
97 } | |
98 for(;j<v;j++) { | |
99 linear_to_xlaw[8192 + j] = (i ^ mask); | |
100 if (j > 0) | |
101 linear_to_xlaw[8192 - j] = (i ^ (mask ^ 0x80)); | |
102 } | |
103 } | |
104 linear_to_xlaw[0] = linear_to_xlaw[1]; | |
105 } | |
106 | |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6218
diff
changeset
|
107 static av_cold int pcm_encode_init(AVCodecContext *avctx) |
92 | 108 { |
109 avctx->frame_size = 1; | |
110 switch(avctx->codec->id) { | |
111 case CODEC_ID_PCM_ALAW: | |
4660 | 112 build_xlaw_table(linear_to_alaw, alaw2linear, 0xd5); |
92 | 113 break; |
114 case CODEC_ID_PCM_MULAW: | |
4660 | 115 build_xlaw_table(linear_to_ulaw, ulaw2linear, 0xff); |
92 | 116 break; |
117 default: | |
118 break; | |
119 } | |
2967 | 120 |
7823
4525dcd81357
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
7770
diff
changeset
|
121 avctx->bits_per_coded_sample = av_get_bits_per_sample(avctx->codec->id); |
4525dcd81357
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
7770
diff
changeset
|
122 avctx->block_align = avctx->channels * avctx->bits_per_coded_sample/8; |
925 | 123 avctx->coded_frame= avcodec_alloc_frame(); |
124 avctx->coded_frame->key_frame= 1; | |
2967 | 125 |
92 | 126 return 0; |
127 } | |
128 | |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6218
diff
changeset
|
129 static av_cold int pcm_encode_close(AVCodecContext *avctx) |
92 | 130 { |
925 | 131 av_freep(&avctx->coded_frame); |
132 | |
92 | 133 return 0; |
134 } | |
135 | |
2852
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
136 /** |
7519 | 137 * Write PCM samples macro |
138 * @param type Datatype of native machine format | |
139 * @param endian bytestream_put_xxx() suffix | |
140 * @param src Source pointer (variable name) | |
141 * @param dst Destination pointer (variable name) | |
142 * @param n Total number of samples (variable name) | |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
143 * @param shift Bitshift (bits) |
7519 | 144 * @param offset Sample value offset |
145 */ | |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
146 #define ENCODE(type, endian, src, dst, n, shift, offset) \ |
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
147 samples_##type = (type*)src; \ |
7519 | 148 for(;n>0;n--) { \ |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
149 register type v = (*samples_##type++ >> shift) + offset; \ |
7519 | 150 bytestream_put_##endian(&dst, v); \ |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
151 } |
7519 | 152 |
440
000aeeac27a2
* started to cleanup name clashes for onetime compilation
kabi
parents:
429
diff
changeset
|
153 static int pcm_encode_frame(AVCodecContext *avctx, |
2979 | 154 unsigned char *frame, int buf_size, void *data) |
92 | 155 { |
156 int n, sample_size, v; | |
157 short *samples; | |
158 unsigned char *dst; | |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
159 uint8_t *srcu8; |
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
160 int16_t *samples_int16_t; |
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
161 int32_t *samples_int32_t; |
7613 | 162 int64_t *samples_int64_t; |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
163 uint16_t *samples_uint16_t; |
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
164 uint32_t *samples_uint32_t; |
92 | 165 |
7477
2f6a2fd238fb
Simplify PCM codec; replace switch() statements with av_get_bits_per_sample().
pross
parents:
7476
diff
changeset
|
166 sample_size = av_get_bits_per_sample(avctx->codec->id)/8; |
92 | 167 n = buf_size / sample_size; |
168 samples = data; | |
169 dst = frame; | |
170 | |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
171 if (avctx->sample_fmt!=avctx->codec->sample_fmts[0]) { |
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
172 av_log(avctx, AV_LOG_ERROR, "invalid sample_fmt\n"); |
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
173 return -1; |
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
174 } |
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
175 |
92 | 176 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
|
177 case CODEC_ID_PCM_U32LE: |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
178 ENCODE(uint32_t, le32, samples, dst, n, 0, 0x80000000) |
2852
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
179 break; |
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
180 case CODEC_ID_PCM_U32BE: |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
181 ENCODE(uint32_t, be32, samples, dst, n, 0, 0x80000000) |
2852
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
182 break; |
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
183 case CODEC_ID_PCM_S24LE: |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
184 ENCODE(int32_t, le24, samples, dst, n, 8, 0) |
2852
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
185 break; |
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
186 case CODEC_ID_PCM_S24BE: |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
187 ENCODE(int32_t, be24, samples, dst, n, 8, 0) |
2852
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
188 break; |
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
189 case CODEC_ID_PCM_U24LE: |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
190 ENCODE(uint32_t, le24, samples, dst, n, 8, 0x800000) |
2852
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
191 break; |
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
192 case CODEC_ID_PCM_U24BE: |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
193 ENCODE(uint32_t, be24, samples, dst, n, 8, 0x800000) |
2852
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
194 break; |
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_S24DAUD: |
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
196 for(;n>0;n--) { |
7517
d4e19b465fcb
Prevent DAUD PCM encoder from fetching values outside of ff_reverse[] array bounds when input sample values are < 0.
pross
parents:
7477
diff
changeset
|
197 uint32_t tmp = ff_reverse[(*samples >> 8) & 0xff] + |
2852
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
198 (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
|
199 tmp <<= 4; // sync flags would go here |
4959 | 200 bytestream_put_be24(&dst, tmp); |
2852
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
201 samples++; |
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
202 } |
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
203 break; |
92 | 204 case CODEC_ID_PCM_U16LE: |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
205 ENCODE(uint16_t, le16, samples, dst, n, 0, 0x8000) |
92 | 206 break; |
207 case CODEC_ID_PCM_U16BE: | |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
208 ENCODE(uint16_t, be16, samples, dst, n, 0, 0x8000) |
92 | 209 break; |
210 case CODEC_ID_PCM_S8: | |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
211 srcu8= data; |
92 | 212 for(;n>0;n--) { |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
213 v = *srcu8++; |
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
214 *dst++ = v - 128; |
92 | 215 } |
216 break; | |
8599 | 217 #ifdef WORDS_BIGENDIAN |
7613 | 218 case CODEC_ID_PCM_F64LE: |
219 ENCODE(int64_t, le64, samples, dst, n, 0, 0) | |
220 break; | |
7583
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
221 case CODEC_ID_PCM_S32LE: |
7613 | 222 case CODEC_ID_PCM_F32LE: |
7583
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
223 ENCODE(int32_t, le32, samples, dst, n, 0, 0) |
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
224 break; |
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
225 case CODEC_ID_PCM_S16LE: |
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
226 ENCODE(int16_t, le16, samples, dst, n, 0, 0) |
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
227 break; |
7613 | 228 case CODEC_ID_PCM_F64BE: |
7583
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
229 case CODEC_ID_PCM_F32BE: |
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
230 case CODEC_ID_PCM_S32BE: |
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
231 case CODEC_ID_PCM_S16BE: |
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
232 #else |
7613 | 233 case CODEC_ID_PCM_F64BE: |
234 ENCODE(int64_t, be64, samples, dst, n, 0, 0) | |
235 break; | |
7583
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
236 case CODEC_ID_PCM_F32BE: |
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
237 case CODEC_ID_PCM_S32BE: |
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
238 ENCODE(int32_t, be32, samples, dst, n, 0, 0) |
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
239 break; |
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
240 case CODEC_ID_PCM_S16BE: |
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
241 ENCODE(int16_t, be16, samples, dst, n, 0, 0) |
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
242 break; |
7613 | 243 case CODEC_ID_PCM_F64LE: |
244 case CODEC_ID_PCM_F32LE: | |
7583
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
245 case CODEC_ID_PCM_S32LE: |
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
246 case CODEC_ID_PCM_S16LE: |
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
247 #endif /* WORDS_BIGENDIAN */ |
92 | 248 case CODEC_ID_PCM_U8: |
7583
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
249 memcpy(dst, samples, n*sample_size); |
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
250 dst += n*sample_size; |
92 | 251 break; |
5422 | 252 case CODEC_ID_PCM_ZORK: |
253 for(;n>0;n--) { | |
254 v= *samples++ >> 8; | |
255 if(v<0) v = -v; | |
256 else v+= 128; | |
257 *dst++ = v; | |
258 } | |
259 break; | |
92 | 260 case CODEC_ID_PCM_ALAW: |
261 for(;n>0;n--) { | |
262 v = *samples++; | |
4960 | 263 *dst++ = linear_to_alaw[(v + 32768) >> 2]; |
92 | 264 } |
265 break; | |
266 case CODEC_ID_PCM_MULAW: | |
267 for(;n>0;n--) { | |
268 v = *samples++; | |
4960 | 269 *dst++ = linear_to_ulaw[(v + 32768) >> 2]; |
92 | 270 } |
271 break; | |
272 default: | |
273 return -1; | |
274 } | |
381
0d6178e4d503
* Mea culpa: it seems that I broke encoding to 8-bit pcm files. This fixes it.
philipjsg
parents:
372
diff
changeset
|
275 //avctx->frame_size = (dst - frame) / (sample_size * avctx->channels); |
372 | 276 |
92 | 277 return dst - frame; |
278 } | |
279 | |
280 typedef struct PCMDecode { | |
281 short table[256]; | |
282 } PCMDecode; | |
283 | |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6218
diff
changeset
|
284 static av_cold int pcm_decode_init(AVCodecContext * avctx) |
92 | 285 { |
286 PCMDecode *s = avctx->priv_data; | |
287 int i; | |
288 | |
289 switch(avctx->codec->id) { | |
290 case CODEC_ID_PCM_ALAW: | |
291 for(i=0;i<256;i++) | |
292 s->table[i] = alaw2linear(i); | |
293 break; | |
294 case CODEC_ID_PCM_MULAW: | |
295 for(i=0;i<256;i++) | |
296 s->table[i] = ulaw2linear(i); | |
297 break; | |
298 default: | |
299 break; | |
300 } | |
7409
21770337ff2d
add CODEC_ID_PCM_F32BE (32-bit floating point PCM big endian decoder)
pross
parents:
7197
diff
changeset
|
301 |
7476
2321e0384521
Simplify PCM codec; use sample_fmts field to set the avctx->sample_fmt field.
pross
parents:
7451
diff
changeset
|
302 avctx->sample_fmt = avctx->codec->sample_fmts[0]; |
92 | 303 return 0; |
304 } | |
305 | |
2852
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
306 /** |
7519 | 307 * Read PCM samples macro |
308 * @param type Datatype of native machine format | |
309 * @param endian bytestream_get_xxx() endian suffix | |
310 * @param src Source pointer (variable name) | |
311 * @param dst Destination pointer (variable name) | |
312 * @param n Total number of samples (variable name) | |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
313 * @param shift Bitshift (bits) |
7519 | 314 * @param offset Sample value offset |
315 */ | |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
316 #define DECODE(type, endian, src, dst, n, shift, offset) \ |
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
317 dst_##type = (type*)dst; \ |
7519 | 318 for(;n>0;n--) { \ |
319 register type v = bytestream_get_##endian(&src); \ | |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
320 *dst_##type++ = (v - offset) << shift; \ |
7519 | 321 } \ |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
322 dst = (short*)dst_##type; |
7519 | 323 |
440
000aeeac27a2
* started to cleanup name clashes for onetime compilation
kabi
parents:
429
diff
changeset
|
324 static int pcm_decode_frame(AVCodecContext *avctx, |
2979 | 325 void *data, int *data_size, |
6218 | 326 const uint8_t *buf, int buf_size) |
92 | 327 { |
328 PCMDecode *s = avctx->priv_data; | |
7518
a40c76e98909
Simplify PCM codec; change 'n' in pcm_decode_frame() to equal "total number of samples".
pross
parents:
7517
diff
changeset
|
329 int sample_size, c, n; |
92 | 330 short *samples; |
7677
3db125934e60
Upgrade 20/24-bit PCM DVD decoder use SAMPLE_FMT_S32. Patch supplied by lars dot taeuber at gmx dot net.
pross
parents:
7628
diff
changeset
|
331 const uint8_t *src, *src8, *src2[MAX_CHANNELS]; |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
332 uint8_t *dstu8; |
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
333 int16_t *dst_int16_t; |
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
334 int32_t *dst_int32_t; |
7613 | 335 int64_t *dst_int64_t; |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
336 uint16_t *dst_uint16_t; |
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
337 uint32_t *dst_uint32_t; |
92 | 338 |
339 samples = data; | |
340 src = buf; | |
341 | |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
342 if (avctx->sample_fmt!=avctx->codec->sample_fmts[0]) { |
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
343 av_log(avctx, AV_LOG_ERROR, "invalid sample_fmt\n"); |
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
344 return -1; |
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
345 } |
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
346 |
6821
1b9c458d6d60
LPCM 24 bits support, patch by Lars T¸«£uber, lars.taeuber gmx net
diego
parents:
6817
diff
changeset
|
347 if(avctx->channels <= 0 || avctx->channels > MAX_CHANNELS){ |
1b9c458d6d60
LPCM 24 bits support, patch by Lars T¸«£uber, lars.taeuber gmx net
diego
parents:
6817
diff
changeset
|
348 av_log(avctx, AV_LOG_ERROR, "PCM channels out of bounds\n"); |
1b9c458d6d60
LPCM 24 bits support, patch by Lars T¸«£uber, lars.taeuber gmx net
diego
parents:
6817
diff
changeset
|
349 return -1; |
1b9c458d6d60
LPCM 24 bits support, patch by Lars T¸«£uber, lars.taeuber gmx net
diego
parents:
6817
diff
changeset
|
350 } |
1b9c458d6d60
LPCM 24 bits support, patch by Lars T¸«£uber, lars.taeuber gmx net
diego
parents:
6817
diff
changeset
|
351 |
7518
a40c76e98909
Simplify PCM codec; change 'n' in pcm_decode_frame() to equal "total number of samples".
pross
parents:
7517
diff
changeset
|
352 sample_size = av_get_bits_per_sample(avctx->codec_id)/8; |
a40c76e98909
Simplify PCM codec; change 'n' in pcm_decode_frame() to equal "total number of samples".
pross
parents:
7517
diff
changeset
|
353 |
6821
1b9c458d6d60
LPCM 24 bits support, patch by Lars T¸«£uber, lars.taeuber gmx net
diego
parents:
6817
diff
changeset
|
354 /* av_get_bits_per_sample returns 0 for CODEC_ID_PCM_DVD */ |
1b9c458d6d60
LPCM 24 bits support, patch by Lars T¸«£uber, lars.taeuber gmx net
diego
parents:
6817
diff
changeset
|
355 if (CODEC_ID_PCM_DVD == avctx->codec_id) |
1b9c458d6d60
LPCM 24 bits support, patch by Lars T¸«£uber, lars.taeuber gmx net
diego
parents:
6817
diff
changeset
|
356 /* 2 samples are interleaved per block in PCM_DVD */ |
7823
4525dcd81357
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
7770
diff
changeset
|
357 sample_size = avctx->bits_per_coded_sample * 2 / 8; |
7628
2f5ed95d1039
Fix PCM DVD divide by zero bug introduced in r14659. Patch supplied by lars dot taeuber at gmx dot net.
pross
parents:
7613
diff
changeset
|
358 |
2f5ed95d1039
Fix PCM DVD divide by zero bug introduced in r14659. Patch supplied by lars dot taeuber at gmx dot net.
pross
parents:
7613
diff
changeset
|
359 n = avctx->channels * sample_size; |
6821
1b9c458d6d60
LPCM 24 bits support, patch by Lars T¸«£uber, lars.taeuber gmx net
diego
parents:
6817
diff
changeset
|
360 |
6033
bd7600c7a061
Fix crash in PCM decoder when number of channels is not set.
benoit
parents:
5944
diff
changeset
|
361 if(n && buf_size % n){ |
4506 | 362 av_log(avctx, AV_LOG_ERROR, "invalid PCM packet\n"); |
363 return -1; | |
364 } | |
365 | |
4351 | 366 buf_size= FFMIN(buf_size, *data_size/2); |
367 *data_size=0; | |
2506 | 368 |
7518
a40c76e98909
Simplify PCM codec; change 'n' in pcm_decode_frame() to equal "total number of samples".
pross
parents:
7517
diff
changeset
|
369 n = buf_size/sample_size; |
5940
d63186919b60
add pcm_s16le_planar support for electronicarts files
aurel
parents:
5880
diff
changeset
|
370 |
92 | 371 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
|
372 case CODEC_ID_PCM_U32LE: |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
373 DECODE(uint32_t, le32, src, samples, n, 0, 0x80000000) |
2852
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
374 break; |
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
375 case CODEC_ID_PCM_U32BE: |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
376 DECODE(uint32_t, be32, src, samples, n, 0, 0x80000000) |
2852
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
377 break; |
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
378 case CODEC_ID_PCM_S24LE: |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
379 DECODE(int32_t, le24, src, samples, n, 8, 0) |
2852
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
380 break; |
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
381 case CODEC_ID_PCM_S24BE: |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
382 DECODE(int32_t, be24, src, samples, n, 8, 0) |
2852
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
383 break; |
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
384 case CODEC_ID_PCM_U24LE: |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
385 DECODE(uint32_t, le24, src, samples, n, 8, 0x800000) |
2852
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
386 break; |
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
387 case CODEC_ID_PCM_U24BE: |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
388 DECODE(uint32_t, be24, src, samples, n, 8, 0x800000) |
2852
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
389 break; |
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
390 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
|
391 for(;n>0;n--) { |
4959 | 392 uint32_t v = bytestream_get_be24(&src); |
2852
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
393 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
|
394 *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
|
395 (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
|
396 } |
6f7428adc6ad
Support de-/encoding of 24 and 32 bit PCM (from and to internal 16 bit).
reimar
parents:
2506
diff
changeset
|
397 break; |
5940
d63186919b60
add pcm_s16le_planar support for electronicarts files
aurel
parents:
5880
diff
changeset
|
398 case CODEC_ID_PCM_S16LE_PLANAR: |
7518
a40c76e98909
Simplify PCM codec; change 'n' in pcm_decode_frame() to equal "total number of samples".
pross
parents:
7517
diff
changeset
|
399 n /= avctx->channels; |
a40c76e98909
Simplify PCM codec; change 'n' in pcm_decode_frame() to equal "total number of samples".
pross
parents:
7517
diff
changeset
|
400 for(c=0;c<avctx->channels;c++) |
7611
a909361cdfc4
Fix PCM_S16LE_PLANAR channel-address calculation bug introduced in r14659.
pross
parents:
7583
diff
changeset
|
401 src2[c] = &src[c*n*2]; |
a909361cdfc4
Fix PCM_S16LE_PLANAR channel-address calculation bug introduced in r14659.
pross
parents:
7583
diff
changeset
|
402 for(;n>0;n--) |
5940
d63186919b60
add pcm_s16le_planar support for electronicarts files
aurel
parents:
5880
diff
changeset
|
403 for(c=0;c<avctx->channels;c++) |
d63186919b60
add pcm_s16le_planar support for electronicarts files
aurel
parents:
5880
diff
changeset
|
404 *samples++ = bytestream_get_le16(&src2[c]); |
d63186919b60
add pcm_s16le_planar support for electronicarts files
aurel
parents:
5880
diff
changeset
|
405 src = src2[avctx->channels-1]; |
d63186919b60
add pcm_s16le_planar support for electronicarts files
aurel
parents:
5880
diff
changeset
|
406 break; |
92 | 407 case CODEC_ID_PCM_U16LE: |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
408 DECODE(uint16_t, le16, src, samples, n, 0, 0x8000) |
92 | 409 break; |
410 case CODEC_ID_PCM_U16BE: | |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
411 DECODE(uint16_t, be16, src, samples, n, 0, 0x8000) |
92 | 412 break; |
413 case CODEC_ID_PCM_S8: | |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
414 dstu8= (uint8_t*)samples; |
92 | 415 for(;n>0;n--) { |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
416 *dstu8++ = *src++ + 128; |
92 | 417 } |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
418 samples= (short*)dstu8; |
92 | 419 break; |
8599 | 420 #ifdef WORDS_BIGENDIAN |
7613 | 421 case CODEC_ID_PCM_F64LE: |
422 DECODE(int64_t, le64, src, samples, n, 0, 0) | |
423 break; | |
7583
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
424 case CODEC_ID_PCM_S32LE: |
7613 | 425 case CODEC_ID_PCM_F32LE: |
7583
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
426 DECODE(int32_t, le32, src, samples, n, 0, 0) |
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
427 break; |
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
428 case CODEC_ID_PCM_S16LE: |
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
429 DECODE(int16_t, le16, src, samples, n, 0, 0) |
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
430 break; |
7613 | 431 case CODEC_ID_PCM_F64BE: |
7583
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
432 case CODEC_ID_PCM_F32BE: |
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
433 case CODEC_ID_PCM_S32BE: |
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
434 case CODEC_ID_PCM_S16BE: |
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
435 #else |
7613 | 436 case CODEC_ID_PCM_F64BE: |
437 DECODE(int64_t, be64, src, samples, n, 0, 0) | |
438 break; | |
7583
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
439 case CODEC_ID_PCM_F32BE: |
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
440 case CODEC_ID_PCM_S32BE: |
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
441 DECODE(int32_t, be32, src, samples, n, 0, 0) |
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
442 break; |
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
443 case CODEC_ID_PCM_S16BE: |
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
444 DECODE(int16_t, be16, src, samples, n, 0, 0) |
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
445 break; |
7613 | 446 case CODEC_ID_PCM_F64LE: |
447 case CODEC_ID_PCM_F32LE: | |
7583
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
448 case CODEC_ID_PCM_S32LE: |
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
449 case CODEC_ID_PCM_S16LE: |
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
450 #endif /* WORDS_BIGENDIAN */ |
92 | 451 case CODEC_ID_PCM_U8: |
7583
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
452 memcpy(samples, src, n*sample_size); |
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
453 src += n*sample_size; |
2a3f40605dec
Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
pross
parents:
7551
diff
changeset
|
454 samples = (short*)((uint8_t*)data + n*sample_size); |
92 | 455 break; |
5422 | 456 case CODEC_ID_PCM_ZORK: |
457 for(;n>0;n--) { | |
458 int x= *src++; | |
459 if(x&128) x-= 128; | |
460 else x = -x; | |
461 *samples++ = x << 8; | |
462 } | |
463 break; | |
92 | 464 case CODEC_ID_PCM_ALAW: |
465 case CODEC_ID_PCM_MULAW: | |
466 for(;n>0;n--) { | |
4960 | 467 *samples++ = s->table[*src++]; |
92 | 468 } |
469 break; | |
6821
1b9c458d6d60
LPCM 24 bits support, patch by Lars T¸«£uber, lars.taeuber gmx net
diego
parents:
6817
diff
changeset
|
470 case CODEC_ID_PCM_DVD: |
7677
3db125934e60
Upgrade 20/24-bit PCM DVD decoder use SAMPLE_FMT_S32. Patch supplied by lars dot taeuber at gmx dot net.
pross
parents:
7628
diff
changeset
|
471 dst_int32_t = data; |
3db125934e60
Upgrade 20/24-bit PCM DVD decoder use SAMPLE_FMT_S32. Patch supplied by lars dot taeuber at gmx dot net.
pross
parents:
7628
diff
changeset
|
472 n /= avctx->channels; |
7823
4525dcd81357
Bump Major version, this commit is almost just renaming bits_per_sample to
michael
parents:
7770
diff
changeset
|
473 switch (avctx->bits_per_coded_sample) { |
7677
3db125934e60
Upgrade 20/24-bit PCM DVD decoder use SAMPLE_FMT_S32. Patch supplied by lars dot taeuber at gmx dot net.
pross
parents:
7628
diff
changeset
|
474 case 20: |
3db125934e60
Upgrade 20/24-bit PCM DVD decoder use SAMPLE_FMT_S32. Patch supplied by lars dot taeuber at gmx dot net.
pross
parents:
7628
diff
changeset
|
475 while (n--) { |
3db125934e60
Upgrade 20/24-bit PCM DVD decoder use SAMPLE_FMT_S32. Patch supplied by lars dot taeuber at gmx dot net.
pross
parents:
7628
diff
changeset
|
476 c = avctx->channels; |
3db125934e60
Upgrade 20/24-bit PCM DVD decoder use SAMPLE_FMT_S32. Patch supplied by lars dot taeuber at gmx dot net.
pross
parents:
7628
diff
changeset
|
477 src8 = src + 4*c; |
3db125934e60
Upgrade 20/24-bit PCM DVD decoder use SAMPLE_FMT_S32. Patch supplied by lars dot taeuber at gmx dot net.
pross
parents:
7628
diff
changeset
|
478 while (c--) { |
3db125934e60
Upgrade 20/24-bit PCM DVD decoder use SAMPLE_FMT_S32. Patch supplied by lars dot taeuber at gmx dot net.
pross
parents:
7628
diff
changeset
|
479 *dst_int32_t++ = (bytestream_get_be16(&src) << 16) + ((*src8 &0xf0) << 8); |
3db125934e60
Upgrade 20/24-bit PCM DVD decoder use SAMPLE_FMT_S32. Patch supplied by lars dot taeuber at gmx dot net.
pross
parents:
7628
diff
changeset
|
480 *dst_int32_t++ = (bytestream_get_be16(&src) << 16) + ((*src8++ &0x0f) << 12); |
3db125934e60
Upgrade 20/24-bit PCM DVD decoder use SAMPLE_FMT_S32. Patch supplied by lars dot taeuber at gmx dot net.
pross
parents:
7628
diff
changeset
|
481 } |
3db125934e60
Upgrade 20/24-bit PCM DVD decoder use SAMPLE_FMT_S32. Patch supplied by lars dot taeuber at gmx dot net.
pross
parents:
7628
diff
changeset
|
482 src = src8; |
3db125934e60
Upgrade 20/24-bit PCM DVD decoder use SAMPLE_FMT_S32. Patch supplied by lars dot taeuber at gmx dot net.
pross
parents:
7628
diff
changeset
|
483 } |
3db125934e60
Upgrade 20/24-bit PCM DVD decoder use SAMPLE_FMT_S32. Patch supplied by lars dot taeuber at gmx dot net.
pross
parents:
7628
diff
changeset
|
484 break; |
3db125934e60
Upgrade 20/24-bit PCM DVD decoder use SAMPLE_FMT_S32. Patch supplied by lars dot taeuber at gmx dot net.
pross
parents:
7628
diff
changeset
|
485 case 24: |
3db125934e60
Upgrade 20/24-bit PCM DVD decoder use SAMPLE_FMT_S32. Patch supplied by lars dot taeuber at gmx dot net.
pross
parents:
7628
diff
changeset
|
486 while (n--) { |
3db125934e60
Upgrade 20/24-bit PCM DVD decoder use SAMPLE_FMT_S32. Patch supplied by lars dot taeuber at gmx dot net.
pross
parents:
7628
diff
changeset
|
487 c = avctx->channels; |
3db125934e60
Upgrade 20/24-bit PCM DVD decoder use SAMPLE_FMT_S32. Patch supplied by lars dot taeuber at gmx dot net.
pross
parents:
7628
diff
changeset
|
488 src8 = src + 4*c; |
3db125934e60
Upgrade 20/24-bit PCM DVD decoder use SAMPLE_FMT_S32. Patch supplied by lars dot taeuber at gmx dot net.
pross
parents:
7628
diff
changeset
|
489 while (c--) { |
3db125934e60
Upgrade 20/24-bit PCM DVD decoder use SAMPLE_FMT_S32. Patch supplied by lars dot taeuber at gmx dot net.
pross
parents:
7628
diff
changeset
|
490 *dst_int32_t++ = (bytestream_get_be16(&src) << 16) + ((*src8++) << 8); |
3db125934e60
Upgrade 20/24-bit PCM DVD decoder use SAMPLE_FMT_S32. Patch supplied by lars dot taeuber at gmx dot net.
pross
parents:
7628
diff
changeset
|
491 *dst_int32_t++ = (bytestream_get_be16(&src) << 16) + ((*src8++) << 8); |
3db125934e60
Upgrade 20/24-bit PCM DVD decoder use SAMPLE_FMT_S32. Patch supplied by lars dot taeuber at gmx dot net.
pross
parents:
7628
diff
changeset
|
492 } |
3db125934e60
Upgrade 20/24-bit PCM DVD decoder use SAMPLE_FMT_S32. Patch supplied by lars dot taeuber at gmx dot net.
pross
parents:
7628
diff
changeset
|
493 src = src8; |
3db125934e60
Upgrade 20/24-bit PCM DVD decoder use SAMPLE_FMT_S32. Patch supplied by lars dot taeuber at gmx dot net.
pross
parents:
7628
diff
changeset
|
494 } |
3db125934e60
Upgrade 20/24-bit PCM DVD decoder use SAMPLE_FMT_S32. Patch supplied by lars dot taeuber at gmx dot net.
pross
parents:
7628
diff
changeset
|
495 break; |
3db125934e60
Upgrade 20/24-bit PCM DVD decoder use SAMPLE_FMT_S32. Patch supplied by lars dot taeuber at gmx dot net.
pross
parents:
7628
diff
changeset
|
496 default: |
6821
1b9c458d6d60
LPCM 24 bits support, patch by Lars T¸«£uber, lars.taeuber gmx net
diego
parents:
6817
diff
changeset
|
497 av_log(avctx, AV_LOG_ERROR, "PCM DVD unsupported sample depth\n"); |
1b9c458d6d60
LPCM 24 bits support, patch by Lars T¸«£uber, lars.taeuber gmx net
diego
parents:
6817
diff
changeset
|
498 return -1; |
7677
3db125934e60
Upgrade 20/24-bit PCM DVD decoder use SAMPLE_FMT_S32. Patch supplied by lars dot taeuber at gmx dot net.
pross
parents:
7628
diff
changeset
|
499 break; |
6821
1b9c458d6d60
LPCM 24 bits support, patch by Lars T¸«£uber, lars.taeuber gmx net
diego
parents:
6817
diff
changeset
|
500 } |
7677
3db125934e60
Upgrade 20/24-bit PCM DVD decoder use SAMPLE_FMT_S32. Patch supplied by lars dot taeuber at gmx dot net.
pross
parents:
7628
diff
changeset
|
501 samples = (short *) dst_int32_t; |
6821
1b9c458d6d60
LPCM 24 bits support, patch by Lars T¸«£uber, lars.taeuber gmx net
diego
parents:
6817
diff
changeset
|
502 break; |
92 | 503 default: |
504 return -1; | |
505 } | |
1064 | 506 *data_size = (uint8_t *)samples - (uint8_t *)data; |
92 | 507 return src - buf; |
508 } | |
509 | |
8590 | 510 #if CONFIG_ENCODERS |
7451
85ab7655ad4d
Modify all codecs to report their supported input and output sample format(s).
pross
parents:
7409
diff
changeset
|
511 #define PCM_ENCODER(id,sample_fmt_,name,long_name_) \ |
92 | 512 AVCodec name ## _encoder = { \ |
513 #name, \ | |
514 CODEC_TYPE_AUDIO, \ | |
515 id, \ | |
516 0, \ | |
2979 | 517 pcm_encode_init, \ |
518 pcm_encode_frame, \ | |
519 pcm_encode_close, \ | |
92 | 520 NULL, \ |
7451
85ab7655ad4d
Modify all codecs to report their supported input and output sample format(s).
pross
parents:
7409
diff
changeset
|
521 .sample_fmts = (enum SampleFormat[]){sample_fmt_,SAMPLE_FMT_NONE}, \ |
7040
e943e1409077
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents:
6821
diff
changeset
|
522 .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ |
5880
6814207ffb27
split definition of PCM_CODEC into PCM_ENCODER and PCM_DECODER
aurel
parents:
5861
diff
changeset
|
523 }; |
6814207ffb27
split definition of PCM_CODEC into PCM_ENCODER and PCM_DECODER
aurel
parents:
5861
diff
changeset
|
524 #else |
7451
85ab7655ad4d
Modify all codecs to report their supported input and output sample format(s).
pross
parents:
7409
diff
changeset
|
525 #define PCM_ENCODER(id,sample_fmt_,name,long_name_) |
5880
6814207ffb27
split definition of PCM_CODEC into PCM_ENCODER and PCM_DECODER
aurel
parents:
5861
diff
changeset
|
526 #endif |
6814207ffb27
split definition of PCM_CODEC into PCM_ENCODER and PCM_DECODER
aurel
parents:
5861
diff
changeset
|
527 |
8590 | 528 #if CONFIG_DECODERS |
7476
2321e0384521
Simplify PCM codec; use sample_fmts field to set the avctx->sample_fmt field.
pross
parents:
7451
diff
changeset
|
529 #define PCM_DECODER(id,sample_fmt_,name,long_name_) \ |
92 | 530 AVCodec name ## _decoder = { \ |
531 #name, \ | |
532 CODEC_TYPE_AUDIO, \ | |
533 id, \ | |
534 sizeof(PCMDecode), \ | |
2979 | 535 pcm_decode_init, \ |
92 | 536 NULL, \ |
537 NULL, \ | |
440
000aeeac27a2
* started to cleanup name clashes for onetime compilation
kabi
parents:
429
diff
changeset
|
538 pcm_decode_frame, \ |
7476
2321e0384521
Simplify PCM codec; use sample_fmts field to set the avctx->sample_fmt field.
pross
parents:
7451
diff
changeset
|
539 .sample_fmts = (enum SampleFormat[]){sample_fmt_,SAMPLE_FMT_NONE}, \ |
7040
e943e1409077
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents:
6821
diff
changeset
|
540 .long_name = NULL_IF_CONFIG_SMALL(long_name_), \ |
5880
6814207ffb27
split definition of PCM_CODEC into PCM_ENCODER and PCM_DECODER
aurel
parents:
5861
diff
changeset
|
541 }; |
6814207ffb27
split definition of PCM_CODEC into PCM_ENCODER and PCM_DECODER
aurel
parents:
5861
diff
changeset
|
542 #else |
7476
2321e0384521
Simplify PCM codec; use sample_fmts field to set the avctx->sample_fmt field.
pross
parents:
7451
diff
changeset
|
543 #define PCM_DECODER(id,sample_fmt_,name,long_name_) |
5880
6814207ffb27
split definition of PCM_CODEC into PCM_ENCODER and PCM_DECODER
aurel
parents:
5861
diff
changeset
|
544 #endif |
6814207ffb27
split definition of PCM_CODEC into PCM_ENCODER and PCM_DECODER
aurel
parents:
5861
diff
changeset
|
545 |
7451
85ab7655ad4d
Modify all codecs to report their supported input and output sample format(s).
pross
parents:
7409
diff
changeset
|
546 #define PCM_CODEC(id, sample_fmt_, name, long_name_) \ |
7476
2321e0384521
Simplify PCM codec; use sample_fmts field to set the avctx->sample_fmt field.
pross
parents:
7451
diff
changeset
|
547 PCM_ENCODER(id,sample_fmt_,name,long_name_) PCM_DECODER(id,sample_fmt_,name,long_name_) |
92 | 548 |
7197
54f8d960f15b
Add a note to remind people that new PCM/ADPCM formats need to be added to
diego
parents:
7040
diff
changeset
|
549 /* Note: Do not forget to add new entries to the Makefile as well. */ |
7451
85ab7655ad4d
Modify all codecs to report their supported input and output sample format(s).
pross
parents:
7409
diff
changeset
|
550 PCM_CODEC (CODEC_ID_PCM_ALAW, SAMPLE_FMT_S16, pcm_alaw, "A-law PCM"); |
7677
3db125934e60
Upgrade 20/24-bit PCM DVD decoder use SAMPLE_FMT_S32. Patch supplied by lars dot taeuber at gmx dot net.
pross
parents:
7628
diff
changeset
|
551 PCM_CODEC (CODEC_ID_PCM_DVD, SAMPLE_FMT_S32, pcm_dvd, "signed 20|24-bit big-endian PCM"); |
7451
85ab7655ad4d
Modify all codecs to report their supported input and output sample format(s).
pross
parents:
7409
diff
changeset
|
552 PCM_CODEC (CODEC_ID_PCM_F32BE, SAMPLE_FMT_FLT, pcm_f32be, "32-bit floating point big-endian PCM"); |
7613 | 553 PCM_CODEC (CODEC_ID_PCM_F32LE, SAMPLE_FMT_FLT, pcm_f32le, "32-bit floating point little-endian PCM"); |
554 PCM_CODEC (CODEC_ID_PCM_F64BE, SAMPLE_FMT_DBL, pcm_f64be, "64-bit floating point big-endian PCM"); | |
555 PCM_CODEC (CODEC_ID_PCM_F64LE, SAMPLE_FMT_DBL, pcm_f64le, "64-bit floating point little-endian PCM"); | |
7451
85ab7655ad4d
Modify all codecs to report their supported input and output sample format(s).
pross
parents:
7409
diff
changeset
|
556 PCM_CODEC (CODEC_ID_PCM_MULAW, SAMPLE_FMT_S16, pcm_mulaw, "mu-law PCM"); |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
557 PCM_CODEC (CODEC_ID_PCM_S8, SAMPLE_FMT_U8, pcm_s8, "signed 8-bit PCM"); |
7451
85ab7655ad4d
Modify all codecs to report their supported input and output sample format(s).
pross
parents:
7409
diff
changeset
|
558 PCM_CODEC (CODEC_ID_PCM_S16BE, SAMPLE_FMT_S16, pcm_s16be, "signed 16-bit big-endian PCM"); |
85ab7655ad4d
Modify all codecs to report their supported input and output sample format(s).
pross
parents:
7409
diff
changeset
|
559 PCM_CODEC (CODEC_ID_PCM_S16LE, SAMPLE_FMT_S16, pcm_s16le, "signed 16-bit little-endian PCM"); |
7476
2321e0384521
Simplify PCM codec; use sample_fmts field to set the avctx->sample_fmt field.
pross
parents:
7451
diff
changeset
|
560 PCM_DECODER(CODEC_ID_PCM_S16LE_PLANAR, SAMPLE_FMT_S16, pcm_s16le_planar, "16-bit little-endian planar PCM"); |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
561 PCM_CODEC (CODEC_ID_PCM_S24BE, SAMPLE_FMT_S32, pcm_s24be, "signed 24-bit big-endian PCM"); |
7451
85ab7655ad4d
Modify all codecs to report their supported input and output sample format(s).
pross
parents:
7409
diff
changeset
|
562 PCM_CODEC (CODEC_ID_PCM_S24DAUD, SAMPLE_FMT_S16, pcm_s24daud, "D-Cinema audio signed 24-bit PCM"); |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
563 PCM_CODEC (CODEC_ID_PCM_S24LE, SAMPLE_FMT_S32, pcm_s24le, "signed 24-bit little-endian PCM"); |
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
564 PCM_CODEC (CODEC_ID_PCM_S32BE, SAMPLE_FMT_S32, pcm_s32be, "signed 32-bit big-endian PCM"); |
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
565 PCM_CODEC (CODEC_ID_PCM_S32LE, SAMPLE_FMT_S32, pcm_s32le, "signed 32-bit little-endian PCM"); |
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
566 PCM_CODEC (CODEC_ID_PCM_U8, SAMPLE_FMT_U8, pcm_u8, "unsigned 8-bit PCM"); |
7451
85ab7655ad4d
Modify all codecs to report their supported input and output sample format(s).
pross
parents:
7409
diff
changeset
|
567 PCM_CODEC (CODEC_ID_PCM_U16BE, SAMPLE_FMT_S16, pcm_u16be, "unsigned 16-bit big-endian PCM"); |
85ab7655ad4d
Modify all codecs to report their supported input and output sample format(s).
pross
parents:
7409
diff
changeset
|
568 PCM_CODEC (CODEC_ID_PCM_U16LE, SAMPLE_FMT_S16, pcm_u16le, "unsigned 16-bit little-endian PCM"); |
7537
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
569 PCM_CODEC (CODEC_ID_PCM_U24BE, SAMPLE_FMT_S32, pcm_u24be, "unsigned 24-bit big-endian PCM"); |
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
570 PCM_CODEC (CODEC_ID_PCM_U24LE, SAMPLE_FMT_S32, pcm_u24le, "unsigned 24-bit little-endian PCM"); |
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
571 PCM_CODEC (CODEC_ID_PCM_U32BE, SAMPLE_FMT_S32, pcm_u32be, "unsigned 32-bit big-endian PCM"); |
4801922896e7
Apply PCM ENCODE/DECODE() macros to the S/U,8/24/32,LE/BE PCM codecs.
pross
parents:
7519
diff
changeset
|
572 PCM_CODEC (CODEC_ID_PCM_U32LE, SAMPLE_FMT_S32, pcm_u32le, "unsigned 32-bit little-endian PCM"); |
7451
85ab7655ad4d
Modify all codecs to report their supported input and output sample format(s).
pross
parents:
7409
diff
changeset
|
573 PCM_CODEC (CODEC_ID_PCM_ZORK, SAMPLE_FMT_S16, pcm_zork, "Zork PCM"); |