Mercurial > mplayer.hg
annotate libaf/af_resample.c @ 35078:d698d80bb438
Pass input to "strings" via stdin.
That disables any "clever" parsing that will fail if strings
was not updated to support that particular binary format.
This can easily happen when cross-compiling, but obviously
strings on OSX 10.6 was never update to handle the latest
(64 bit) binary format either and would previously just fail
(the obvious way of falling back to the generic algorithm in
that case would have been too user-friendly I guess...)
author | reimar |
---|---|
date | Wed, 12 Sep 2012 22:01:36 +0000 |
parents | a93891202051 |
children | 6e78455a4b60 |
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" |
34174
a93891202051
Add missing mp_msg.h #includes, remove some unnecessary ones.
diego
parents:
32537
diff
changeset
|
29 #include "mp_msg.h" |
7568 | 30 #include "af.h" |
31 #include "dsp.h" | |
32 | |
33 /* Below definition selects the length of each poly phase component. | |
34 Valid definitions are L8 and L16, where the number denotes the | |
35 length of the filter. This definition affects the computational | |
36 complexity (see play()), the performance (see filter.h) and the | |
28809 | 37 memory usage. The filter length is chosen to 8 if the machine is |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
38 slow and to 16 if the machine is fast and has MMX. |
7568 | 39 */ |
40 | |
28292
d6001126678f
More #ifdef HAVE_MMX etc. missed by earlier search.
reimar
parents:
28229
diff
changeset
|
41 #if !HAVE_MMX // This machine is slow |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
42 #define L8 |
8607 | 43 #else |
44 #define L16 | |
45 #endif | |
7568 | 46 |
28201
4ff973912251
Rename libaf/af_resample.h to libaf/af_resample_template.c, it is used as
diego
parents:
24900
diff
changeset
|
47 #include "af_resample_template.c" |
7568 | 48 |
8607 | 49 // Filtering types |
8867
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
50 #define RSMP_LIN (0<<0) // Linear interpolation |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
51 #define RSMP_INT (1<<0) // 16 bit integer |
8867
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
52 #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
|
53 #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
|
54 |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
55 // 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
|
56 #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
|
57 #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
|
58 #define FREQ_MASK (1<<2) |
7568 | 59 |
8607 | 60 // Accuracy for linear interpolation |
61 #define STEPACCURACY 32 | |
7568 | 62 |
63 // local data | |
64 typedef struct af_resample_s | |
65 { | |
8607 | 66 void* w; // Current filter weights |
67 void** xq; // Circular buffers | |
7580 | 68 uint32_t xi; // Index for circular buffers |
69 uint32_t wi; // Index for w | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
70 uint32_t i; // Number of new samples to put in x queue |
7580 | 71 uint32_t dn; // Down sampling factor |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
72 uint32_t up; // Up sampling factor |
8607 | 73 uint64_t step; // Step size for linear interpolation |
74 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
|
75 int setup; // Setup parameters cmdline or through postcreate |
7568 | 76 } af_resample_t; |
77 | |
8607 | 78 // Fast linear interpolation resample with modest audio quality |
79 static int linint(af_data_t* c,af_data_t* l, af_resample_t* s) | |
7568 | 80 { |
8607 | 81 uint32_t len = 0; // Number of input samples |
82 uint32_t nch = l->nch; // Words pre transfer | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
83 uint64_t step = s->step; |
8607 | 84 int16_t* in16 = ((int16_t*)c->audio); |
85 int16_t* out16 = ((int16_t*)l->audio); | |
86 int32_t* in32 = ((int32_t*)c->audio); | |
87 int32_t* out32 = ((int32_t*)l->audio); | |
88 uint64_t end = ((((uint64_t)c->len)/2LL)<<STEPACCURACY); | |
89 uint64_t pt = s->pt; | |
90 uint16_t tmp; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
91 |
8607 | 92 switch (nch){ |
93 case 1: | |
94 while(pt < end){ | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
95 out16[len++]=in16[pt>>STEPACCURACY]; |
8607 | 96 pt+=step; |
7568 | 97 } |
8607 | 98 s->pt=pt & ((1LL<<STEPACCURACY)-1); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
99 break; |
8607 | 100 case 2: |
101 end/=2; | |
102 while(pt < end){ | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
103 out32[len++]=in32[pt>>STEPACCURACY]; |
8607 | 104 pt+=step; |
105 } | |
106 len=(len<<1); | |
107 s->pt=pt & ((1LL<<STEPACCURACY)-1); | |
108 break; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
109 default: |
8607 | 110 end /=nch; |
111 while(pt < end){ | |
112 tmp=nch; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
113 do { |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
114 tmp--; |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
115 out16[len+tmp]=in16[tmp+(pt>>STEPACCURACY)*nch]; |
8607 | 116 } while (tmp); |
117 len+=nch; | |
118 pt+=step; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
119 } |
8607 | 120 s->pt=pt & ((1LL<<STEPACCURACY)-1); |
7568 | 121 } |
122 return len; | |
123 } | |
124 | |
8867
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
125 /* 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
|
126 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
|
127 { |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
128 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
|
129 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
|
130 float rd = 0; |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
131 |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
132 // Make sure this filter isn't redundant |
8867
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
133 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
|
134 return AF_DETACH; |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
135 /* 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
|
136 rd = abs((float)af->data->rate - (float)data->rate)/(float)data->rate; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
137 if((((s->setup & FREQ_MASK) == FREQ_SLOPPY) && (rd < 0.02) && |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
138 (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
|
139 ((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
|
140 s->setup = (s->setup & ~RSMP_MASK) | RSMP_LIN; |
14245 | 141 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
|
142 af->data->bps = 2; |
29049 | 143 mp_msg(MSGT_AFILTER, MSGL_V, "[resample] Using linear interpolation. \n"); |
8867
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
144 } |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
145 else{ |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
146 /* 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
|
147 use float, otherwise use int */ |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
148 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
|
149 ((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
|
150 s->setup = (s->setup & ~RSMP_MASK) | RSMP_FLOAT; |
14245 | 151 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
|
152 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
|
153 } |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
154 else{ |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
155 s->setup = (s->setup & ~RSMP_MASK) | RSMP_INT; |
14245 | 156 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
|
157 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
|
158 } |
29049 | 159 mp_msg(MSGT_AFILTER, MSGL_V, "[resample] Using %s processing and %s frequecy" |
8867
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
160 " conversion.\n", |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
161 ((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
|
162 ((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
|
163 } |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
164 |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
165 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
|
166 rv = AF_FALSE; |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
167 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
|
168 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
|
169 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
|
170 return rv; |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
171 } |
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
172 |
7568 | 173 // Initialization and runtime control |
174 static int control(struct af_instance_s* af, int cmd, void* arg) | |
175 { | |
176 switch(cmd){ | |
177 case AF_CONTROL_REINIT:{ | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
178 af_resample_t* s = af->setup; |
28813 | 179 af_data_t* n = arg; // New configuration |
7568 | 180 int i,d = 0; |
181 int rv = AF_OK; | |
182 | |
28809 | 183 // Free space for circular buffers |
8867
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){ |
28810
54230bed6a34
Use a single malloc to allocate space for the circular buffers.
reimar
parents:
28809
diff
changeset
|
185 free(s->xq[0]); |
8867
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; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
192 |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
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; | |
29049 | 197 mp_msg(MSGT_AFILTER, MSGL_DBG2, "[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 | |
28303 | 204 d=av_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){ |
28303 | 212 d=av_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 |
28809 | 218 // Create space for circular buffers |
8867
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*)); |
28811
7c0b23a811bd
Use calloc to allocate the af_resample ring buffers, reportedly using
reimar
parents:
28810
diff
changeset
|
220 s->xq[0] = calloc(n->nch, 2*L*af->data->bps); |
28810
54230bed6a34
Use a single malloc to allocate space for the circular buffers.
reimar
parents:
28809
diff
changeset
|
221 for(i=1;i<n->nch;i++) |
54230bed6a34
Use a single malloc to allocate space for the circular buffers.
reimar
parents:
28809
diff
changeset
|
222 s->xq[i] = (uint8_t *)s->xq[i-1] + 2*L*af->data->bps; |
8867
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 |
28809 | 225 // Check if the design needs to be redone |
7568 | 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; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
231 s->up = af->data->rate/d; |
7568 | 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; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
235 |
28809 | 236 // Calculate cutoff frequency for filter |
7568 | 237 fc = 1/(float)(max(s->up,s->dn)); |
28809 | 238 // Allocate space for polyphase filter bank and prototype filter |
7568 | 239 w = malloc(sizeof(float) * s->up *L); |
32537
8fa2f43cb760
Remove most of the NULL pointer check before free all over the code
cboesch
parents:
30633
diff
changeset
|
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 | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
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)){ |
29049 | 246 mp_msg(MSGT_AFILTER, MSGL_ERR, "[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); | |
29049 | 263 mp_msg(MSGT_AFILTER, MSGL_V, "[resample] New filter designed up: %i " |
8607 | 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:{ |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
273 af_resample_t* s = af->setup; |
7998
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); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
278 s->setup = (sloppy?FREQ_SLOPPY:FREQ_EXACT) | |
8867
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 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
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; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
286 case AF_CONTROL_RESAMPLE_RATE | AF_CONTROL_SET: |
7568 | 287 // Reinit must be called after this function has been called |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
288 |
7568 | 289 // Sanity check |
7616 | 290 if(((int*)arg)[0] < 8000 || ((int*)arg)[0] > 192000){ |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
291 mp_msg(MSGT_AFILTER, MSGL_ERR, "[resample] The output sample frequency " |
8607 | 292 "must be between 8kHz and 192kHz. Current value is %i \n", |
293 ((int*)arg)[0]); | |
7568 | 294 return AF_ERROR; |
295 } | |
296 | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
297 af->data->rate=((int*)arg)[0]; |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
298 mp_msg(MSGT_AFILTER, MSGL_V, "[resample] Changing sample rate " |
8607 | 299 "to %iHz\n",af->data->rate); |
7568 | 300 return AF_OK; |
301 } | |
302 return AF_UNKNOWN; | |
303 } | |
304 | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
305 // Deallocate memory |
7568 | 306 static void uninit(struct af_instance_s* af) |
307 { | |
28812
9dd2e47e5a06
Free af->setup and contents in af_resample uninit function.
reimar
parents:
28811
diff
changeset
|
308 af_resample_t *s = af->setup; |
9dd2e47e5a06
Free af->setup and contents in af_resample uninit function.
reimar
parents:
28811
diff
changeset
|
309 if (s) { |
9dd2e47e5a06
Free af->setup and contents in af_resample uninit function.
reimar
parents:
28811
diff
changeset
|
310 if (s->xq) free(s->xq[0]); |
9dd2e47e5a06
Free af->setup and contents in af_resample uninit function.
reimar
parents:
28811
diff
changeset
|
311 free(s->xq); |
9dd2e47e5a06
Free af->setup and contents in af_resample uninit function.
reimar
parents:
28811
diff
changeset
|
312 free(s->w); |
9dd2e47e5a06
Free af->setup and contents in af_resample uninit function.
reimar
parents:
28811
diff
changeset
|
313 free(s); |
9dd2e47e5a06
Free af->setup and contents in af_resample uninit function.
reimar
parents:
28811
diff
changeset
|
314 } |
7568 | 315 if(af->data) |
22179 | 316 free(af->data->audio); |
317 free(af->data); | |
7568 | 318 } |
319 | |
320 // Filter data through filter | |
321 static af_data_t* play(struct af_instance_s* af, af_data_t* data) | |
322 { | |
323 int len = 0; // Length of output data | |
324 af_data_t* c = data; // Current working data | |
325 af_data_t* l = af->data; // Local data | |
28813 | 326 af_resample_t* s = af->setup; |
7568 | 327 |
328 if(AF_OK != RESIZE_LOCAL_BUFFER(af,data)) | |
329 return NULL; | |
330 | |
331 // Run resampling | |
8867
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
332 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
|
333 case(RSMP_INT): |
8607 | 334 # define FORMAT_I 1 |
335 if(s->up>s->dn){ | |
336 # define UP | |
28201
4ff973912251
Rename libaf/af_resample.h to libaf/af_resample_template.c, it is used as
diego
parents:
24900
diff
changeset
|
337 # include "af_resample_template.c" |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
338 # undef UP |
8607 | 339 } |
340 else{ | |
341 # define DN | |
28201
4ff973912251
Rename libaf/af_resample.h to libaf/af_resample_template.c, it is used as
diego
parents:
24900
diff
changeset
|
342 # include "af_resample_template.c" |
8607 | 343 # undef DN |
344 } | |
345 break; | |
8867
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
346 case(RSMP_FLOAT): |
8607 | 347 # undef FORMAT_I |
348 # define FORMAT_F 1 | |
349 if(s->up>s->dn){ | |
350 # define UP | |
28201
4ff973912251
Rename libaf/af_resample.h to libaf/af_resample_template.c, it is used as
diego
parents:
24900
diff
changeset
|
351 # include "af_resample_template.c" |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
352 # undef UP |
8607 | 353 } |
354 else{ | |
355 # define DN | |
28201
4ff973912251
Rename libaf/af_resample.h to libaf/af_resample_template.c, it is used as
diego
parents:
24900
diff
changeset
|
356 # include "af_resample_template.c" |
8607 | 357 # undef DN |
358 } | |
359 break; | |
8867
558f0b1f45ee
New auto config for volume and resample and added support for float flag in configuration
anders
parents:
8711
diff
changeset
|
360 case(RSMP_LIN): |
8607 | 361 len = linint(c, l, s); |
362 break; | |
363 } | |
7568 | 364 |
365 // Set output data | |
366 c->audio = l->audio; | |
8607 | 367 c->len = len*l->bps; |
7568 | 368 c->rate = l->rate; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29049
diff
changeset
|
369 |
7568 | 370 return c; |
371 } | |
372 | |
373 // 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
|
374 static int af_open(af_instance_t* af){ |
7568 | 375 af->control=control; |
376 af->uninit=uninit; | |
377 af->play=play; | |
24888 | 378 af->mul=1; |
7568 | 379 af->data=calloc(1,sizeof(af_data_t)); |
380 af->setup=calloc(1,sizeof(af_resample_t)); | |
381 if(af->data == NULL || af->setup == NULL) | |
382 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
|
383 ((af_resample_t*)af->setup)->setup = RSMP_INT | FREQ_SLOPPY; |
7568 | 384 return AF_OK; |
385 } | |
386 | |
387 // Description of this plugin | |
388 af_info_t af_info_resample = { | |
389 "Sample frequency conversion", | |
390 "resample", | |
391 "Anders", | |
392 "", | |
7615 | 393 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
|
394 af_open |
7568 | 395 }; |