Mercurial > mplayer.hg
annotate libaf/af_format.c @ 33736:a5a54c7a15ce
Fix the precision loss in float -> 32bit conversion case, introduced
by my earlier commit. Instead use method proposed by Reimar.
Also, avoid using ldexp, it is slower than multiply with constant.
author | iive |
---|---|
date | Wed, 06 Jul 2011 23:35:39 +0000 |
parents | 6c8743e5fa30 |
children | a93891202051 |
rev | line source |
---|---|
28229
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
26345
diff
changeset
|
1 /* |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
26345
diff
changeset
|
2 * This audio filter changes the format of a data block. Valid |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
26345
diff
changeset
|
3 * formats are: AFMT_U8, AFMT_S8, AFMT_S16_LE, AFMT_S16_BE |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
26345
diff
changeset
|
4 * AFMT_U16_LE, AFMT_U16_BE, AFMT_S32_LE and AFMT_S32_BE. |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
26345
diff
changeset
|
5 * |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
26345
diff
changeset
|
6 * This file is part of MPlayer. |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
26345
diff
changeset
|
7 * |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
26345
diff
changeset
|
8 * MPlayer is free software; you can redistribute it and/or modify |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
26345
diff
changeset
|
9 * it under the terms of the GNU General Public License as published by |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
26345
diff
changeset
|
10 * the Free Software Foundation; either version 2 of the License, or |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
26345
diff
changeset
|
11 * (at your option) any later version. |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
26345
diff
changeset
|
12 * |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
26345
diff
changeset
|
13 * MPlayer is distributed in the hope that it will be useful, |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
26345
diff
changeset
|
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
26345
diff
changeset
|
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
26345
diff
changeset
|
16 * GNU General Public License for more details. |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
26345
diff
changeset
|
17 * |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
26345
diff
changeset
|
18 * You should have received a copy of the GNU General Public License along |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
26345
diff
changeset
|
19 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
26345
diff
changeset
|
20 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
26345
diff
changeset
|
21 */ |
7568 | 22 |
23 #include <stdio.h> | |
24 #include <stdlib.h> | |
25 #include <string.h> | |
26 #include <inttypes.h> | |
27 #include <limits.h> | |
28337
34b7297904ac
Drop HAVE_LRINTF check, lrintf is used without checking in other places.
diego
parents:
28333
diff
changeset
|
28 #include <math.h> |
7568 | 29 |
28333
0ec2ac66f064
Fix build: Add required header and adjust preprocessor check.
diego
parents:
28238
diff
changeset
|
30 #include "config.h" |
21353
a965ca17debc
reordering of #include to avoid clash with math.h and quicktime/*.h, patch by Crhis Roccati<roccati@pobox.com>
nplourde
parents:
16982
diff
changeset
|
31 #include "af.h" |
21507
fa99b3d31d13
Hack around libavutil/bswap.h compilation problems due to always_inline undefined.
reimar
parents:
21372
diff
changeset
|
32 #include "mpbswap.h" |
21353
a965ca17debc
reordering of #include to avoid clash with math.h and quicktime/*.h, patch by Crhis Roccati<roccati@pobox.com>
nplourde
parents:
16982
diff
changeset
|
33 #include "libvo/fastmemcpy.h" |
a965ca17debc
reordering of #include to avoid clash with math.h and quicktime/*.h, patch by Crhis Roccati<roccati@pobox.com>
nplourde
parents:
16982
diff
changeset
|
34 |
33723
6c8743e5fa30
Audio format conversion from float to int is not checked for overflow.
iive
parents:
30241
diff
changeset
|
35 #include "libavutil/avutil.h" |
6c8743e5fa30
Audio format conversion from float to int is not checked for overflow.
iive
parents:
30241
diff
changeset
|
36 |
8167 | 37 /* Functions used by play to convert the input audio to the correct |
38 format */ | |
7568 | 39 |
24561 | 40 /* The below includes retrieves functions for converting to and from |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
41 ulaw and alaw */ |
28238
1bf9023840f9
Rename libaf/af_format_alaw.c --> libaf/af_format_alaw.h and
diego
parents:
28236
diff
changeset
|
42 #include "af_format_ulaw.h" |
1bf9023840f9
Rename libaf/af_format_alaw.c --> libaf/af_format_alaw.h and
diego
parents:
28236
diff
changeset
|
43 #include "af_format_alaw.h" |
7568 | 44 |
24561 | 45 // Switch endianness |
8167 | 46 static void endian(void* in, void* out, int len, int bps); |
24561 | 47 // From signed to unsigned and the other way |
16664 | 48 static void si2us(void* data, int len, int bps); |
8167 | 49 // Change the number of bits per sample |
50 static void change_bps(void* in, void* out, int len, int inbps, int outbps); | |
51 // From float to int signed | |
14791
df515839c8a9
100l for me, lrintf is better. now fixed so it should be prototyped, and should work even if there is no prototype
rfelker
parents:
14758
diff
changeset
|
52 static void float2int(float* in, void* out, int len, int bps); |
8167 | 53 // From signed int to float |
14791
df515839c8a9
100l for me, lrintf is better. now fixed so it should be prototyped, and should work even if there is no prototype
rfelker
parents:
14758
diff
changeset
|
54 static void int2float(void* in, float* out, int len, int bps); |
7719
41e8d0916c60
Fix for audio filters on big endian cpus. It's working now on Solaris SPARC &
jkeil
parents:
7711
diff
changeset
|
55 |
14272 | 56 static af_data_t* play(struct af_instance_s* af, af_data_t* data); |
57 static af_data_t* play_swapendian(struct af_instance_s* af, af_data_t* data); | |
58 static af_data_t* play_float_s16(struct af_instance_s* af, af_data_t* data); | |
59 static af_data_t* play_s16_float(struct af_instance_s* af, af_data_t* data); | |
60 | |
8607 | 61 // Helper functions to check sanity for input arguments |
62 | |
63 // Sanity check for bytes per sample | |
13989
dcb6b4a33aaa
declare check_format and check_bps static, they are used nowhere else.
reimar
parents:
12486
diff
changeset
|
64 static int check_bps(int bps) |
8607 | 65 { |
12478 | 66 if(bps != 4 && bps != 3 && bps != 2 && bps != 1){ |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
67 mp_msg(MSGT_AFILTER, MSGL_ERR, "[format] The number of bytes per sample" |
12478 | 68 " must be 1, 2, 3 or 4. Current value is %i \n",bps); |
8607 | 69 return AF_ERROR; |
70 } | |
71 return AF_OK; | |
72 } | |
73 | |
74 // Check for unsupported formats | |
13989
dcb6b4a33aaa
declare check_format and check_bps static, they are used nowhere else.
reimar
parents:
12486
diff
changeset
|
75 static int check_format(int format) |
8180
4ba9aed295f2
Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents:
8167
diff
changeset
|
76 { |
4ba9aed295f2
Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents:
8167
diff
changeset
|
77 char buf[256]; |
8607 | 78 switch(format & AF_FORMAT_SPECIAL_MASK){ |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
79 case(AF_FORMAT_IMA_ADPCM): |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
80 case(AF_FORMAT_MPEG2): |
8180
4ba9aed295f2
Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents:
8167
diff
changeset
|
81 case(AF_FORMAT_AC3): |
29049 | 82 mp_msg(MSGT_AFILTER, MSGL_ERR, "[format] Sample format %s not yet supported \n", |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
83 af_fmt2str(format,buf,256)); |
8180
4ba9aed295f2
Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents:
8167
diff
changeset
|
84 return AF_ERROR; |
4ba9aed295f2
Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents:
8167
diff
changeset
|
85 } |
4ba9aed295f2
Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents:
8167
diff
changeset
|
86 return AF_OK; |
8607 | 87 } |
8180
4ba9aed295f2
Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents:
8167
diff
changeset
|
88 |
7568 | 89 // Initialization and runtime control |
90 static int control(struct af_instance_s* af, int cmd, void* arg) | |
91 { | |
92 switch(cmd){ | |
8167 | 93 case AF_CONTROL_REINIT:{ |
94 char buf1[256]; | |
95 char buf2[256]; | |
14272 | 96 af_data_t *data = arg; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
97 |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
98 // Make sure this filter isn't redundant |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
99 if(af->data->format == data->format && |
14717
51a7560a92b7
confusing mixture of typecasts and casted variable, removed typecasts
reimar
parents:
14433
diff
changeset
|
100 af->data->bps == data->bps) |
7568 | 101 return AF_DETACH; |
8607 | 102 |
30241
02b9c1a452e1
Add support for distinguishing between little- and big-endian SPDIF AC3
reimar
parents:
29401
diff
changeset
|
103 // Allow trivial AC3-endianness conversion |
02b9c1a452e1
Add support for distinguishing between little- and big-endian SPDIF AC3
reimar
parents:
29401
diff
changeset
|
104 if (!AF_FORMAT_IS_AC3(af->data->format) || !AF_FORMAT_IS_AC3(data->format)) |
24521 | 105 // Check for errors in configuration |
14717
51a7560a92b7
confusing mixture of typecasts and casted variable, removed typecasts
reimar
parents:
14433
diff
changeset
|
106 if((AF_OK != check_bps(data->bps)) || |
51a7560a92b7
confusing mixture of typecasts and casted variable, removed typecasts
reimar
parents:
14433
diff
changeset
|
107 (AF_OK != check_format(data->format)) || |
8607 | 108 (AF_OK != check_bps(af->data->bps)) || |
109 (AF_OK != check_format(af->data->format))) | |
8167 | 110 return AF_ERROR; |
111 | |
29049 | 112 mp_msg(MSGT_AFILTER, MSGL_V, "[format] Changing sample format from %s to %s\n", |
14717
51a7560a92b7
confusing mixture of typecasts and casted variable, removed typecasts
reimar
parents:
14433
diff
changeset
|
113 af_fmt2str(data->format,buf1,256), |
14399
1a882e2a419b
af_fmt2str fixes (remove trailing space, call with size of buffer, not size-1)
reimar
parents:
14335
diff
changeset
|
114 af_fmt2str(af->data->format,buf2,256)); |
7568 | 115 |
14717
51a7560a92b7
confusing mixture of typecasts and casted variable, removed typecasts
reimar
parents:
14433
diff
changeset
|
116 af->data->rate = data->rate; |
51a7560a92b7
confusing mixture of typecasts and casted variable, removed typecasts
reimar
parents:
14433
diff
changeset
|
117 af->data->nch = data->nch; |
24888 | 118 af->mul = (double)af->data->bps / data->bps; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
119 |
14272 | 120 af->play = play; // set default |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
121 |
24561 | 122 // look whether only endianness differences are there |
14272 | 123 if ((af->data->format & ~AF_FORMAT_END_MASK) == |
124 (data->format & ~AF_FORMAT_END_MASK)) | |
125 { | |
29049 | 126 mp_msg(MSGT_AFILTER, MSGL_V, "[format] Accelerated endianness conversion only\n"); |
14272 | 127 af->play = play_swapendian; |
128 } | |
129 if ((data->format == AF_FORMAT_FLOAT_NE) && | |
130 (af->data->format == AF_FORMAT_S16_NE)) | |
131 { | |
29049 | 132 mp_msg(MSGT_AFILTER, MSGL_V, "[format] Accelerated %s to %s conversion\n", |
14717
51a7560a92b7
confusing mixture of typecasts and casted variable, removed typecasts
reimar
parents:
14433
diff
changeset
|
133 af_fmt2str(data->format,buf1,256), |
14399
1a882e2a419b
af_fmt2str fixes (remove trailing space, call with size of buffer, not size-1)
reimar
parents:
14335
diff
changeset
|
134 af_fmt2str(af->data->format,buf2,256)); |
14272 | 135 af->play = play_float_s16; |
136 } | |
137 if ((data->format == AF_FORMAT_S16_NE) && | |
138 (af->data->format == AF_FORMAT_FLOAT_NE)) | |
139 { | |
29049 | 140 mp_msg(MSGT_AFILTER, MSGL_V, "[format] Accelerated %s to %s conversion\n", |
14717
51a7560a92b7
confusing mixture of typecasts and casted variable, removed typecasts
reimar
parents:
14433
diff
changeset
|
141 af_fmt2str(data->format,buf1,256), |
14399
1a882e2a419b
af_fmt2str fixes (remove trailing space, call with size of buffer, not size-1)
reimar
parents:
14335
diff
changeset
|
142 af_fmt2str(af->data->format,buf2,256)); |
14272 | 143 af->play = play_s16_float; |
144 } | |
7568 | 145 return AF_OK; |
8167 | 146 } |
7998
d48a06d07afb
Adding commandline options for filters and fixing stupid bug in cfg
anders
parents:
7719
diff
changeset
|
147 case AF_CONTROL_COMMAND_LINE:{ |
14335
8380694ba14f
af_bits2fmt and af_str2fmt_short, also removed the extra FORMAT_BPS control in format.c
alex
parents:
14272
diff
changeset
|
148 int format = af_str2fmt_short(arg); |
15311 | 149 if (format == -1) { |
29049 | 150 mp_msg(MSGT_AFILTER, MSGL_ERR, "[format] %s is not a valid format\n", (char *)arg); |
15311 | 151 return AF_ERROR; |
152 } | |
14335
8380694ba14f
af_bits2fmt and af_str2fmt_short, also removed the extra FORMAT_BPS control in format.c
alex
parents:
14272
diff
changeset
|
153 if(AF_OK != af->control(af,AF_CONTROL_FORMAT_FMT | AF_CONTROL_SET,&format)) |
8607 | 154 return AF_ERROR; |
155 return AF_OK; | |
8167 | 156 } |
14335
8380694ba14f
af_bits2fmt and af_str2fmt_short, also removed the extra FORMAT_BPS control in format.c
alex
parents:
14272
diff
changeset
|
157 case AF_CONTROL_FORMAT_FMT | AF_CONTROL_SET:{ |
24561 | 158 // Check for errors in configuration |
30241
02b9c1a452e1
Add support for distinguishing between little- and big-endian SPDIF AC3
reimar
parents:
29401
diff
changeset
|
159 if(!AF_FORMAT_IS_AC3(*(int*)arg) && AF_OK != check_format(*(int*)arg)) |
8607 | 160 return AF_ERROR; |
161 | |
162 af->data->format = *(int*)arg; | |
14335
8380694ba14f
af_bits2fmt and af_str2fmt_short, also removed the extra FORMAT_BPS control in format.c
alex
parents:
14272
diff
changeset
|
163 af->data->bps = af_fmt2bits(af->data->format)/8; |
8380694ba14f
af_bits2fmt and af_str2fmt_short, also removed the extra FORMAT_BPS control in format.c
alex
parents:
14272
diff
changeset
|
164 |
7568 | 165 return AF_OK; |
166 } | |
14335
8380694ba14f
af_bits2fmt and af_str2fmt_short, also removed the extra FORMAT_BPS control in format.c
alex
parents:
14272
diff
changeset
|
167 } |
7568 | 168 return AF_UNKNOWN; |
169 } | |
170 | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
171 // Deallocate memory |
7568 | 172 static void uninit(struct af_instance_s* af) |
173 { | |
22179 | 174 if (af->data) |
175 free(af->data->audio); | |
176 free(af->data); | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
177 af->setup = 0; |
7568 | 178 } |
179 | |
14272 | 180 static af_data_t* play_swapendian(struct af_instance_s* af, af_data_t* data) |
181 { | |
182 af_data_t* l = af->data; // Local data | |
183 af_data_t* c = data; // Current working data | |
24561 | 184 int len = c->len/c->bps; // Length in samples of current audio block |
14272 | 185 |
186 if(AF_OK != RESIZE_LOCAL_BUFFER(af,data)) | |
187 return NULL; | |
188 | |
189 endian(c->audio,l->audio,len,c->bps); | |
190 | |
191 c->audio = l->audio; | |
192 c->format = l->format; | |
193 | |
194 return c; | |
195 } | |
196 | |
197 static af_data_t* play_float_s16(struct af_instance_s* af, af_data_t* data) | |
198 { | |
199 af_data_t* l = af->data; // Local data | |
200 af_data_t* c = data; // Current working data | |
24561 | 201 int len = c->len/4; // Length in samples of current audio block |
14272 | 202 |
203 if(AF_OK != RESIZE_LOCAL_BUFFER(af,data)) | |
204 return NULL; | |
205 | |
206 float2int(c->audio, l->audio, len, 2); | |
207 | |
208 c->audio = l->audio; | |
209 c->len = len*2; | |
210 c->bps = 2; | |
211 c->format = l->format; | |
212 | |
213 return c; | |
214 } | |
215 | |
216 static af_data_t* play_s16_float(struct af_instance_s* af, af_data_t* data) | |
217 { | |
218 af_data_t* l = af->data; // Local data | |
219 af_data_t* c = data; // Current working data | |
24561 | 220 int len = c->len/2; // Length in samples of current audio block |
14272 | 221 |
222 if(AF_OK != RESIZE_LOCAL_BUFFER(af,data)) | |
223 return NULL; | |
224 | |
225 int2float(c->audio, l->audio, len, 2); | |
226 | |
227 c->audio = l->audio; | |
228 c->len = len*4; | |
229 c->bps = 4; | |
230 c->format = l->format; | |
231 | |
232 return c; | |
233 } | |
234 | |
7568 | 235 // Filter data through filter |
236 static af_data_t* play(struct af_instance_s* af, af_data_t* data) | |
237 { | |
8167 | 238 af_data_t* l = af->data; // Local data |
239 af_data_t* c = data; // Current working data | |
24561 | 240 int len = c->len/c->bps; // Length in samples of current audio block |
7568 | 241 |
242 if(AF_OK != RESIZE_LOCAL_BUFFER(af,data)) | |
243 return NULL; | |
244 | |
8167 | 245 // Change to cpu native endian format |
246 if((c->format&AF_FORMAT_END_MASK)!=AF_FORMAT_NE) | |
247 endian(c->audio,c->audio,len,c->bps); | |
7719
41e8d0916c60
Fix for audio filters on big endian cpus. It's working now on Solaris SPARC &
jkeil
parents:
7711
diff
changeset
|
248 |
8167 | 249 // Conversion table |
14261
710b223604fa
100l use right mask type when checking for input format
rtognimp
parents:
14256
diff
changeset
|
250 if((c->format & AF_FORMAT_SPECIAL_MASK) == AF_FORMAT_MU_LAW) { |
8167 | 251 from_ulaw(c->audio, l->audio, len, l->bps, l->format&AF_FORMAT_POINT_MASK); |
252 if(AF_FORMAT_A_LAW == (l->format&AF_FORMAT_SPECIAL_MASK)) | |
253 to_ulaw(l->audio, l->audio, len, 1, AF_FORMAT_SI); | |
254 if((l->format&AF_FORMAT_SIGN_MASK) == AF_FORMAT_US) | |
16664 | 255 si2us(l->audio,len,l->bps); |
14261
710b223604fa
100l use right mask type when checking for input format
rtognimp
parents:
14256
diff
changeset
|
256 } else if((c->format & AF_FORMAT_SPECIAL_MASK) == AF_FORMAT_A_LAW) { |
8167 | 257 from_alaw(c->audio, l->audio, len, l->bps, l->format&AF_FORMAT_POINT_MASK); |
258 if(AF_FORMAT_A_LAW == (l->format&AF_FORMAT_SPECIAL_MASK)) | |
259 to_alaw(l->audio, l->audio, len, 1, AF_FORMAT_SI); | |
260 if((l->format&AF_FORMAT_SIGN_MASK) == AF_FORMAT_US) | |
16664 | 261 si2us(l->audio,len,l->bps); |
14261
710b223604fa
100l use right mask type when checking for input format
rtognimp
parents:
14256
diff
changeset
|
262 } else if((c->format & AF_FORMAT_POINT_MASK) == AF_FORMAT_F) { |
8167 | 263 switch(l->format&AF_FORMAT_SPECIAL_MASK){ |
264 case(AF_FORMAT_MU_LAW): | |
265 to_ulaw(c->audio, l->audio, len, c->bps, c->format&AF_FORMAT_POINT_MASK); | |
266 break; | |
267 case(AF_FORMAT_A_LAW): | |
268 to_alaw(c->audio, l->audio, len, c->bps, c->format&AF_FORMAT_POINT_MASK); | |
7568 | 269 break; |
8180
4ba9aed295f2
Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents:
8167
diff
changeset
|
270 default: |
4ba9aed295f2
Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents:
8167
diff
changeset
|
271 float2int(c->audio, l->audio, len, l->bps); |
4ba9aed295f2
Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents:
8167
diff
changeset
|
272 if((l->format&AF_FORMAT_SIGN_MASK) == AF_FORMAT_US) |
16664 | 273 si2us(l->audio,len,l->bps); |
8180
4ba9aed295f2
Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents:
8167
diff
changeset
|
274 break; |
8167 | 275 } |
14261
710b223604fa
100l use right mask type when checking for input format
rtognimp
parents:
14256
diff
changeset
|
276 } else { |
8167 | 277 // Input must be int |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
278 |
8167 | 279 // Change signed/unsigned |
280 if((c->format&AF_FORMAT_SIGN_MASK) != (l->format&AF_FORMAT_SIGN_MASK)){ | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
281 si2us(c->audio,len,c->bps); |
8167 | 282 } |
283 // Convert to special formats | |
8180
4ba9aed295f2
Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents:
8167
diff
changeset
|
284 switch(l->format&(AF_FORMAT_SPECIAL_MASK|AF_FORMAT_POINT_MASK)){ |
8167 | 285 case(AF_FORMAT_MU_LAW): |
286 to_ulaw(c->audio, l->audio, len, c->bps, c->format&AF_FORMAT_POINT_MASK); | |
287 break; | |
288 case(AF_FORMAT_A_LAW): | |
289 to_alaw(c->audio, l->audio, len, c->bps, c->format&AF_FORMAT_POINT_MASK); | |
290 break; | |
8180
4ba9aed295f2
Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents:
8167
diff
changeset
|
291 case(AF_FORMAT_F): |
4ba9aed295f2
Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents:
8167
diff
changeset
|
292 int2float(c->audio, l->audio, len, c->bps); |
4ba9aed295f2
Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents:
8167
diff
changeset
|
293 break; |
8167 | 294 default: |
8180
4ba9aed295f2
Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents:
8167
diff
changeset
|
295 // Change the number of bits |
4ba9aed295f2
Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents:
8167
diff
changeset
|
296 if(c->bps != l->bps) |
4ba9aed295f2
Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents:
8167
diff
changeset
|
297 change_bps(c->audio,l->audio,len,c->bps,l->bps); |
4ba9aed295f2
Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents:
8167
diff
changeset
|
298 else |
23457
a124f3abc1ec
Replace implicit use of fast_memcpy via macro by explicit use to allow
reimar
parents:
22748
diff
changeset
|
299 fast_memcpy(l->audio,c->audio,len*c->bps); |
7568 | 300 break; |
301 } | |
302 } | |
7719
41e8d0916c60
Fix for audio filters on big endian cpus. It's working now on Solaris SPARC &
jkeil
parents:
7711
diff
changeset
|
303 |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
304 // Switch from cpu native endian to the correct endianness |
8167 | 305 if((l->format&AF_FORMAT_END_MASK)!=AF_FORMAT_NE) |
306 endian(l->audio,l->audio,len,l->bps); | |
7568 | 307 |
308 // Set output data | |
309 c->audio = l->audio; | |
8167 | 310 c->len = len*l->bps; |
7568 | 311 c->bps = l->bps; |
312 c->format = l->format; | |
313 return c; | |
314 } | |
315 | |
316 // Allocate memory and set function pointers | |
22746
fd6f824ef894
Rename open to af_open so as not to conflict with a previous header definition.
diego
parents:
22179
diff
changeset
|
317 static int af_open(af_instance_t* af){ |
7568 | 318 af->control=control; |
319 af->uninit=uninit; | |
320 af->play=play; | |
24888 | 321 af->mul=1; |
7568 | 322 af->data=calloc(1,sizeof(af_data_t)); |
323 if(af->data == NULL) | |
324 return AF_ERROR; | |
325 return AF_OK; | |
326 } | |
327 | |
328 // Description of this filter | |
329 af_info_t af_info_format = { | |
330 "Sample format conversion", | |
331 "format", | |
332 "Anders", | |
333 "", | |
7615 | 334 AF_FLAGS_REENTRANT, |
22746
fd6f824ef894
Rename open to af_open so as not to conflict with a previous header definition.
diego
parents:
22179
diff
changeset
|
335 af_open |
7568 | 336 }; |
8167 | 337 |
12478 | 338 static inline uint32_t load24bit(void* data, int pos) { |
29401
f01023c524c3
Replace WORDS_BIGENDIAN by HAVE_BIGENDIAN in all internal code.
diego
parents:
29263
diff
changeset
|
339 #if HAVE_BIGENDIAN |
12478 | 340 return (((uint32_t)((uint8_t*)data)[3*pos])<<24) | |
341 (((uint32_t)((uint8_t*)data)[3*pos+1])<<16) | | |
342 (((uint32_t)((uint8_t*)data)[3*pos+2])<<8); | |
343 #else | |
344 return (((uint32_t)((uint8_t*)data)[3*pos])<<8) | | |
345 (((uint32_t)((uint8_t*)data)[3*pos+1])<<16) | | |
346 (((uint32_t)((uint8_t*)data)[3*pos+2])<<24); | |
347 #endif | |
348 } | |
349 | |
350 static inline void store24bit(void* data, int pos, uint32_t expanded_value) { | |
29401
f01023c524c3
Replace WORDS_BIGENDIAN by HAVE_BIGENDIAN in all internal code.
diego
parents:
29263
diff
changeset
|
351 #if HAVE_BIGENDIAN |
12478 | 352 ((uint8_t*)data)[3*pos]=expanded_value>>24; |
353 ((uint8_t*)data)[3*pos+1]=expanded_value>>16; | |
354 ((uint8_t*)data)[3*pos+2]=expanded_value>>8; | |
355 #else | |
356 ((uint8_t*)data)[3*pos]=expanded_value>>8; | |
357 ((uint8_t*)data)[3*pos+1]=expanded_value>>16; | |
358 ((uint8_t*)data)[3*pos+2]=expanded_value>>24; | |
359 #endif | |
360 } | |
361 | |
8167 | 362 // Function implementations used by play |
363 static void endian(void* in, void* out, int len, int bps) | |
364 { | |
365 register int i; | |
366 switch(bps){ | |
367 case(2):{ | |
368 for(i=0;i<len;i++){ | |
12486 | 369 ((uint16_t*)out)[i]=bswap_16(((uint16_t*)in)[i]); |
8167 | 370 } |
371 break; | |
372 } | |
12478 | 373 case(3):{ |
374 register uint8_t s; | |
375 for(i=0;i<len;i++){ | |
376 s=((uint8_t*)in)[3*i]; | |
377 ((uint8_t*)out)[3*i]=((uint8_t*)in)[3*i+2]; | |
12481
dbbc25ea6403
fix endian conversion for (curently unused) case where in buffer != out buffer
reimar
parents:
12478
diff
changeset
|
378 if (in != out) |
dbbc25ea6403
fix endian conversion for (curently unused) case where in buffer != out buffer
reimar
parents:
12478
diff
changeset
|
379 ((uint8_t*)out)[3*i+1]=((uint8_t*)in)[3*i+1]; |
12478 | 380 ((uint8_t*)out)[3*i+2]=s; |
381 } | |
382 break; | |
383 } | |
8167 | 384 case(4):{ |
385 for(i=0;i<len;i++){ | |
12486 | 386 ((uint32_t*)out)[i]=bswap_32(((uint32_t*)in)[i]); |
8167 | 387 } |
388 break; | |
389 } | |
390 } | |
391 } | |
392 | |
16664 | 393 static void si2us(void* data, int len, int bps) |
8167 | 394 { |
16664 | 395 register long i = -(len * bps); |
396 register uint8_t *p = &((uint8_t *)data)[len * bps]; | |
397 #if AF_FORMAT_NE == AF_FORMAT_LE | |
398 p += bps - 1; | |
399 #endif | |
400 if (len <= 0) return; | |
401 do { | |
402 p[i] ^= 0x80; | |
403 } while (i += bps); | |
8167 | 404 } |
405 | |
406 static void change_bps(void* in, void* out, int len, int inbps, int outbps) | |
407 { | |
408 register int i; | |
409 switch(inbps){ | |
410 case(1): | |
411 switch(outbps){ | |
412 case(2): | |
413 for(i=0;i<len;i++) | |
414 ((uint16_t*)out)[i]=((uint16_t)((uint8_t*)in)[i])<<8; | |
415 break; | |
12478 | 416 case(3): |
417 for(i=0;i<len;i++) | |
418 store24bit(out, i, ((uint32_t)((uint8_t*)in)[i])<<24); | |
419 break; | |
8167 | 420 case(4): |
421 for(i=0;i<len;i++) | |
422 ((uint32_t*)out)[i]=((uint32_t)((uint8_t*)in)[i])<<24; | |
423 break; | |
424 } | |
425 break; | |
426 case(2): | |
427 switch(outbps){ | |
428 case(1): | |
429 for(i=0;i<len;i++) | |
430 ((uint8_t*)out)[i]=(uint8_t)((((uint16_t*)in)[i])>>8); | |
431 break; | |
12478 | 432 case(3): |
433 for(i=0;i<len;i++) | |
434 store24bit(out, i, ((uint32_t)((uint16_t*)in)[i])<<16); | |
435 break; | |
8167 | 436 case(4): |
437 for(i=0;i<len;i++) | |
438 ((uint32_t*)out)[i]=((uint32_t)((uint16_t*)in)[i])<<16; | |
439 break; | |
440 } | |
441 break; | |
12478 | 442 case(3): |
443 switch(outbps){ | |
444 case(1): | |
445 for(i=0;i<len;i++) | |
446 ((uint8_t*)out)[i]=(uint8_t)(load24bit(in, i)>>24); | |
447 break; | |
448 case(2): | |
449 for(i=0;i<len;i++) | |
450 ((uint16_t*)out)[i]=(uint16_t)(load24bit(in, i)>>16); | |
451 break; | |
452 case(4): | |
453 for(i=0;i<len;i++) | |
454 ((uint32_t*)out)[i]=(uint32_t)load24bit(in, i); | |
455 break; | |
456 } | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
457 break; |
8167 | 458 case(4): |
459 switch(outbps){ | |
460 case(1): | |
461 for(i=0;i<len;i++) | |
462 ((uint8_t*)out)[i]=(uint8_t)((((uint32_t*)in)[i])>>24); | |
463 break; | |
464 case(2): | |
465 for(i=0;i<len;i++) | |
466 ((uint16_t*)out)[i]=(uint16_t)((((uint32_t*)in)[i])>>16); | |
467 break; | |
12478 | 468 case(3): |
469 for(i=0;i<len;i++) | |
470 store24bit(out, i, ((uint32_t*)in)[i]); | |
471 break; | |
8167 | 472 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
473 break; |
8167 | 474 } |
475 } | |
476 | |
14791
df515839c8a9
100l for me, lrintf is better. now fixed so it should be prototyped, and should work even if there is no prototype
rfelker
parents:
14758
diff
changeset
|
477 static void float2int(float* in, void* out, int len, int bps) |
8167 | 478 { |
33723
6c8743e5fa30
Audio format conversion from float to int is not checked for overflow.
iive
parents:
30241
diff
changeset
|
479 float f; |
8167 | 480 register int i; |
481 switch(bps){ | |
482 case(1): | |
483 for(i=0;i<len;i++) | |
33723
6c8743e5fa30
Audio format conversion from float to int is not checked for overflow.
iive
parents:
30241
diff
changeset
|
484 ((int8_t *)out)[i] = av_clip_int8(lrintf(128.0 * in[i])); |
8167 | 485 break; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
486 case(2): |
8167 | 487 for(i=0;i<len;i++) |
33723
6c8743e5fa30
Audio format conversion from float to int is not checked for overflow.
iive
parents:
30241
diff
changeset
|
488 ((int16_t*)out)[i] = av_clip_int16(lrintf(32768.0 * in[i])); |
8167 | 489 break; |
12478 | 490 case(3): |
33723
6c8743e5fa30
Audio format conversion from float to int is not checked for overflow.
iive
parents:
30241
diff
changeset
|
491 for(i=0;i<len;i++){ |
33736
a5a54c7a15ce
Fix the precision loss in float -> 32bit conversion case, introduced
iive
parents:
33723
diff
changeset
|
492 f = in[i] * 8388608; |
33723
6c8743e5fa30
Audio format conversion from float to int is not checked for overflow.
iive
parents:
30241
diff
changeset
|
493 store24bit(out, i, av_clip(lrintf(f), -1*(1<<23), (1<<23)-1) << 8); |
6c8743e5fa30
Audio format conversion from float to int is not checked for overflow.
iive
parents:
30241
diff
changeset
|
494 } |
12478 | 495 break; |
8167 | 496 case(4): |
33723
6c8743e5fa30
Audio format conversion from float to int is not checked for overflow.
iive
parents:
30241
diff
changeset
|
497 for(i=0;i<len;i++){ |
33736
a5a54c7a15ce
Fix the precision loss in float -> 32bit conversion case, introduced
iive
parents:
33723
diff
changeset
|
498 f = in[i]; |
a5a54c7a15ce
Fix the precision loss in float -> 32bit conversion case, introduced
iive
parents:
33723
diff
changeset
|
499 if (f <= -1.0) |
a5a54c7a15ce
Fix the precision loss in float -> 32bit conversion case, introduced
iive
parents:
33723
diff
changeset
|
500 ((int32_t*)out)[i] = INT_MIN; |
a5a54c7a15ce
Fix the precision loss in float -> 32bit conversion case, introduced
iive
parents:
33723
diff
changeset
|
501 else |
a5a54c7a15ce
Fix the precision loss in float -> 32bit conversion case, introduced
iive
parents:
33723
diff
changeset
|
502 if (f >= 1.0)//no need to use corrected constant, rounding won't cause overflow |
a5a54c7a15ce
Fix the precision loss in float -> 32bit conversion case, introduced
iive
parents:
33723
diff
changeset
|
503 ((int32_t*)out)[i] = INT_MAX; |
a5a54c7a15ce
Fix the precision loss in float -> 32bit conversion case, introduced
iive
parents:
33723
diff
changeset
|
504 else |
a5a54c7a15ce
Fix the precision loss in float -> 32bit conversion case, introduced
iive
parents:
33723
diff
changeset
|
505 ((int32_t*)out)[i] = lrintf(f*2147483648.0); |
a5a54c7a15ce
Fix the precision loss in float -> 32bit conversion case, introduced
iive
parents:
33723
diff
changeset
|
506 |
33723
6c8743e5fa30
Audio format conversion from float to int is not checked for overflow.
iive
parents:
30241
diff
changeset
|
507 } |
8167 | 508 break; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
509 } |
8167 | 510 } |
511 | |
14791
df515839c8a9
100l for me, lrintf is better. now fixed so it should be prototyped, and should work even if there is no prototype
rfelker
parents:
14758
diff
changeset
|
512 static void int2float(void* in, float* out, int len, int bps) |
8167 | 513 { |
514 register int i; | |
515 switch(bps){ | |
516 case(1): | |
517 for(i=0;i<len;i++) | |
14791
df515839c8a9
100l for me, lrintf is better. now fixed so it should be prototyped, and should work even if there is no prototype
rfelker
parents:
14758
diff
changeset
|
518 out[i]=(1.0/128.0)*((int8_t*)in)[i]; |
8167 | 519 break; |
520 case(2): | |
521 for(i=0;i<len;i++) | |
14791
df515839c8a9
100l for me, lrintf is better. now fixed so it should be prototyped, and should work even if there is no prototype
rfelker
parents:
14758
diff
changeset
|
522 out[i]=(1.0/32768.0)*((int16_t*)in)[i]; |
8167 | 523 break; |
12478 | 524 case(3): |
525 for(i=0;i<len;i++) | |
14791
df515839c8a9
100l for me, lrintf is better. now fixed so it should be prototyped, and should work even if there is no prototype
rfelker
parents:
14758
diff
changeset
|
526 out[i]=(1.0/2147483648.0)*((int32_t)load24bit(in, i)); |
12478 | 527 break; |
8167 | 528 case(4): |
529 for(i=0;i<len;i++) | |
14791
df515839c8a9
100l for me, lrintf is better. now fixed so it should be prototyped, and should work even if there is no prototype
rfelker
parents:
14758
diff
changeset
|
530 out[i]=(1.0/2147483648.0)*((int32_t*)in)[i]; |
8167 | 531 break; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
532 } |
8167 | 533 } |