annotate libaf/af_format.c @ 35519:7f1be403a640

Don't unnecessarily use global MPlayer variable filename. Use a local variable instead.
author ib
date Wed, 05 Dec 2012 22:55:02 +0000
parents 29f66b254dd7
children d206960484fe
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
22
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
23 #include <stdio.h>
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
24 #include <stdlib.h>
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
25 #include <string.h>
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
26 #include <inttypes.h>
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
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
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
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"
34174
a93891202051 Add missing mp_msg.h #includes, remove some unnecessary ones.
diego
parents: 33736
diff changeset
32 #include "mp_msg.h"
21507
fa99b3d31d13 Hack around libavutil/bswap.h compilation problems due to always_inline undefined.
reimar
parents: 21372
diff changeset
33 #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
34 #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
35
33723
6c8743e5fa30 Audio format conversion from float to int is not checked for overflow.
iive
parents: 30241
diff changeset
36 #include "libavutil/avutil.h"
6c8743e5fa30 Audio format conversion from float to int is not checked for overflow.
iive
parents: 30241
diff changeset
37
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
38 /* Functions used by play to convert the input audio to the correct
e8832e66babd New features:
anders
parents: 7998
diff changeset
39 format */
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
40
24561
90b0691d9709 Fix loads of typos
reimar
parents: 24521
diff changeset
41 /* The below includes retrieves functions for converting to and from
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29049
diff changeset
42 ulaw and alaw */
28238
1bf9023840f9 Rename libaf/af_format_alaw.c --> libaf/af_format_alaw.h and
diego
parents: 28236
diff changeset
43 #include "af_format_ulaw.h"
1bf9023840f9 Rename libaf/af_format_alaw.c --> libaf/af_format_alaw.h and
diego
parents: 28236
diff changeset
44 #include "af_format_alaw.h"
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
45
24561
90b0691d9709 Fix loads of typos
reimar
parents: 24521
diff changeset
46 // Switch endianness
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
47 static void endian(void* in, void* out, int len, int bps);
24561
90b0691d9709 Fix loads of typos
reimar
parents: 24521
diff changeset
48 // From signed to unsigned and the other way
16664
9991e406a2a2 much simpler signed/unsigned conversion.
reimar
parents: 15311
diff changeset
49 static void si2us(void* data, int len, int bps);
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
50 // Change the number of bits per sample
e8832e66babd New features:
anders
parents: 7998
diff changeset
51 static void change_bps(void* in, void* out, int len, int inbps, int outbps);
e8832e66babd New features:
anders
parents: 7998
diff changeset
52 // 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
53 static void float2int(float* in, void* out, int len, int bps);
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
54 // 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
55 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
56
14272
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
57 static af_data_t* play(struct af_instance_s* af, af_data_t* data);
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
58 static af_data_t* play_swapendian(struct af_instance_s* af, af_data_t* data);
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
59 static af_data_t* play_float_s16(struct af_instance_s* af, af_data_t* data);
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
60 static af_data_t* play_s16_float(struct af_instance_s* af, af_data_t* data);
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
61
8607
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
62 // Helper functions to check sanity for input arguments
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
63
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
64 // 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
65 static int check_bps(int bps)
8607
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
66 {
12478
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
67 if(bps != 4 && bps != 3 && bps != 2 && bps != 1){
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29049
diff changeset
68 mp_msg(MSGT_AFILTER, MSGL_ERR, "[format] The number of bytes per sample"
12478
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
69 " must be 1, 2, 3 or 4. Current value is %i \n",bps);
8607
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
70 return AF_ERROR;
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
71 }
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
72 return AF_OK;
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
73 }
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
74
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
75 // Check for unsupported formats
13989
dcb6b4a33aaa declare check_format and check_bps static, they are used nowhere else.
reimar
parents: 12486
diff changeset
76 static int check_format(int format)
8180
4ba9aed295f2 Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents: 8167
diff changeset
77 {
4ba9aed295f2 Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents: 8167
diff changeset
78 char buf[256];
8607
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
79 switch(format & AF_FORMAT_SPECIAL_MASK){
35451
29f66b254dd7 af_format: Fix check_format, non-special formats are of course supported.
reimar
parents: 35444
diff changeset
80 case 0:
35440
c2b5fda66143 Replace outdated list of unsupported formats by list of supported formats.
reimar
parents: 34174
diff changeset
81 case AF_FORMAT_MU_LAW:
c2b5fda66143 Replace outdated list of unsupported formats by list of supported formats.
reimar
parents: 34174
diff changeset
82 case AF_FORMAT_A_LAW:
c2b5fda66143 Replace outdated list of unsupported formats by list of supported formats.
reimar
parents: 34174
diff changeset
83 return AF_OK;
8180
4ba9aed295f2 Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents: 8167
diff changeset
84 }
35440
c2b5fda66143 Replace outdated list of unsupported formats by list of supported formats.
reimar
parents: 34174
diff changeset
85 mp_msg(MSGT_AFILTER, MSGL_ERR, "[format] Sample format %s not yet supported \n",
c2b5fda66143 Replace outdated list of unsupported formats by list of supported formats.
reimar
parents: 34174
diff changeset
86 af_fmt2str(format,buf,256));
c2b5fda66143 Replace outdated list of unsupported formats by list of supported formats.
reimar
parents: 34174
diff changeset
87 return AF_ERROR;
8607
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
88 }
8180
4ba9aed295f2 Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents: 8167
diff changeset
89
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
90 // Initialization and runtime control
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
91 static int control(struct af_instance_s* af, int cmd, void* arg)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
92 {
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
93 switch(cmd){
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
94 case AF_CONTROL_REINIT:{
e8832e66babd New features:
anders
parents: 7998
diff changeset
95 char buf1[256];
e8832e66babd New features:
anders
parents: 7998
diff changeset
96 char buf2[256];
14272
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
97 af_data_t *data = arg;
35444
4644c320daf4 af_format: support endianness conversion also for iec61937
reimar
parents: 35441
diff changeset
98 int supported_ac3 = 0;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29049
diff changeset
99
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29049
diff changeset
100 // Make sure this filter isn't redundant
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29049
diff changeset
101 if(af->data->format == data->format &&
14717
51a7560a92b7 confusing mixture of typecasts and casted variable, removed typecasts
reimar
parents: 14433
diff changeset
102 af->data->bps == data->bps)
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
103 return AF_DETACH;
8607
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
104
35444
4644c320daf4 af_format: support endianness conversion also for iec61937
reimar
parents: 35441
diff changeset
105 // A bit complex because we can convert AC3
4644c320daf4 af_format: support endianness conversion also for iec61937
reimar
parents: 35441
diff changeset
106 // to generic iec61937 but not the other way
4644c320daf4 af_format: support endianness conversion also for iec61937
reimar
parents: 35441
diff changeset
107 // round.
4644c320daf4 af_format: support endianness conversion also for iec61937
reimar
parents: 35441
diff changeset
108 if (AF_FORMAT_IS_AC3(af->data->format))
4644c320daf4 af_format: support endianness conversion also for iec61937
reimar
parents: 35441
diff changeset
109 supported_ac3 = AF_FORMAT_IS_AC3(data->format);
4644c320daf4 af_format: support endianness conversion also for iec61937
reimar
parents: 35441
diff changeset
110 else if (AF_FORMAT_IS_IEC61937(af->data->format))
4644c320daf4 af_format: support endianness conversion also for iec61937
reimar
parents: 35441
diff changeset
111 supported_ac3 = AF_FORMAT_IS_IEC61937(data->format);
4644c320daf4 af_format: support endianness conversion also for iec61937
reimar
parents: 35441
diff changeset
112
30241
02b9c1a452e1 Add support for distinguishing between little- and big-endian SPDIF AC3
reimar
parents: 29401
diff changeset
113 // Allow trivial AC3-endianness conversion
35444
4644c320daf4 af_format: support endianness conversion also for iec61937
reimar
parents: 35441
diff changeset
114 if (!supported_ac3)
24521
186626edd969 Fix typo in comment
reimar
parents: 23457
diff changeset
115 // Check for errors in configuration
14717
51a7560a92b7 confusing mixture of typecasts and casted variable, removed typecasts
reimar
parents: 14433
diff changeset
116 if((AF_OK != check_bps(data->bps)) ||
51a7560a92b7 confusing mixture of typecasts and casted variable, removed typecasts
reimar
parents: 14433
diff changeset
117 (AF_OK != check_format(data->format)) ||
8607
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
118 (AF_OK != check_bps(af->data->bps)) ||
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
119 (AF_OK != check_format(af->data->format)))
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
120 return AF_ERROR;
e8832e66babd New features:
anders
parents: 7998
diff changeset
121
35441
6dc94af7016d Do not call af_fmt2str on the same data over and over.
reimar
parents: 35440
diff changeset
122 af_fmt2str(data->format,buf1,256);
6dc94af7016d Do not call af_fmt2str on the same data over and over.
reimar
parents: 35440
diff changeset
123 af_fmt2str(af->data->format,buf2,256);
29049
8c706ce21c6f Remove af_msg special-casing API in libaf.
bircoph
parents: 28339
diff changeset
124 mp_msg(MSGT_AFILTER, MSGL_V, "[format] Changing sample format from %s to %s\n",
35441
6dc94af7016d Do not call af_fmt2str on the same data over and over.
reimar
parents: 35440
diff changeset
125 buf1, buf2);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
126
14717
51a7560a92b7 confusing mixture of typecasts and casted variable, removed typecasts
reimar
parents: 14433
diff changeset
127 af->data->rate = data->rate;
51a7560a92b7 confusing mixture of typecasts and casted variable, removed typecasts
reimar
parents: 14433
diff changeset
128 af->data->nch = data->nch;
24888
b2402b4f0afa libaf: change filter input/output ratio calculations
uau
parents: 24561
diff changeset
129 af->mul = (double)af->data->bps / data->bps;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29049
diff changeset
130
14272
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
131 af->play = play; // set default
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29049
diff changeset
132
24561
90b0691d9709 Fix loads of typos
reimar
parents: 24521
diff changeset
133 // look whether only endianness differences are there
14272
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
134 if ((af->data->format & ~AF_FORMAT_END_MASK) ==
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
135 (data->format & ~AF_FORMAT_END_MASK))
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
136 {
29049
8c706ce21c6f Remove af_msg special-casing API in libaf.
bircoph
parents: 28339
diff changeset
137 mp_msg(MSGT_AFILTER, MSGL_V, "[format] Accelerated endianness conversion only\n");
14272
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
138 af->play = play_swapendian;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
139 }
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
140 if ((data->format == AF_FORMAT_FLOAT_NE) &&
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
141 (af->data->format == AF_FORMAT_S16_NE))
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
142 {
29049
8c706ce21c6f Remove af_msg special-casing API in libaf.
bircoph
parents: 28339
diff changeset
143 mp_msg(MSGT_AFILTER, MSGL_V, "[format] Accelerated %s to %s conversion\n",
35441
6dc94af7016d Do not call af_fmt2str on the same data over and over.
reimar
parents: 35440
diff changeset
144 buf1, buf2);
14272
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
145 af->play = play_float_s16;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
146 }
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
147 if ((data->format == AF_FORMAT_S16_NE) &&
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
148 (af->data->format == AF_FORMAT_FLOAT_NE))
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
149 {
29049
8c706ce21c6f Remove af_msg special-casing API in libaf.
bircoph
parents: 28339
diff changeset
150 mp_msg(MSGT_AFILTER, MSGL_V, "[format] Accelerated %s to %s conversion\n",
35441
6dc94af7016d Do not call af_fmt2str on the same data over and over.
reimar
parents: 35440
diff changeset
151 buf1, buf2);
14272
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
152 af->play = play_s16_float;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
153 }
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
154 return AF_OK;
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
155 }
7998
d48a06d07afb Adding commandline options for filters and fixing stupid bug in cfg
anders
parents: 7719
diff changeset
156 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
157 int format = af_str2fmt_short(arg);
15311
b00b16a1ef05 Error out when invalid format is specified
reimar
parents: 14791
diff changeset
158 if (format == -1) {
29049
8c706ce21c6f Remove af_msg special-casing API in libaf.
bircoph
parents: 28339
diff changeset
159 mp_msg(MSGT_AFILTER, MSGL_ERR, "[format] %s is not a valid format\n", (char *)arg);
15311
b00b16a1ef05 Error out when invalid format is specified
reimar
parents: 14791
diff changeset
160 return AF_ERROR;
b00b16a1ef05 Error out when invalid format is specified
reimar
parents: 14791
diff changeset
161 }
14335
8380694ba14f af_bits2fmt and af_str2fmt_short, also removed the extra FORMAT_BPS control in format.c
alex
parents: 14272
diff changeset
162 if(AF_OK != af->control(af,AF_CONTROL_FORMAT_FMT | AF_CONTROL_SET,&format))
8607
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
163 return AF_ERROR;
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
164 return AF_OK;
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
165 }
14335
8380694ba14f af_bits2fmt and af_str2fmt_short, also removed the extra FORMAT_BPS control in format.c
alex
parents: 14272
diff changeset
166 case AF_CONTROL_FORMAT_FMT | AF_CONTROL_SET:{
24561
90b0691d9709 Fix loads of typos
reimar
parents: 24521
diff changeset
167 // Check for errors in configuration
30241
02b9c1a452e1 Add support for distinguishing between little- and big-endian SPDIF AC3
reimar
parents: 29401
diff changeset
168 if(!AF_FORMAT_IS_AC3(*(int*)arg) && AF_OK != check_format(*(int*)arg))
8607
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
169 return AF_ERROR;
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
170
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
171 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
172 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
173
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
174 return AF_OK;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
175 }
14335
8380694ba14f af_bits2fmt and af_str2fmt_short, also removed the extra FORMAT_BPS control in format.c
alex
parents: 14272
diff changeset
176 }
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
177 return AF_UNKNOWN;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
178 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
179
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29049
diff changeset
180 // Deallocate memory
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
181 static void uninit(struct af_instance_s* af)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
182 {
22179
ecf562795caf Fix memory leaks.
uau
parents: 21507
diff changeset
183 if (af->data)
ecf562795caf Fix memory leaks.
uau
parents: 21507
diff changeset
184 free(af->data->audio);
ecf562795caf Fix memory leaks.
uau
parents: 21507
diff changeset
185 free(af->data);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29049
diff changeset
186 af->setup = 0;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
187 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
188
14272
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
189 static af_data_t* play_swapendian(struct af_instance_s* af, af_data_t* data)
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
190 {
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
191 af_data_t* l = af->data; // Local data
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
192 af_data_t* c = data; // Current working data
24561
90b0691d9709 Fix loads of typos
reimar
parents: 24521
diff changeset
193 int len = c->len/c->bps; // Length in samples of current audio block
14272
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
194
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
195 if(AF_OK != RESIZE_LOCAL_BUFFER(af,data))
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
196 return NULL;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
197
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
198 endian(c->audio,l->audio,len,c->bps);
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
199
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
200 c->audio = l->audio;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
201 c->format = l->format;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
202
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
203 return c;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
204 }
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
205
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
206 static af_data_t* play_float_s16(struct af_instance_s* af, af_data_t* data)
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
207 {
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
208 af_data_t* l = af->data; // Local data
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
209 af_data_t* c = data; // Current working data
24561
90b0691d9709 Fix loads of typos
reimar
parents: 24521
diff changeset
210 int len = c->len/4; // Length in samples of current audio block
14272
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
211
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
212 if(AF_OK != RESIZE_LOCAL_BUFFER(af,data))
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
213 return NULL;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
214
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
215 float2int(c->audio, l->audio, len, 2);
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
216
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
217 c->audio = l->audio;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
218 c->len = len*2;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
219 c->bps = 2;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
220 c->format = l->format;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
221
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
222 return c;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
223 }
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
224
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
225 static af_data_t* play_s16_float(struct af_instance_s* af, af_data_t* data)
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
226 {
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
227 af_data_t* l = af->data; // Local data
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
228 af_data_t* c = data; // Current working data
24561
90b0691d9709 Fix loads of typos
reimar
parents: 24521
diff changeset
229 int len = c->len/2; // Length in samples of current audio block
14272
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
230
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
231 if(AF_OK != RESIZE_LOCAL_BUFFER(af,data))
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
232 return NULL;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
233
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
234 int2float(c->audio, l->audio, len, 2);
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
235
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
236 c->audio = l->audio;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
237 c->len = len*4;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
238 c->bps = 4;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
239 c->format = l->format;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
240
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
241 return c;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
242 }
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
243
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
244 // Filter data through filter
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
245 static af_data_t* play(struct af_instance_s* af, af_data_t* data)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
246 {
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
247 af_data_t* l = af->data; // Local data
e8832e66babd New features:
anders
parents: 7998
diff changeset
248 af_data_t* c = data; // Current working data
24561
90b0691d9709 Fix loads of typos
reimar
parents: 24521
diff changeset
249 int len = c->len/c->bps; // Length in samples of current audio block
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
250
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
251 if(AF_OK != RESIZE_LOCAL_BUFFER(af,data))
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
252 return NULL;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
253
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
254 // Change to cpu native endian format
e8832e66babd New features:
anders
parents: 7998
diff changeset
255 if((c->format&AF_FORMAT_END_MASK)!=AF_FORMAT_NE)
e8832e66babd New features:
anders
parents: 7998
diff changeset
256 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
257
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
258 // Conversion table
14261
710b223604fa 100l use right mask type when checking for input format
rtognimp
parents: 14256
diff changeset
259 if((c->format & AF_FORMAT_SPECIAL_MASK) == AF_FORMAT_MU_LAW) {
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
260 from_ulaw(c->audio, l->audio, len, l->bps, l->format&AF_FORMAT_POINT_MASK);
e8832e66babd New features:
anders
parents: 7998
diff changeset
261 if(AF_FORMAT_A_LAW == (l->format&AF_FORMAT_SPECIAL_MASK))
e8832e66babd New features:
anders
parents: 7998
diff changeset
262 to_ulaw(l->audio, l->audio, len, 1, AF_FORMAT_SI);
e8832e66babd New features:
anders
parents: 7998
diff changeset
263 if((l->format&AF_FORMAT_SIGN_MASK) == AF_FORMAT_US)
16664
9991e406a2a2 much simpler signed/unsigned conversion.
reimar
parents: 15311
diff changeset
264 si2us(l->audio,len,l->bps);
14261
710b223604fa 100l use right mask type when checking for input format
rtognimp
parents: 14256
diff changeset
265 } else if((c->format & AF_FORMAT_SPECIAL_MASK) == AF_FORMAT_A_LAW) {
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
266 from_alaw(c->audio, l->audio, len, l->bps, l->format&AF_FORMAT_POINT_MASK);
e8832e66babd New features:
anders
parents: 7998
diff changeset
267 if(AF_FORMAT_A_LAW == (l->format&AF_FORMAT_SPECIAL_MASK))
e8832e66babd New features:
anders
parents: 7998
diff changeset
268 to_alaw(l->audio, l->audio, len, 1, AF_FORMAT_SI);
e8832e66babd New features:
anders
parents: 7998
diff changeset
269 if((l->format&AF_FORMAT_SIGN_MASK) == AF_FORMAT_US)
16664
9991e406a2a2 much simpler signed/unsigned conversion.
reimar
parents: 15311
diff changeset
270 si2us(l->audio,len,l->bps);
14261
710b223604fa 100l use right mask type when checking for input format
rtognimp
parents: 14256
diff changeset
271 } else if((c->format & AF_FORMAT_POINT_MASK) == AF_FORMAT_F) {
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
272 switch(l->format&AF_FORMAT_SPECIAL_MASK){
e8832e66babd New features:
anders
parents: 7998
diff changeset
273 case(AF_FORMAT_MU_LAW):
e8832e66babd New features:
anders
parents: 7998
diff changeset
274 to_ulaw(c->audio, l->audio, len, c->bps, c->format&AF_FORMAT_POINT_MASK);
e8832e66babd New features:
anders
parents: 7998
diff changeset
275 break;
e8832e66babd New features:
anders
parents: 7998
diff changeset
276 case(AF_FORMAT_A_LAW):
e8832e66babd New features:
anders
parents: 7998
diff changeset
277 to_alaw(c->audio, l->audio, len, c->bps, c->format&AF_FORMAT_POINT_MASK);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
278 break;
8180
4ba9aed295f2 Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents: 8167
diff changeset
279 default:
4ba9aed295f2 Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents: 8167
diff changeset
280 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
281 if((l->format&AF_FORMAT_SIGN_MASK) == AF_FORMAT_US)
16664
9991e406a2a2 much simpler signed/unsigned conversion.
reimar
parents: 15311
diff changeset
282 si2us(l->audio,len,l->bps);
8180
4ba9aed295f2 Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents: 8167
diff changeset
283 break;
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
284 }
14261
710b223604fa 100l use right mask type when checking for input format
rtognimp
parents: 14256
diff changeset
285 } else {
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
286 // Input must be int
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29049
diff changeset
287
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
288 // Change signed/unsigned
e8832e66babd New features:
anders
parents: 7998
diff changeset
289 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
290 si2us(c->audio,len,c->bps);
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
291 }
e8832e66babd New features:
anders
parents: 7998
diff changeset
292 // Convert to special formats
8180
4ba9aed295f2 Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents: 8167
diff changeset
293 switch(l->format&(AF_FORMAT_SPECIAL_MASK|AF_FORMAT_POINT_MASK)){
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
294 case(AF_FORMAT_MU_LAW):
e8832e66babd New features:
anders
parents: 7998
diff changeset
295 to_ulaw(c->audio, l->audio, len, c->bps, c->format&AF_FORMAT_POINT_MASK);
e8832e66babd New features:
anders
parents: 7998
diff changeset
296 break;
e8832e66babd New features:
anders
parents: 7998
diff changeset
297 case(AF_FORMAT_A_LAW):
e8832e66babd New features:
anders
parents: 7998
diff changeset
298 to_alaw(c->audio, l->audio, len, c->bps, c->format&AF_FORMAT_POINT_MASK);
e8832e66babd New features:
anders
parents: 7998
diff changeset
299 break;
8180
4ba9aed295f2 Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents: 8167
diff changeset
300 case(AF_FORMAT_F):
4ba9aed295f2 Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents: 8167
diff changeset
301 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
302 break;
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
303 default:
8180
4ba9aed295f2 Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents: 8167
diff changeset
304 // Change the number of bits
4ba9aed295f2 Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents: 8167
diff changeset
305 if(c->bps != l->bps)
4ba9aed295f2 Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents: 8167
diff changeset
306 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
307 else
23457
a124f3abc1ec Replace implicit use of fast_memcpy via macro by explicit use to allow
reimar
parents: 22748
diff changeset
308 fast_memcpy(l->audio,c->audio,len*c->bps);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
309 break;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
310 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
311 }
7719
41e8d0916c60 Fix for audio filters on big endian cpus. It's working now on Solaris SPARC &
jkeil
parents: 7711
diff changeset
312
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29049
diff changeset
313 // Switch from cpu native endian to the correct endianness
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
314 if((l->format&AF_FORMAT_END_MASK)!=AF_FORMAT_NE)
e8832e66babd New features:
anders
parents: 7998
diff changeset
315 endian(l->audio,l->audio,len,l->bps);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
316
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
317 // Set output data
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
318 c->audio = l->audio;
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
319 c->len = len*l->bps;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
320 c->bps = l->bps;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
321 c->format = l->format;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
322 return c;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
323 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
324
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
325 // 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
326 static int af_open(af_instance_t* af){
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
327 af->control=control;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
328 af->uninit=uninit;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
329 af->play=play;
24888
b2402b4f0afa libaf: change filter input/output ratio calculations
uau
parents: 24561
diff changeset
330 af->mul=1;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
331 af->data=calloc(1,sizeof(af_data_t));
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
332 if(af->data == NULL)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
333 return AF_ERROR;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
334 return AF_OK;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
335 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
336
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
337 // Description of this filter
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
338 af_info_t af_info_format = {
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
339 "Sample format conversion",
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
340 "format",
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
341 "Anders",
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
342 "",
7615
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7571
diff changeset
343 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
344 af_open
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
345 };
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
346
12478
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
347 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
348 #if HAVE_BIGENDIAN
12478
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
349 return (((uint32_t)((uint8_t*)data)[3*pos])<<24) |
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
350 (((uint32_t)((uint8_t*)data)[3*pos+1])<<16) |
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
351 (((uint32_t)((uint8_t*)data)[3*pos+2])<<8);
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
352 #else
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
353 return (((uint32_t)((uint8_t*)data)[3*pos])<<8) |
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
354 (((uint32_t)((uint8_t*)data)[3*pos+1])<<16) |
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
355 (((uint32_t)((uint8_t*)data)[3*pos+2])<<24);
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
356 #endif
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
357 }
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
358
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
359 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
360 #if HAVE_BIGENDIAN
12478
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
361 ((uint8_t*)data)[3*pos]=expanded_value>>24;
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
362 ((uint8_t*)data)[3*pos+1]=expanded_value>>16;
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
363 ((uint8_t*)data)[3*pos+2]=expanded_value>>8;
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
364 #else
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
365 ((uint8_t*)data)[3*pos]=expanded_value>>8;
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
366 ((uint8_t*)data)[3*pos+1]=expanded_value>>16;
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
367 ((uint8_t*)data)[3*pos+2]=expanded_value>>24;
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
368 #endif
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
369 }
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
370
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
371 // Function implementations used by play
e8832e66babd New features:
anders
parents: 7998
diff changeset
372 static void endian(void* in, void* out, int len, int bps)
e8832e66babd New features:
anders
parents: 7998
diff changeset
373 {
e8832e66babd New features:
anders
parents: 7998
diff changeset
374 register int i;
e8832e66babd New features:
anders
parents: 7998
diff changeset
375 switch(bps){
e8832e66babd New features:
anders
parents: 7998
diff changeset
376 case(2):{
e8832e66babd New features:
anders
parents: 7998
diff changeset
377 for(i=0;i<len;i++){
12486
e02a261e4c92 using bswap.h for endianness conversion
reimar
parents: 12481
diff changeset
378 ((uint16_t*)out)[i]=bswap_16(((uint16_t*)in)[i]);
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
379 }
e8832e66babd New features:
anders
parents: 7998
diff changeset
380 break;
e8832e66babd New features:
anders
parents: 7998
diff changeset
381 }
12478
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
382 case(3):{
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
383 register uint8_t s;
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
384 for(i=0;i<len;i++){
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
385 s=((uint8_t*)in)[3*i];
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
386 ((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
387 if (in != out)
dbbc25ea6403 fix endian conversion for (curently unused) case where in buffer != out buffer
reimar
parents: 12478
diff changeset
388 ((uint8_t*)out)[3*i+1]=((uint8_t*)in)[3*i+1];
12478
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
389 ((uint8_t*)out)[3*i+2]=s;
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
390 }
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
391 break;
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
392 }
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
393 case(4):{
e8832e66babd New features:
anders
parents: 7998
diff changeset
394 for(i=0;i<len;i++){
12486
e02a261e4c92 using bswap.h for endianness conversion
reimar
parents: 12481
diff changeset
395 ((uint32_t*)out)[i]=bswap_32(((uint32_t*)in)[i]);
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
396 }
e8832e66babd New features:
anders
parents: 7998
diff changeset
397 break;
e8832e66babd New features:
anders
parents: 7998
diff changeset
398 }
e8832e66babd New features:
anders
parents: 7998
diff changeset
399 }
e8832e66babd New features:
anders
parents: 7998
diff changeset
400 }
e8832e66babd New features:
anders
parents: 7998
diff changeset
401
16664
9991e406a2a2 much simpler signed/unsigned conversion.
reimar
parents: 15311
diff changeset
402 static void si2us(void* data, int len, int bps)
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
403 {
16664
9991e406a2a2 much simpler signed/unsigned conversion.
reimar
parents: 15311
diff changeset
404 register long i = -(len * bps);
9991e406a2a2 much simpler signed/unsigned conversion.
reimar
parents: 15311
diff changeset
405 register uint8_t *p = &((uint8_t *)data)[len * bps];
9991e406a2a2 much simpler signed/unsigned conversion.
reimar
parents: 15311
diff changeset
406 #if AF_FORMAT_NE == AF_FORMAT_LE
9991e406a2a2 much simpler signed/unsigned conversion.
reimar
parents: 15311
diff changeset
407 p += bps - 1;
9991e406a2a2 much simpler signed/unsigned conversion.
reimar
parents: 15311
diff changeset
408 #endif
9991e406a2a2 much simpler signed/unsigned conversion.
reimar
parents: 15311
diff changeset
409 if (len <= 0) return;
9991e406a2a2 much simpler signed/unsigned conversion.
reimar
parents: 15311
diff changeset
410 do {
9991e406a2a2 much simpler signed/unsigned conversion.
reimar
parents: 15311
diff changeset
411 p[i] ^= 0x80;
9991e406a2a2 much simpler signed/unsigned conversion.
reimar
parents: 15311
diff changeset
412 } while (i += bps);
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
413 }
e8832e66babd New features:
anders
parents: 7998
diff changeset
414
e8832e66babd New features:
anders
parents: 7998
diff changeset
415 static void change_bps(void* in, void* out, int len, int inbps, int outbps)
e8832e66babd New features:
anders
parents: 7998
diff changeset
416 {
e8832e66babd New features:
anders
parents: 7998
diff changeset
417 register int i;
e8832e66babd New features:
anders
parents: 7998
diff changeset
418 switch(inbps){
e8832e66babd New features:
anders
parents: 7998
diff changeset
419 case(1):
e8832e66babd New features:
anders
parents: 7998
diff changeset
420 switch(outbps){
e8832e66babd New features:
anders
parents: 7998
diff changeset
421 case(2):
e8832e66babd New features:
anders
parents: 7998
diff changeset
422 for(i=0;i<len;i++)
e8832e66babd New features:
anders
parents: 7998
diff changeset
423 ((uint16_t*)out)[i]=((uint16_t)((uint8_t*)in)[i])<<8;
e8832e66babd New features:
anders
parents: 7998
diff changeset
424 break;
12478
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
425 case(3):
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
426 for(i=0;i<len;i++)
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
427 store24bit(out, i, ((uint32_t)((uint8_t*)in)[i])<<24);
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
428 break;
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
429 case(4):
e8832e66babd New features:
anders
parents: 7998
diff changeset
430 for(i=0;i<len;i++)
e8832e66babd New features:
anders
parents: 7998
diff changeset
431 ((uint32_t*)out)[i]=((uint32_t)((uint8_t*)in)[i])<<24;
e8832e66babd New features:
anders
parents: 7998
diff changeset
432 break;
e8832e66babd New features:
anders
parents: 7998
diff changeset
433 }
e8832e66babd New features:
anders
parents: 7998
diff changeset
434 break;
e8832e66babd New features:
anders
parents: 7998
diff changeset
435 case(2):
e8832e66babd New features:
anders
parents: 7998
diff changeset
436 switch(outbps){
e8832e66babd New features:
anders
parents: 7998
diff changeset
437 case(1):
e8832e66babd New features:
anders
parents: 7998
diff changeset
438 for(i=0;i<len;i++)
e8832e66babd New features:
anders
parents: 7998
diff changeset
439 ((uint8_t*)out)[i]=(uint8_t)((((uint16_t*)in)[i])>>8);
e8832e66babd New features:
anders
parents: 7998
diff changeset
440 break;
12478
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
441 case(3):
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
442 for(i=0;i<len;i++)
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
443 store24bit(out, i, ((uint32_t)((uint16_t*)in)[i])<<16);
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
444 break;
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
445 case(4):
e8832e66babd New features:
anders
parents: 7998
diff changeset
446 for(i=0;i<len;i++)
e8832e66babd New features:
anders
parents: 7998
diff changeset
447 ((uint32_t*)out)[i]=((uint32_t)((uint16_t*)in)[i])<<16;
e8832e66babd New features:
anders
parents: 7998
diff changeset
448 break;
e8832e66babd New features:
anders
parents: 7998
diff changeset
449 }
e8832e66babd New features:
anders
parents: 7998
diff changeset
450 break;
12478
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
451 case(3):
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
452 switch(outbps){
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
453 case(1):
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
454 for(i=0;i<len;i++)
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
455 ((uint8_t*)out)[i]=(uint8_t)(load24bit(in, i)>>24);
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
456 break;
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
457 case(2):
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
458 for(i=0;i<len;i++)
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
459 ((uint16_t*)out)[i]=(uint16_t)(load24bit(in, i)>>16);
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
460 break;
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
461 case(4):
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
462 for(i=0;i<len;i++)
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
463 ((uint32_t*)out)[i]=(uint32_t)load24bit(in, i);
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
464 break;
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
465 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29049
diff changeset
466 break;
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
467 case(4):
e8832e66babd New features:
anders
parents: 7998
diff changeset
468 switch(outbps){
e8832e66babd New features:
anders
parents: 7998
diff changeset
469 case(1):
e8832e66babd New features:
anders
parents: 7998
diff changeset
470 for(i=0;i<len;i++)
e8832e66babd New features:
anders
parents: 7998
diff changeset
471 ((uint8_t*)out)[i]=(uint8_t)((((uint32_t*)in)[i])>>24);
e8832e66babd New features:
anders
parents: 7998
diff changeset
472 break;
e8832e66babd New features:
anders
parents: 7998
diff changeset
473 case(2):
e8832e66babd New features:
anders
parents: 7998
diff changeset
474 for(i=0;i<len;i++)
e8832e66babd New features:
anders
parents: 7998
diff changeset
475 ((uint16_t*)out)[i]=(uint16_t)((((uint32_t*)in)[i])>>16);
e8832e66babd New features:
anders
parents: 7998
diff changeset
476 break;
12478
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
477 case(3):
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
478 for(i=0;i<len;i++)
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
479 store24bit(out, i, ((uint32_t*)in)[i]);
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
480 break;
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
481 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29049
diff changeset
482 break;
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
483 }
e8832e66babd New features:
anders
parents: 7998
diff changeset
484 }
e8832e66babd New features:
anders
parents: 7998
diff changeset
485
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
486 static void float2int(float* in, void* out, int len, int bps)
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
487 {
33723
6c8743e5fa30 Audio format conversion from float to int is not checked for overflow.
iive
parents: 30241
diff changeset
488 float f;
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
489 register int i;
e8832e66babd New features:
anders
parents: 7998
diff changeset
490 switch(bps){
e8832e66babd New features:
anders
parents: 7998
diff changeset
491 case(1):
e8832e66babd New features:
anders
parents: 7998
diff changeset
492 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
493 ((int8_t *)out)[i] = av_clip_int8(lrintf(128.0 * in[i]));
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
494 break;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29049
diff changeset
495 case(2):
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
496 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
497 ((int16_t*)out)[i] = av_clip_int16(lrintf(32768.0 * in[i]));
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
498 break;
12478
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
499 case(3):
33723
6c8743e5fa30 Audio format conversion from float to int is not checked for overflow.
iive
parents: 30241
diff changeset
500 for(i=0;i<len;i++){
33736
a5a54c7a15ce Fix the precision loss in float -> 32bit conversion case, introduced
iive
parents: 33723
diff changeset
501 f = in[i] * 8388608;
33723
6c8743e5fa30 Audio format conversion from float to int is not checked for overflow.
iive
parents: 30241
diff changeset
502 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
503 }
12478
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
504 break;
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
505 case(4):
33723
6c8743e5fa30 Audio format conversion from float to int is not checked for overflow.
iive
parents: 30241
diff changeset
506 for(i=0;i<len;i++){
33736
a5a54c7a15ce Fix the precision loss in float -> 32bit conversion case, introduced
iive
parents: 33723
diff changeset
507 f = in[i];
a5a54c7a15ce Fix the precision loss in float -> 32bit conversion case, introduced
iive
parents: 33723
diff changeset
508 if (f <= -1.0)
a5a54c7a15ce Fix the precision loss in float -> 32bit conversion case, introduced
iive
parents: 33723
diff changeset
509 ((int32_t*)out)[i] = INT_MIN;
a5a54c7a15ce Fix the precision loss in float -> 32bit conversion case, introduced
iive
parents: 33723
diff changeset
510 else
a5a54c7a15ce Fix the precision loss in float -> 32bit conversion case, introduced
iive
parents: 33723
diff changeset
511 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
512 ((int32_t*)out)[i] = INT_MAX;
a5a54c7a15ce Fix the precision loss in float -> 32bit conversion case, introduced
iive
parents: 33723
diff changeset
513 else
a5a54c7a15ce Fix the precision loss in float -> 32bit conversion case, introduced
iive
parents: 33723
diff changeset
514 ((int32_t*)out)[i] = lrintf(f*2147483648.0);
a5a54c7a15ce Fix the precision loss in float -> 32bit conversion case, introduced
iive
parents: 33723
diff changeset
515
33723
6c8743e5fa30 Audio format conversion from float to int is not checked for overflow.
iive
parents: 30241
diff changeset
516 }
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
517 break;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29049
diff changeset
518 }
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
519 }
e8832e66babd New features:
anders
parents: 7998
diff changeset
520
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
521 static void int2float(void* in, float* out, int len, int bps)
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
522 {
e8832e66babd New features:
anders
parents: 7998
diff changeset
523 register int i;
e8832e66babd New features:
anders
parents: 7998
diff changeset
524 switch(bps){
e8832e66babd New features:
anders
parents: 7998
diff changeset
525 case(1):
e8832e66babd New features:
anders
parents: 7998
diff changeset
526 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
527 out[i]=(1.0/128.0)*((int8_t*)in)[i];
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
528 break;
e8832e66babd New features:
anders
parents: 7998
diff changeset
529 case(2):
e8832e66babd New features:
anders
parents: 7998
diff changeset
530 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
531 out[i]=(1.0/32768.0)*((int16_t*)in)[i];
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
532 break;
12478
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
533 case(3):
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
534 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
535 out[i]=(1.0/2147483648.0)*((int32_t)load24bit(in, i));
12478
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
536 break;
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
537 case(4):
e8832e66babd New features:
anders
parents: 7998
diff changeset
538 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
539 out[i]=(1.0/2147483648.0)*((int32_t*)in)[i];
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
540 break;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29049
diff changeset
541 }
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
542 }