annotate libaf/af_format.c @ 26733:99458e732ebd

Add detection code for abnormal pts jump when seeking previous. This patch make the vobsub works more accurately according to the requested pts.
author ulion
date Wed, 14 May 2008 03:43:45 +0000
parents f0a89eb49958
children 72d0b1444141
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
1 /* This audio output filter changes the format of a data block. Valid
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
2 formats are: AFMT_U8, AFMT_S8, AFMT_S16_LE, AFMT_S16_BE
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
3 AFMT_U16_LE, AFMT_U16_BE, AFMT_S32_LE and AFMT_S32_BE.
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
4 */
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
5
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
6 // Must be defined before any libc headers are included!
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
7 #define _ISOC9X_SOURCE
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
8
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
9 #include <stdio.h>
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
10 #include <stdlib.h>
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
11 #include <string.h>
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
12 #include <inttypes.h>
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
13 #include <limits.h>
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
14
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
15 // Integer to float conversion through lrintf()
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
16 #ifdef HAVE_LRINTF
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
17 #include <math.h>
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
18 long int lrintf(float);
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
19 #else
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
20 #define lrintf(x) ((int)(x))
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
21 #endif
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
22
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
23 #include "af.h"
21507
fa99b3d31d13 Hack around libavutil/bswap.h compilation problems due to always_inline undefined.
reimar
parents: 21372
diff changeset
24 #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
25 #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
26
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
27 /* Functions used by play to convert the input audio to the correct
e8832e66babd New features:
anders
parents: 7998
diff changeset
28 format */
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
29
24561
90b0691d9709 Fix loads of typos
reimar
parents: 24521
diff changeset
30 /* The below includes retrieves functions for converting to and from
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
31 ulaw and alaw */
e8832e66babd New features:
anders
parents: 7998
diff changeset
32 #include "af_format_ulaw.c"
e8832e66babd New features:
anders
parents: 7998
diff changeset
33 #include "af_format_alaw.c"
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
34
24561
90b0691d9709 Fix loads of typos
reimar
parents: 24521
diff changeset
35 // Switch endianness
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
36 static void endian(void* in, void* out, int len, int bps);
24561
90b0691d9709 Fix loads of typos
reimar
parents: 24521
diff changeset
37 // From signed to unsigned and the other way
16664
9991e406a2a2 much simpler signed/unsigned conversion.
reimar
parents: 15311
diff changeset
38 static void si2us(void* data, int len, int bps);
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
39 // Change the number of bits per sample
e8832e66babd New features:
anders
parents: 7998
diff changeset
40 static void change_bps(void* in, void* out, int len, int inbps, int outbps);
e8832e66babd New features:
anders
parents: 7998
diff changeset
41 // 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
42 static void float2int(float* in, void* out, int len, int bps);
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
43 // 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
44 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
45
14272
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
46 static af_data_t* play(struct af_instance_s* af, af_data_t* data);
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
47 static af_data_t* play_swapendian(struct af_instance_s* af, af_data_t* data);
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
48 static af_data_t* play_float_s16(struct af_instance_s* af, af_data_t* data);
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
49 static af_data_t* play_s16_float(struct af_instance_s* af, af_data_t* data);
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
50
8607
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
51 // Helper functions to check sanity for input arguments
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
52
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
53 // 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
54 static int check_bps(int bps)
8607
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
55 {
12478
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
56 if(bps != 4 && bps != 3 && bps != 2 && bps != 1){
8607
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
57 af_msg(AF_MSG_ERROR,"[format] The number of bytes per sample"
12478
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
58 " must be 1, 2, 3 or 4. Current value is %i \n",bps);
8607
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
59 return AF_ERROR;
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
60 }
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
61 return AF_OK;
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
62 }
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
63
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
64 // Check for unsupported formats
13989
dcb6b4a33aaa declare check_format and check_bps static, they are used nowhere else.
reimar
parents: 12486
diff changeset
65 static int check_format(int format)
8180
4ba9aed295f2 Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents: 8167
diff changeset
66 {
4ba9aed295f2 Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents: 8167
diff changeset
67 char buf[256];
8607
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
68 switch(format & AF_FORMAT_SPECIAL_MASK){
14335
8380694ba14f af_bits2fmt and af_str2fmt_short, also removed the extra FORMAT_BPS control in format.c
alex
parents: 14272
diff changeset
69 case(AF_FORMAT_IMA_ADPCM):
8180
4ba9aed295f2 Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents: 8167
diff changeset
70 case(AF_FORMAT_MPEG2):
4ba9aed295f2 Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents: 8167
diff changeset
71 case(AF_FORMAT_AC3):
4ba9aed295f2 Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents: 8167
diff changeset
72 af_msg(AF_MSG_ERROR,"[format] Sample format %s not yet supported \n",
14399
1a882e2a419b af_fmt2str fixes (remove trailing space, call with size of buffer, not size-1)
reimar
parents: 14335
diff changeset
73 af_fmt2str(format,buf,256));
8180
4ba9aed295f2 Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents: 8167
diff changeset
74 return AF_ERROR;
4ba9aed295f2 Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents: 8167
diff changeset
75 }
4ba9aed295f2 Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents: 8167
diff changeset
76 return AF_OK;
8607
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
77 }
8180
4ba9aed295f2 Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents: 8167
diff changeset
78
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
79 // Initialization and runtime control
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
80 static int control(struct af_instance_s* af, int cmd, void* arg)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
81 {
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
82 switch(cmd){
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
83 case AF_CONTROL_REINIT:{
e8832e66babd New features:
anders
parents: 7998
diff changeset
84 char buf1[256];
e8832e66babd New features:
anders
parents: 7998
diff changeset
85 char buf2[256];
14272
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
86 af_data_t *data = arg;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
87
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
88 // Make sure this filter isn't redundant
14717
51a7560a92b7 confusing mixture of typecasts and casted variable, removed typecasts
reimar
parents: 14433
diff changeset
89 if(af->data->format == data->format &&
51a7560a92b7 confusing mixture of typecasts and casted variable, removed typecasts
reimar
parents: 14433
diff changeset
90 af->data->bps == data->bps)
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
91 return AF_DETACH;
8607
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
92
24521
186626edd969 Fix typo in comment
reimar
parents: 23457
diff changeset
93 // Check for errors in configuration
14717
51a7560a92b7 confusing mixture of typecasts and casted variable, removed typecasts
reimar
parents: 14433
diff changeset
94 if((AF_OK != check_bps(data->bps)) ||
51a7560a92b7 confusing mixture of typecasts and casted variable, removed typecasts
reimar
parents: 14433
diff changeset
95 (AF_OK != check_format(data->format)) ||
8607
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
96 (AF_OK != check_bps(af->data->bps)) ||
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
97 (AF_OK != check_format(af->data->format)))
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
98 return AF_ERROR;
e8832e66babd New features:
anders
parents: 7998
diff changeset
99
14399
1a882e2a419b af_fmt2str fixes (remove trailing space, call with size of buffer, not size-1)
reimar
parents: 14335
diff changeset
100 af_msg(AF_MSG_VERBOSE,"[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
101 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
102 af_fmt2str(af->data->format,buf2,256));
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
103
14717
51a7560a92b7 confusing mixture of typecasts and casted variable, removed typecasts
reimar
parents: 14433
diff changeset
104 af->data->rate = data->rate;
51a7560a92b7 confusing mixture of typecasts and casted variable, removed typecasts
reimar
parents: 14433
diff changeset
105 af->data->nch = data->nch;
24888
b2402b4f0afa libaf: change filter input/output ratio calculations
uau
parents: 24561
diff changeset
106 af->mul = (double)af->data->bps / data->bps;
14272
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
107
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
108 af->play = play; // set default
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
109
24561
90b0691d9709 Fix loads of typos
reimar
parents: 24521
diff changeset
110 // look whether only endianness differences are there
14272
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
111 if ((af->data->format & ~AF_FORMAT_END_MASK) ==
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
112 (data->format & ~AF_FORMAT_END_MASK))
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
113 {
24561
90b0691d9709 Fix loads of typos
reimar
parents: 24521
diff changeset
114 af_msg(AF_MSG_VERBOSE,"[format] Accelerated endianness conversion only\n");
14272
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
115 af->play = play_swapendian;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
116 }
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
117 if ((data->format == AF_FORMAT_FLOAT_NE) &&
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
118 (af->data->format == AF_FORMAT_S16_NE))
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
119 {
14399
1a882e2a419b af_fmt2str fixes (remove trailing space, call with size of buffer, not size-1)
reimar
parents: 14335
diff changeset
120 af_msg(AF_MSG_VERBOSE,"[format] Accelerated %s to %s conversion\n",
14717
51a7560a92b7 confusing mixture of typecasts and casted variable, removed typecasts
reimar
parents: 14433
diff changeset
121 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
122 af_fmt2str(af->data->format,buf2,256));
14272
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
123 af->play = play_float_s16;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
124 }
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
125 if ((data->format == AF_FORMAT_S16_NE) &&
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
126 (af->data->format == AF_FORMAT_FLOAT_NE))
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
127 {
14399
1a882e2a419b af_fmt2str fixes (remove trailing space, call with size of buffer, not size-1)
reimar
parents: 14335
diff changeset
128 af_msg(AF_MSG_VERBOSE,"[format] Accelerated %s to %s conversion\n",
14717
51a7560a92b7 confusing mixture of typecasts and casted variable, removed typecasts
reimar
parents: 14433
diff changeset
129 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
130 af_fmt2str(af->data->format,buf2,256));
14272
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
131 af->play = play_s16_float;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
132 }
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
133 return AF_OK;
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
134 }
7998
d48a06d07afb Adding commandline options for filters and fixing stupid bug in cfg
anders
parents: 7719
diff changeset
135 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
136 int format = af_str2fmt_short(arg);
15311
b00b16a1ef05 Error out when invalid format is specified
reimar
parents: 14791
diff changeset
137 if (format == -1) {
b00b16a1ef05 Error out when invalid format is specified
reimar
parents: 14791
diff changeset
138 af_msg(AF_MSG_ERROR, "[format] %s is not a valid format\n", (char *)arg);
b00b16a1ef05 Error out when invalid format is specified
reimar
parents: 14791
diff changeset
139 return AF_ERROR;
b00b16a1ef05 Error out when invalid format is specified
reimar
parents: 14791
diff changeset
140 }
14335
8380694ba14f af_bits2fmt and af_str2fmt_short, also removed the extra FORMAT_BPS control in format.c
alex
parents: 14272
diff changeset
141 if(AF_OK != af->control(af,AF_CONTROL_FORMAT_FMT | AF_CONTROL_SET,&format))
8607
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
142 return AF_ERROR;
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
143 return AF_OK;
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
144 }
14335
8380694ba14f af_bits2fmt and af_str2fmt_short, also removed the extra FORMAT_BPS control in format.c
alex
parents: 14272
diff changeset
145 case AF_CONTROL_FORMAT_FMT | AF_CONTROL_SET:{
24561
90b0691d9709 Fix loads of typos
reimar
parents: 24521
diff changeset
146 // Check for errors in configuration
8607
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
147 if(AF_OK != check_format(*(int*)arg))
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
148 return AF_ERROR;
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
149
d6f40a06867b Changes includes:
anders
parents: 8185
diff changeset
150 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
151 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
152
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
153 return AF_OK;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
154 }
14335
8380694ba14f af_bits2fmt and af_str2fmt_short, also removed the extra FORMAT_BPS control in format.c
alex
parents: 14272
diff changeset
155 }
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
156 return AF_UNKNOWN;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
157 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
158
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
159 // Deallocate memory
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
160 static void uninit(struct af_instance_s* af)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
161 {
22179
ecf562795caf Fix memory leaks.
uau
parents: 21507
diff changeset
162 if (af->data)
ecf562795caf Fix memory leaks.
uau
parents: 21507
diff changeset
163 free(af->data->audio);
ecf562795caf Fix memory leaks.
uau
parents: 21507
diff changeset
164 free(af->data);
12386
be1e7cfddc08 more stupid crap
rfelker
parents: 8994
diff changeset
165 af->setup = 0;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
166 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
167
14272
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
168 static af_data_t* play_swapendian(struct af_instance_s* af, af_data_t* data)
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
169 {
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
170 af_data_t* l = af->data; // Local data
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
171 af_data_t* c = data; // Current working data
24561
90b0691d9709 Fix loads of typos
reimar
parents: 24521
diff changeset
172 int len = c->len/c->bps; // Length in samples of current audio block
14272
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
173
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
174 if(AF_OK != RESIZE_LOCAL_BUFFER(af,data))
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
175 return NULL;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
176
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
177 endian(c->audio,l->audio,len,c->bps);
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
178
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
179 c->audio = l->audio;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
180 c->format = l->format;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
181
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
182 return c;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
183 }
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
184
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
185 static af_data_t* play_float_s16(struct af_instance_s* af, af_data_t* data)
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
186 {
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
187 af_data_t* l = af->data; // Local data
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
188 af_data_t* c = data; // Current working data
24561
90b0691d9709 Fix loads of typos
reimar
parents: 24521
diff changeset
189 int len = c->len/4; // Length in samples of current audio block
14272
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
190
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
191 if(AF_OK != RESIZE_LOCAL_BUFFER(af,data))
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
192 return NULL;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
193
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
194 float2int(c->audio, l->audio, len, 2);
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
195
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
196 c->audio = l->audio;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
197 c->len = len*2;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
198 c->bps = 2;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
199 c->format = l->format;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
200
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
201 return c;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
202 }
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
203
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
204 static af_data_t* play_s16_float(struct af_instance_s* af, af_data_t* data)
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
205 {
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
206 af_data_t* l = af->data; // Local data
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
207 af_data_t* c = data; // Current working data
24561
90b0691d9709 Fix loads of typos
reimar
parents: 24521
diff changeset
208 int len = c->len/2; // Length in samples of current audio block
14272
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
209
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
210 if(AF_OK != RESIZE_LOCAL_BUFFER(af,data))
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
211 return NULL;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
212
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
213 int2float(c->audio, l->audio, len, 2);
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
214
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
215 c->audio = l->audio;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
216 c->len = len*4;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
217 c->bps = 4;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
218 c->format = l->format;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
219
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
220 return c;
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
221 }
5a2473f37499 accelerated conversions
alex
parents: 14263
diff changeset
222
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
223 // Filter data through filter
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
224 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
225 {
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
226 af_data_t* l = af->data; // Local data
e8832e66babd New features:
anders
parents: 7998
diff changeset
227 af_data_t* c = data; // Current working data
24561
90b0691d9709 Fix loads of typos
reimar
parents: 24521
diff changeset
228 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
229
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
230 if(AF_OK != RESIZE_LOCAL_BUFFER(af,data))
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
231 return NULL;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
232
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
233 // Change to cpu native endian format
e8832e66babd New features:
anders
parents: 7998
diff changeset
234 if((c->format&AF_FORMAT_END_MASK)!=AF_FORMAT_NE)
e8832e66babd New features:
anders
parents: 7998
diff changeset
235 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
236
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
237 // Conversion table
14261
710b223604fa 100l use right mask type when checking for input format
rtognimp
parents: 14256
diff changeset
238 if((c->format & AF_FORMAT_SPECIAL_MASK) == AF_FORMAT_MU_LAW) {
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
239 from_ulaw(c->audio, l->audio, len, l->bps, l->format&AF_FORMAT_POINT_MASK);
e8832e66babd New features:
anders
parents: 7998
diff changeset
240 if(AF_FORMAT_A_LAW == (l->format&AF_FORMAT_SPECIAL_MASK))
e8832e66babd New features:
anders
parents: 7998
diff changeset
241 to_ulaw(l->audio, l->audio, len, 1, AF_FORMAT_SI);
e8832e66babd New features:
anders
parents: 7998
diff changeset
242 if((l->format&AF_FORMAT_SIGN_MASK) == AF_FORMAT_US)
16664
9991e406a2a2 much simpler signed/unsigned conversion.
reimar
parents: 15311
diff changeset
243 si2us(l->audio,len,l->bps);
14261
710b223604fa 100l use right mask type when checking for input format
rtognimp
parents: 14256
diff changeset
244 } else if((c->format & AF_FORMAT_SPECIAL_MASK) == AF_FORMAT_A_LAW) {
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
245 from_alaw(c->audio, l->audio, len, l->bps, l->format&AF_FORMAT_POINT_MASK);
e8832e66babd New features:
anders
parents: 7998
diff changeset
246 if(AF_FORMAT_A_LAW == (l->format&AF_FORMAT_SPECIAL_MASK))
e8832e66babd New features:
anders
parents: 7998
diff changeset
247 to_alaw(l->audio, l->audio, len, 1, AF_FORMAT_SI);
e8832e66babd New features:
anders
parents: 7998
diff changeset
248 if((l->format&AF_FORMAT_SIGN_MASK) == AF_FORMAT_US)
16664
9991e406a2a2 much simpler signed/unsigned conversion.
reimar
parents: 15311
diff changeset
249 si2us(l->audio,len,l->bps);
14261
710b223604fa 100l use right mask type when checking for input format
rtognimp
parents: 14256
diff changeset
250 } else if((c->format & AF_FORMAT_POINT_MASK) == AF_FORMAT_F) {
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
251 switch(l->format&AF_FORMAT_SPECIAL_MASK){
e8832e66babd New features:
anders
parents: 7998
diff changeset
252 case(AF_FORMAT_MU_LAW):
e8832e66babd New features:
anders
parents: 7998
diff changeset
253 to_ulaw(c->audio, l->audio, len, c->bps, c->format&AF_FORMAT_POINT_MASK);
e8832e66babd New features:
anders
parents: 7998
diff changeset
254 break;
e8832e66babd New features:
anders
parents: 7998
diff changeset
255 case(AF_FORMAT_A_LAW):
e8832e66babd New features:
anders
parents: 7998
diff changeset
256 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
257 break;
8180
4ba9aed295f2 Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents: 8167
diff changeset
258 default:
4ba9aed295f2 Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents: 8167
diff changeset
259 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
260 if((l->format&AF_FORMAT_SIGN_MASK) == AF_FORMAT_US)
16664
9991e406a2a2 much simpler signed/unsigned conversion.
reimar
parents: 15311
diff changeset
261 si2us(l->audio,len,l->bps);
8180
4ba9aed295f2 Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents: 8167
diff changeset
262 break;
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
263 }
14261
710b223604fa 100l use right mask type when checking for input format
rtognimp
parents: 14256
diff changeset
264 } else {
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
265 // Input must be int
e8832e66babd New features:
anders
parents: 7998
diff changeset
266
e8832e66babd New features:
anders
parents: 7998
diff changeset
267 // Change signed/unsigned
e8832e66babd New features:
anders
parents: 7998
diff changeset
268 if((c->format&AF_FORMAT_SIGN_MASK) != (l->format&AF_FORMAT_SIGN_MASK)){
16664
9991e406a2a2 much simpler signed/unsigned conversion.
reimar
parents: 15311
diff changeset
269 si2us(c->audio,len,c->bps);
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
270 }
e8832e66babd New features:
anders
parents: 7998
diff changeset
271 // Convert to special formats
8180
4ba9aed295f2 Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents: 8167
diff changeset
272 switch(l->format&(AF_FORMAT_SPECIAL_MASK|AF_FORMAT_POINT_MASK)){
8167
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);
e8832e66babd New features:
anders
parents: 7998
diff changeset
278 break;
8180
4ba9aed295f2 Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents: 8167
diff changeset
279 case(AF_FORMAT_F):
4ba9aed295f2 Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents: 8167
diff changeset
280 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
281 break;
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
282 default:
8180
4ba9aed295f2 Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents: 8167
diff changeset
283 // Change the number of bits
4ba9aed295f2 Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents: 8167
diff changeset
284 if(c->bps != l->bps)
4ba9aed295f2 Fixing segfault bug and addnig support for lrintf() in format conversion
anders
parents: 8167
diff changeset
285 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
286 else
23457
a124f3abc1ec Replace implicit use of fast_memcpy via macro by explicit use to allow
reimar
parents: 22748
diff changeset
287 fast_memcpy(l->audio,c->audio,len*c->bps);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
288 break;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
289 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
290 }
7719
41e8d0916c60 Fix for audio filters on big endian cpus. It's working now on Solaris SPARC &
jkeil
parents: 7711
diff changeset
291
24561
90b0691d9709 Fix loads of typos
reimar
parents: 24521
diff changeset
292 // Switch from cpu native endian to the correct endianness
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
293 if((l->format&AF_FORMAT_END_MASK)!=AF_FORMAT_NE)
e8832e66babd New features:
anders
parents: 7998
diff changeset
294 endian(l->audio,l->audio,len,l->bps);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
295
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
296 // Set output data
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
297 c->audio = l->audio;
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
298 c->len = len*l->bps;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
299 c->bps = l->bps;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
300 c->format = l->format;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
301 return c;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
302 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
303
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
304 // 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
305 static int af_open(af_instance_t* af){
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
306 af->control=control;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
307 af->uninit=uninit;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
308 af->play=play;
24888
b2402b4f0afa libaf: change filter input/output ratio calculations
uau
parents: 24561
diff changeset
309 af->mul=1;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
310 af->data=calloc(1,sizeof(af_data_t));
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
311 if(af->data == NULL)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
312 return AF_ERROR;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
313 return AF_OK;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
314 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
315
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
316 // Description of this filter
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
317 af_info_t af_info_format = {
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
318 "Sample format conversion",
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
319 "format",
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
320 "Anders",
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
321 "",
7615
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7571
diff changeset
322 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
323 af_open
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
324 };
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
325
12478
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
326 static inline uint32_t load24bit(void* data, int pos) {
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
327 #if WORDS_BIGENDIAN
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
328 return (((uint32_t)((uint8_t*)data)[3*pos])<<24) |
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
329 (((uint32_t)((uint8_t*)data)[3*pos+1])<<16) |
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
330 (((uint32_t)((uint8_t*)data)[3*pos+2])<<8);
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
331 #else
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
332 return (((uint32_t)((uint8_t*)data)[3*pos])<<8) |
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
333 (((uint32_t)((uint8_t*)data)[3*pos+1])<<16) |
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
334 (((uint32_t)((uint8_t*)data)[3*pos+2])<<24);
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
335 #endif
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
336 }
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
337
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
338 static inline void store24bit(void* data, int pos, uint32_t expanded_value) {
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
339 #if WORDS_BIGENDIAN
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
340 ((uint8_t*)data)[3*pos]=expanded_value>>24;
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
341 ((uint8_t*)data)[3*pos+1]=expanded_value>>16;
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
342 ((uint8_t*)data)[3*pos+2]=expanded_value>>8;
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
343 #else
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
344 ((uint8_t*)data)[3*pos]=expanded_value>>8;
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
345 ((uint8_t*)data)[3*pos+1]=expanded_value>>16;
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
346 ((uint8_t*)data)[3*pos+2]=expanded_value>>24;
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
347 #endif
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
348 }
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
349
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
350 // Function implementations used by play
e8832e66babd New features:
anders
parents: 7998
diff changeset
351 static void endian(void* in, void* out, int len, int bps)
e8832e66babd New features:
anders
parents: 7998
diff changeset
352 {
e8832e66babd New features:
anders
parents: 7998
diff changeset
353 register int i;
e8832e66babd New features:
anders
parents: 7998
diff changeset
354 switch(bps){
e8832e66babd New features:
anders
parents: 7998
diff changeset
355 case(2):{
e8832e66babd New features:
anders
parents: 7998
diff changeset
356 for(i=0;i<len;i++){
12486
e02a261e4c92 using bswap.h for endianness conversion
reimar
parents: 12481
diff changeset
357 ((uint16_t*)out)[i]=bswap_16(((uint16_t*)in)[i]);
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
358 }
e8832e66babd New features:
anders
parents: 7998
diff changeset
359 break;
e8832e66babd New features:
anders
parents: 7998
diff changeset
360 }
12478
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
361 case(3):{
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
362 register uint8_t s;
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
363 for(i=0;i<len;i++){
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
364 s=((uint8_t*)in)[3*i];
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
365 ((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
366 if (in != out)
dbbc25ea6403 fix endian conversion for (curently unused) case where in buffer != out buffer
reimar
parents: 12478
diff changeset
367 ((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
368 ((uint8_t*)out)[3*i+2]=s;
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 break;
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
371 }
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
372 case(4):{
e8832e66babd New features:
anders
parents: 7998
diff changeset
373 for(i=0;i<len;i++){
12486
e02a261e4c92 using bswap.h for endianness conversion
reimar
parents: 12481
diff changeset
374 ((uint32_t*)out)[i]=bswap_32(((uint32_t*)in)[i]);
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
375 }
e8832e66babd New features:
anders
parents: 7998
diff changeset
376 break;
e8832e66babd New features:
anders
parents: 7998
diff changeset
377 }
e8832e66babd New features:
anders
parents: 7998
diff changeset
378 }
e8832e66babd New features:
anders
parents: 7998
diff changeset
379 }
e8832e66babd New features:
anders
parents: 7998
diff changeset
380
16664
9991e406a2a2 much simpler signed/unsigned conversion.
reimar
parents: 15311
diff changeset
381 static void si2us(void* data, int len, int bps)
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
382 {
16664
9991e406a2a2 much simpler signed/unsigned conversion.
reimar
parents: 15311
diff changeset
383 register long i = -(len * bps);
9991e406a2a2 much simpler signed/unsigned conversion.
reimar
parents: 15311
diff changeset
384 register uint8_t *p = &((uint8_t *)data)[len * bps];
9991e406a2a2 much simpler signed/unsigned conversion.
reimar
parents: 15311
diff changeset
385 #if AF_FORMAT_NE == AF_FORMAT_LE
9991e406a2a2 much simpler signed/unsigned conversion.
reimar
parents: 15311
diff changeset
386 p += bps - 1;
9991e406a2a2 much simpler signed/unsigned conversion.
reimar
parents: 15311
diff changeset
387 #endif
9991e406a2a2 much simpler signed/unsigned conversion.
reimar
parents: 15311
diff changeset
388 if (len <= 0) return;
9991e406a2a2 much simpler signed/unsigned conversion.
reimar
parents: 15311
diff changeset
389 do {
9991e406a2a2 much simpler signed/unsigned conversion.
reimar
parents: 15311
diff changeset
390 p[i] ^= 0x80;
9991e406a2a2 much simpler signed/unsigned conversion.
reimar
parents: 15311
diff changeset
391 } while (i += bps);
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
392 }
e8832e66babd New features:
anders
parents: 7998
diff changeset
393
e8832e66babd New features:
anders
parents: 7998
diff changeset
394 static void change_bps(void* in, void* out, int len, int inbps, int outbps)
e8832e66babd New features:
anders
parents: 7998
diff changeset
395 {
e8832e66babd New features:
anders
parents: 7998
diff changeset
396 register int i;
e8832e66babd New features:
anders
parents: 7998
diff changeset
397 switch(inbps){
e8832e66babd New features:
anders
parents: 7998
diff changeset
398 case(1):
e8832e66babd New features:
anders
parents: 7998
diff changeset
399 switch(outbps){
e8832e66babd New features:
anders
parents: 7998
diff changeset
400 case(2):
e8832e66babd New features:
anders
parents: 7998
diff changeset
401 for(i=0;i<len;i++)
e8832e66babd New features:
anders
parents: 7998
diff changeset
402 ((uint16_t*)out)[i]=((uint16_t)((uint8_t*)in)[i])<<8;
e8832e66babd New features:
anders
parents: 7998
diff changeset
403 break;
12478
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
404 case(3):
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
405 for(i=0;i<len;i++)
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
406 store24bit(out, i, ((uint32_t)((uint8_t*)in)[i])<<24);
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
407 break;
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
408 case(4):
e8832e66babd New features:
anders
parents: 7998
diff changeset
409 for(i=0;i<len;i++)
e8832e66babd New features:
anders
parents: 7998
diff changeset
410 ((uint32_t*)out)[i]=((uint32_t)((uint8_t*)in)[i])<<24;
e8832e66babd New features:
anders
parents: 7998
diff changeset
411 break;
e8832e66babd New features:
anders
parents: 7998
diff changeset
412 }
e8832e66babd New features:
anders
parents: 7998
diff changeset
413 break;
e8832e66babd New features:
anders
parents: 7998
diff changeset
414 case(2):
e8832e66babd New features:
anders
parents: 7998
diff changeset
415 switch(outbps){
e8832e66babd New features:
anders
parents: 7998
diff changeset
416 case(1):
e8832e66babd New features:
anders
parents: 7998
diff changeset
417 for(i=0;i<len;i++)
e8832e66babd New features:
anders
parents: 7998
diff changeset
418 ((uint8_t*)out)[i]=(uint8_t)((((uint16_t*)in)[i])>>8);
e8832e66babd New features:
anders
parents: 7998
diff changeset
419 break;
12478
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
420 case(3):
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
421 for(i=0;i<len;i++)
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
422 store24bit(out, i, ((uint32_t)((uint16_t*)in)[i])<<16);
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
423 break;
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
424 case(4):
e8832e66babd New features:
anders
parents: 7998
diff changeset
425 for(i=0;i<len;i++)
e8832e66babd New features:
anders
parents: 7998
diff changeset
426 ((uint32_t*)out)[i]=((uint32_t)((uint16_t*)in)[i])<<16;
e8832e66babd New features:
anders
parents: 7998
diff changeset
427 break;
e8832e66babd New features:
anders
parents: 7998
diff changeset
428 }
e8832e66babd New features:
anders
parents: 7998
diff changeset
429 break;
12478
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
430 case(3):
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
431 switch(outbps){
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
432 case(1):
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
433 for(i=0;i<len;i++)
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
434 ((uint8_t*)out)[i]=(uint8_t)(load24bit(in, i)>>24);
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
435 break;
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
436 case(2):
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
437 for(i=0;i<len;i++)
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
438 ((uint16_t*)out)[i]=(uint16_t)(load24bit(in, i)>>16);
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
439 break;
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
440 case(4):
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
441 for(i=0;i<len;i++)
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
442 ((uint32_t*)out)[i]=(uint32_t)load24bit(in, i);
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
443 break;
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
444 }
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
445 break;
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
446 case(4):
e8832e66babd New features:
anders
parents: 7998
diff changeset
447 switch(outbps){
e8832e66babd New features:
anders
parents: 7998
diff changeset
448 case(1):
e8832e66babd New features:
anders
parents: 7998
diff changeset
449 for(i=0;i<len;i++)
e8832e66babd New features:
anders
parents: 7998
diff changeset
450 ((uint8_t*)out)[i]=(uint8_t)((((uint32_t*)in)[i])>>24);
e8832e66babd New features:
anders
parents: 7998
diff changeset
451 break;
e8832e66babd New features:
anders
parents: 7998
diff changeset
452 case(2):
e8832e66babd New features:
anders
parents: 7998
diff changeset
453 for(i=0;i<len;i++)
e8832e66babd New features:
anders
parents: 7998
diff changeset
454 ((uint16_t*)out)[i]=(uint16_t)((((uint32_t*)in)[i])>>16);
e8832e66babd New features:
anders
parents: 7998
diff changeset
455 break;
12478
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
456 case(3):
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
457 for(i=0;i<len;i++)
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
458 store24bit(out, i, ((uint32_t*)in)[i]);
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
459 break;
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
460 }
e8832e66babd New features:
anders
parents: 7998
diff changeset
461 break;
e8832e66babd New features:
anders
parents: 7998
diff changeset
462 }
e8832e66babd New features:
anders
parents: 7998
diff changeset
463 }
e8832e66babd New features:
anders
parents: 7998
diff changeset
464
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
465 static void float2int(float* in, void* out, int len, int bps)
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
466 {
e8832e66babd New features:
anders
parents: 7998
diff changeset
467 register int i;
e8832e66babd New features:
anders
parents: 7998
diff changeset
468 switch(bps){
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++)
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
471 ((int8_t*)out)[i] = lrintf(127.0 * in[i]);
8167
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++)
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
475 ((int16_t*)out)[i] = lrintf(32767.0 * in[i]);
8167
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++)
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
479 store24bit(out, i, lrintf(2147483647.0 * in[i]));
12478
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 case(4):
e8832e66babd New features:
anders
parents: 7998
diff changeset
482 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
483 ((int32_t*)out)[i] = lrintf(2147483647.0 * in[i]);
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
484 break;
e8832e66babd New features:
anders
parents: 7998
diff changeset
485 }
e8832e66babd New features:
anders
parents: 7998
diff changeset
486 }
e8832e66babd New features:
anders
parents: 7998
diff changeset
487
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
488 static void int2float(void* in, float* out, int len, int bps)
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
489 {
e8832e66babd New features:
anders
parents: 7998
diff changeset
490 register int i;
e8832e66babd New features:
anders
parents: 7998
diff changeset
491 switch(bps){
e8832e66babd New features:
anders
parents: 7998
diff changeset
492 case(1):
e8832e66babd New features:
anders
parents: 7998
diff changeset
493 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
494 out[i]=(1.0/128.0)*((int8_t*)in)[i];
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
495 break;
e8832e66babd New features:
anders
parents: 7998
diff changeset
496 case(2):
e8832e66babd New features:
anders
parents: 7998
diff changeset
497 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
498 out[i]=(1.0/32768.0)*((int16_t*)in)[i];
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
499 break;
12478
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
500 case(3):
7f8eb5f6814a support for 24 bit pcm/wav files
reimar
parents: 12386
diff changeset
501 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
502 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
503 break;
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
504 case(4):
e8832e66babd New features:
anders
parents: 7998
diff changeset
505 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
506 out[i]=(1.0/2147483648.0)*((int32_t*)in)[i];
8167
e8832e66babd New features:
anders
parents: 7998
diff changeset
507 break;
e8832e66babd New features:
anders
parents: 7998
diff changeset
508 }
e8832e66babd New features:
anders
parents: 7998
diff changeset
509 }