Mercurial > mplayer.hg
annotate libaf/af_resample.c @ 28296:08c1417e757b
fix compilation on non x86 machines (PPC here)
author | gpoirier |
---|---|
date | Fri, 16 Jan 2009 10:07:14 +0000 |
parents | d6001126678f |
children | 44d67f7f8eb3 |
rev | line source |
---|---|
28229
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
28201
diff
changeset
|
1 /* |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
28201
diff
changeset
|
2 * This audio filter changes the sample rate. |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
28201
diff
changeset
|
3 * |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
28201
diff
changeset
|
4 * Copyright (C) 2002 Anders Johansson ajh@atri.curtin.edu.au |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
28201
diff
changeset
|
5 * |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
28201
diff
changeset
|
6 * This file is part of MPlayer. |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
28201
diff
changeset
|
7 * |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
28201
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:
28201
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:
28201
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:
28201
diff
changeset
|
11 * (at your option) any later version. |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
28201
diff
changeset
|
12 * |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
28201
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:
28201
diff
changeset
|
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
28201
diff
changeset
|
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
28201
diff
changeset
|
16 * GNU General Public License for more details. |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
28201
diff
changeset
|
17 * |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
28201
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:
28201
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:
28201
diff
changeset
|
20 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
28201
diff
changeset
|
21 */ |
7568 | 22 |
23 #include <stdio.h> | |
24 #include <stdlib.h> | |
25 #include <inttypes.h> | |
26 | |
24889 | 27 #include "libavutil/common.h" |
7568 | 28 #include "af.h" |
29 #include "dsp.h" | |
30 | |
31 /* Below definition selects the length of each poly phase component. | |
32 Valid definitions are L8 and L16, where the number denotes the | |
33 length of the filter. This definition affects the computational | |
34 complexity (see play()), the performance (see filter.h) and the | |
24595 | 35 memory usage. The filterlength is choosen to 8 if the machine is |
7568 | 36 slow and to 16 if the machine is fast and has MMX. |
37 */ | |
38 | |
28292
d6001126678f
More #ifdef HAVE_MMX etc. missed by earlier search.
reimar
parents:
28229
diff
changeset
|
39 #if !HAVE_MMX // This machine is slow |
8607 | 40 #define L8 |
41 #else | |
42 #define L16 | |
43 #endif | |
7568 | 44 |
28201
4ff973912251
Rename libaf/af_resample.h to libaf/af_resample_template.c, it is used as
diego
parents:
24900
diff
changeset
|
45 #include "af_resample_template.c" |
7568 | 46 |
8607 | 47 // Filtering types |
8867
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
48 #define RSMP_LIN (0<<0) // Linear interpolation |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
49 #define RSMP_INT (1<<0) // 16 bit integer |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
50 #define RSMP_FLOAT (2<<0) // 32 bit floating point |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
51 #define RSMP_MASK (3<<0) |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
52 |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
53 // Defines for sloppy or exact resampling |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
54 #define FREQ_SLOPPY (0<<2) |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
55 #define FREQ_EXACT (1<<2) |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
56 #define FREQ_MASK (1<<2) |
7568 | 57 |
8607 | 58 // Accuracy for linear interpolation |
59 #define STEPACCURACY 32 | |
7568 | 60 |
61 // local data | |
62 typedef struct af_resample_s | |
63 { | |
8607 | 64 void* w; // Current filter weights |
65 void** xq; // Circular buffers | |
7580 | 66 uint32_t xi; // Index for circular buffers |
67 uint32_t wi; // Index for w | |
8607 | 68 uint32_t i; // Number of new samples to put in x queue |
7580 | 69 uint32_t dn; // Down sampling factor |
70 uint32_t up; // Up sampling factor | |
8607 | 71 uint64_t step; // Step size for linear interpolation |
72 uint64_t pt; // Pointer remainder for linear interpolation | |
8867
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
73 int setup; // Setup parameters cmdline or through postcreate |
7568 | 74 } af_resample_t; |
75 | |
8607 | 76 // Fast linear interpolation resample with modest audio quality |
77 static int linint(af_data_t* c,af_data_t* l, af_resample_t* s) | |
7568 | 78 { |
8607 | 79 uint32_t len = 0; // Number of input samples |
80 uint32_t nch = l->nch; // Words pre transfer | |
81 uint64_t step = s->step; | |
82 int16_t* in16 = ((int16_t*)c->audio); | |
83 int16_t* out16 = ((int16_t*)l->audio); | |
84 int32_t* in32 = ((int32_t*)c->audio); | |
85 int32_t* out32 = ((int32_t*)l->audio); | |
86 uint64_t end = ((((uint64_t)c->len)/2LL)<<STEPACCURACY); | |
87 uint64_t pt = s->pt; | |
88 uint16_t tmp; | |
89 | |
90 switch (nch){ | |
91 case 1: | |
92 while(pt < end){ | |
93 out16[len++]=in16[pt>>STEPACCURACY]; | |
94 pt+=step; | |
7568 | 95 } |
8607 | 96 s->pt=pt & ((1LL<<STEPACCURACY)-1); |
97 break; | |
98 case 2: | |
99 end/=2; | |
100 while(pt < end){ | |
101 out32[len++]=in32[pt>>STEPACCURACY]; | |
102 pt+=step; | |
103 } | |
104 len=(len<<1); | |
105 s->pt=pt & ((1LL<<STEPACCURACY)-1); | |
106 break; | |
107 default: | |
108 end /=nch; | |
109 while(pt < end){ | |
110 tmp=nch; | |
111 do { | |
112 tmp--; | |
113 out16[len+tmp]=in16[tmp+(pt>>STEPACCURACY)*nch]; | |
114 } while (tmp); | |
115 len+=nch; | |
116 pt+=step; | |
117 } | |
118 s->pt=pt & ((1LL<<STEPACCURACY)-1); | |
7568 | 119 } |
120 return len; | |
121 } | |
122 | |
8867
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
123 /* Determine resampling type and format */ |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
124 static int set_types(struct af_instance_s* af, af_data_t* data) |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
125 { |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
126 af_resample_t* s = af->setup; |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
127 int rv = AF_OK; |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
128 float rd = 0; |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
129 |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
130 // Make sure this filter isn't redundant |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
131 if((af->data->rate == data->rate) || (af->data->rate == 0)) |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
132 return AF_DETACH; |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
133 /* If sloppy and small resampling difference (2%) */ |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
134 rd = abs((float)af->data->rate - (float)data->rate)/(float)data->rate; |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
135 if((((s->setup & FREQ_MASK) == FREQ_SLOPPY) && (rd < 0.02) && |
14245 | 136 (data->format != (AF_FORMAT_FLOAT_NE))) || |
8867
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
137 ((s->setup & RSMP_MASK) == RSMP_LIN)){ |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
138 s->setup = (s->setup & ~RSMP_MASK) | RSMP_LIN; |
14245 | 139 af->data->format = AF_FORMAT_S16_NE; |
8867
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
140 af->data->bps = 2; |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
141 af_msg(AF_MSG_VERBOSE,"[resample] Using linear interpolation. \n"); |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
142 } |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
143 else{ |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
144 /* If the input format is float or if float is explicitly selected |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
145 use float, otherwise use int */ |
14245 | 146 if((data->format == (AF_FORMAT_FLOAT_NE)) || |
8867
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
147 ((s->setup & RSMP_MASK) == RSMP_FLOAT)){ |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
148 s->setup = (s->setup & ~RSMP_MASK) | RSMP_FLOAT; |
14245 | 149 af->data->format = AF_FORMAT_FLOAT_NE; |
8867
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
150 af->data->bps = 4; |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
151 } |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
152 else{ |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
153 s->setup = (s->setup & ~RSMP_MASK) | RSMP_INT; |
14245 | 154 af->data->format = AF_FORMAT_S16_NE; |
8867
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
155 af->data->bps = 2; |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
156 } |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
157 af_msg(AF_MSG_VERBOSE,"[resample] Using %s processing and %s frequecy" |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
158 " conversion.\n", |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
159 ((s->setup & RSMP_MASK) == RSMP_FLOAT)?"floating point":"integer", |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
160 ((s->setup & FREQ_MASK) == FREQ_SLOPPY)?"inexact":"exact"); |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
161 } |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
162 |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
163 if(af->data->format != data->format || af->data->bps != data->bps) |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
164 rv = AF_FALSE; |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
165 data->format = af->data->format; |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
166 data->bps = af->data->bps; |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
167 af->data->nch = data->nch; |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
168 return rv; |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
169 } |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
170 |
7568 | 171 // Initialization and runtime control |
172 static int control(struct af_instance_s* af, int cmd, void* arg) | |
173 { | |
174 switch(cmd){ | |
175 case AF_CONTROL_REINIT:{ | |
176 af_resample_t* s = (af_resample_t*)af->setup; | |
177 af_data_t* n = (af_data_t*)arg; // New configureation | |
178 int i,d = 0; | |
179 int rv = AF_OK; | |
180 | |
8867
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
181 // Free space for circular bufers |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
182 if(s->xq){ |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
183 for(i=1;i<af->data->nch;i++) |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
184 if(s->xq[i]) |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
185 free(s->xq[i]); |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
186 free(s->xq); |
21017
32d611b59079
Fix double free in af_resample when reinited with suitable parameters
uau
parents:
17366
diff
changeset
|
187 s->xq = NULL; |
8867
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
188 } |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
189 |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
190 if(AF_DETACH == (rv = set_types(af,n))) |
7568 | 191 return AF_DETACH; |
8867
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
192 |
8607 | 193 // If linear interpolation |
8867
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
194 if((s->setup & RSMP_MASK) == RSMP_LIN){ |
8607 | 195 s->pt=0LL; |
196 s->step=((uint64_t)n->rate<<STEPACCURACY)/(uint64_t)af->data->rate+1LL; | |
17366 | 197 af_msg(AF_MSG_DEBUG0,"[resample] Linear interpolation step: 0x%016"PRIX64".\n", |
8607 | 198 s->step); |
24888 | 199 af->mul = (double)af->data->rate / n->rate; |
8905 | 200 return rv; |
7568 | 201 } |
202 | |
203 // Calculate up and down sampling factors | |
24889 | 204 d=ff_gcd(af->data->rate,n->rate); |
7568 | 205 |
7998
d48a06d07afb
Adding commandline options for filters and fixing stupid bug in cfg
anders
parents:
7894
diff
changeset
|
206 // If sloppy resampling is enabled limit the upsampling factor |
8867
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
207 if(((s->setup & FREQ_MASK) == FREQ_SLOPPY) && (af->data->rate/d > 5000)){ |
7998
d48a06d07afb
Adding commandline options for filters and fixing stupid bug in cfg
anders
parents:
7894
diff
changeset
|
208 int up=af->data->rate/2; |
d48a06d07afb
Adding commandline options for filters and fixing stupid bug in cfg
anders
parents:
7894
diff
changeset
|
209 int dn=n->rate/2; |
d48a06d07afb
Adding commandline options for filters and fixing stupid bug in cfg
anders
parents:
7894
diff
changeset
|
210 int m=2; |
d48a06d07afb
Adding commandline options for filters and fixing stupid bug in cfg
anders
parents:
7894
diff
changeset
|
211 while(af->data->rate/(d*m) > 5000){ |
24889 | 212 d=ff_gcd(up,dn); |
7998
d48a06d07afb
Adding commandline options for filters and fixing stupid bug in cfg
anders
parents:
7894
diff
changeset
|
213 up/=2; dn/=2; m*=2; |
d48a06d07afb
Adding commandline options for filters and fixing stupid bug in cfg
anders
parents:
7894
diff
changeset
|
214 } |
d48a06d07afb
Adding commandline options for filters and fixing stupid bug in cfg
anders
parents:
7894
diff
changeset
|
215 d*=m; |
d48a06d07afb
Adding commandline options for filters and fixing stupid bug in cfg
anders
parents:
7894
diff
changeset
|
216 } |
d48a06d07afb
Adding commandline options for filters and fixing stupid bug in cfg
anders
parents:
7894
diff
changeset
|
217 |
8867
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
218 // Create space for circular bufers |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
219 s->xq = malloc(n->nch*sizeof(void*)); |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
220 for(i=0;i<n->nch;i++) |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
221 s->xq[i] = malloc(2*L*af->data->bps); |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
222 s->xi = 0; |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
223 |
7568 | 224 // Check if the the design needs to be redone |
225 if(s->up != af->data->rate/d || s->dn != n->rate/d){ | |
226 float* w; | |
227 float* wt; | |
228 float fc; | |
229 int j; | |
230 s->up = af->data->rate/d; | |
231 s->dn = n->rate/d; | |
21058
1ed61a0494c4
Reinitialize some variables on af_resample reinit, fixes crash
uau
parents:
21017
diff
changeset
|
232 s->wi = 0; |
1ed61a0494c4
Reinitialize some variables on af_resample reinit, fixes crash
uau
parents:
21017
diff
changeset
|
233 s->i = 0; |
7568 | 234 |
235 // Calculate cuttof frequency for filter | |
236 fc = 1/(float)(max(s->up,s->dn)); | |
237 // Allocate space for polyphase filter bank and protptype filter | |
238 w = malloc(sizeof(float) * s->up *L); | |
239 if(NULL != s->w) | |
240 free(s->w); | |
8867
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
241 s->w = malloc(L*s->up*af->data->bps); |
7568 | 242 |
243 // Design prototype filter type using Kaiser window with beta = 10 | |
244 if(NULL == w || NULL == s->w || | |
14275
de13fd557440
less namespace pollution #2 (prefixed globals in filter.c with af_filter_)
alex
parents:
14245
diff
changeset
|
245 -1 == af_filter_design_fir(s->up*L, w, &fc, LP|KAISER , 10.0)){ |
8167 | 246 af_msg(AF_MSG_ERROR,"[resample] Unable to design prototype filter.\n"); |
7568 | 247 return AF_ERROR; |
248 } | |
249 // Copy data from prototype to polyphase filter | |
250 wt=w; | |
251 for(j=0;j<L;j++){//Columns | |
252 for(i=0;i<s->up;i++){//Rows | |
8867
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
253 if((s->setup & RSMP_MASK) == RSMP_INT){ |
8607 | 254 float t=(float)s->up*32767.0*(*wt); |
255 ((int16_t*)s->w)[i*L+j] = (int16_t)((t>=0.0)?(t+0.5):(t-0.5)); | |
256 } | |
257 else | |
258 ((float*)s->w)[i*L+j] = (float)s->up*(*wt); | |
7568 | 259 wt++; |
260 } | |
261 } | |
262 free(w); | |
8607 | 263 af_msg(AF_MSG_VERBOSE,"[resample] New filter designed up: %i " |
264 "down: %i\n", s->up, s->dn); | |
7568 | 265 } |
266 | |
7665
fbd5445cc853
Adding function for calculating the delay caused by the filters
anders
parents:
7616
diff
changeset
|
267 // Set multiplier and delay |
24900 | 268 af->delay = 0; // not set correctly, but shouldn't be too large anyway |
24888 | 269 af->mul = (double)s->up / s->dn; |
7568 | 270 return rv; |
271 } | |
7998
d48a06d07afb
Adding commandline options for filters and fixing stupid bug in cfg
anders
parents:
7894
diff
changeset
|
272 case AF_CONTROL_COMMAND_LINE:{ |
d48a06d07afb
Adding commandline options for filters and fixing stupid bug in cfg
anders
parents:
7894
diff
changeset
|
273 af_resample_t* s = (af_resample_t*)af->setup; |
d48a06d07afb
Adding commandline options for filters and fixing stupid bug in cfg
anders
parents:
7894
diff
changeset
|
274 int rate=0; |
8867
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
275 int type=RSMP_INT; |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
276 int sloppy=1; |
8868
398e3fb7c103
10l bug for float conversion control + feature fix in volume control
anders
parents:
8867
diff
changeset
|
277 sscanf((char*)arg,"%i:%i:%i", &rate, &sloppy, &type); |
8867
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
278 s->setup = (sloppy?FREQ_SLOPPY:FREQ_EXACT) | |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
279 (clamp(type,RSMP_LIN,RSMP_FLOAT)); |
8607 | 280 return af->control(af,AF_CONTROL_RESAMPLE_RATE | AF_CONTROL_SET, &rate); |
7998
d48a06d07afb
Adding commandline options for filters and fixing stupid bug in cfg
anders
parents:
7894
diff
changeset
|
281 } |
8607 | 282 case AF_CONTROL_POST_CREATE: |
8867
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
283 if((((af_cfg_t*)arg)->force & AF_INIT_FORMAT_MASK) == AF_INIT_FLOAT) |
8868
398e3fb7c103
10l bug for float conversion control + feature fix in volume control
anders
parents:
8867
diff
changeset
|
284 ((af_resample_t*)af->setup)->setup = RSMP_FLOAT; |
8607 | 285 return AF_OK; |
286 case AF_CONTROL_RESAMPLE_RATE | AF_CONTROL_SET: | |
7568 | 287 // Reinit must be called after this function has been called |
288 | |
289 // Sanity check | |
7616 | 290 if(((int*)arg)[0] < 8000 || ((int*)arg)[0] > 192000){ |
8607 | 291 af_msg(AF_MSG_ERROR,"[resample] The output sample frequency " |
292 "must be between 8kHz and 192kHz. Current value is %i \n", | |
293 ((int*)arg)[0]); | |
7568 | 294 return AF_ERROR; |
295 } | |
296 | |
297 af->data->rate=((int*)arg)[0]; | |
8607 | 298 af_msg(AF_MSG_VERBOSE,"[resample] Changing sample rate " |
299 "to %iHz\n",af->data->rate); | |
7568 | 300 return AF_OK; |
301 } | |
302 return AF_UNKNOWN; | |
303 } | |
304 | |
305 // Deallocate memory | |
306 static void uninit(struct af_instance_s* af) | |
307 { | |
308 if(af->data) | |
22179 | 309 free(af->data->audio); |
310 free(af->data); | |
7568 | 311 } |
312 | |
313 // Filter data through filter | |
314 static af_data_t* play(struct af_instance_s* af, af_data_t* data) | |
315 { | |
316 int len = 0; // Length of output data | |
317 af_data_t* c = data; // Current working data | |
318 af_data_t* l = af->data; // Local data | |
319 af_resample_t* s = (af_resample_t*)af->setup; | |
320 | |
321 if(AF_OK != RESIZE_LOCAL_BUFFER(af,data)) | |
322 return NULL; | |
323 | |
324 // Run resampling | |
8867
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
325 switch(s->setup & RSMP_MASK){ |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
326 case(RSMP_INT): |
8607 | 327 # define FORMAT_I 1 |
328 if(s->up>s->dn){ | |
329 # define UP | |
28201
4ff973912251
Rename libaf/af_resample.h to libaf/af_resample_template.c, it is used as
diego
parents:
24900
diff
changeset
|
330 # include "af_resample_template.c" |
8607 | 331 # undef UP |
332 } | |
333 else{ | |
334 # define DN | |
28201
4ff973912251
Rename libaf/af_resample.h to libaf/af_resample_template.c, it is used as
diego
parents:
24900
diff
changeset
|
335 # include "af_resample_template.c" |
8607 | 336 # undef DN |
337 } | |
338 break; | |
8867
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
339 case(RSMP_FLOAT): |
8607 | 340 # undef FORMAT_I |
341 # define FORMAT_F 1 | |
342 if(s->up>s->dn){ | |
343 # define UP | |
28201
4ff973912251
Rename libaf/af_resample.h to libaf/af_resample_template.c, it is used as
diego
parents:
24900
diff
changeset
|
344 # include "af_resample_template.c" |
8607 | 345 # undef UP |
346 } | |
347 else{ | |
348 # define DN | |
28201
4ff973912251
Rename libaf/af_resample.h to libaf/af_resample_template.c, it is used as
diego
parents:
24900
diff
changeset
|
349 # include "af_resample_template.c" |
8607 | 350 # undef DN |
351 } | |
352 break; | |
8867
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
353 case(RSMP_LIN): |
8607 | 354 len = linint(c, l, s); |
355 break; | |
356 } | |
7568 | 357 |
358 // Set output data | |
359 c->audio = l->audio; | |
8607 | 360 c->len = len*l->bps; |
7568 | 361 c->rate = l->rate; |
362 | |
363 return c; | |
364 } | |
365 | |
366 // 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
|
367 static int af_open(af_instance_t* af){ |
7568 | 368 af->control=control; |
369 af->uninit=uninit; | |
370 af->play=play; | |
24888 | 371 af->mul=1; |
7568 | 372 af->data=calloc(1,sizeof(af_data_t)); |
373 af->setup=calloc(1,sizeof(af_resample_t)); | |
374 if(af->data == NULL || af->setup == NULL) | |
375 return AF_ERROR; | |
8867
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
376 ((af_resample_t*)af->setup)->setup = RSMP_INT | FREQ_SLOPPY; |
7568 | 377 return AF_OK; |
378 } | |
379 | |
380 // Description of this plugin | |
381 af_info_t af_info_resample = { | |
382 "Sample frequency conversion", | |
383 "resample", | |
384 "Anders", | |
385 "", | |
7615 | 386 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
|
387 af_open |
7568 | 388 }; |
389 |