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