Mercurial > mplayer.hg
annotate libaf/af.c @ 24963:0a733c2c577e
Fix possible null-pointer-dereference in stream_fill_buffer().
author | cehoyos |
---|---|
date | Thu, 08 Nov 2007 23:07:19 +0000 |
parents | 9079c9745ff9 |
children | 5a0da5dcadd3 |
rev | line source |
---|---|
7568 | 1 #include <stdio.h> |
2 #include <stdlib.h> | |
3 #include <string.h> | |
4 | |
5 #ifdef HAVE_MALLOC_H | |
6 #include <malloc.h> | |
7 #endif | |
8 | |
9 #include "af.h" | |
10 | |
11 // Static list of filters | |
12 extern af_info_t af_info_dummy; | |
13 extern af_info_t af_info_delay; | |
14 extern af_info_t af_info_channels; | |
15 extern af_info_t af_info_format; | |
16 extern af_info_t af_info_resample; | |
7974
db1f16543379
enable volume filter and fix nonsense default volume (still not usable
rfelker
parents:
7745
diff
changeset
|
17 extern af_info_t af_info_volume; |
8073 | 18 extern af_info_t af_info_equalizer; |
8607 | 19 extern af_info_t af_info_gate; |
20 extern af_info_t af_info_comp; | |
21 extern af_info_t af_info_pan; | |
8678 | 22 extern af_info_t af_info_surround; |
8832
a1578b329cc0
Adding sub-woofer filter, use this filter to add a sub channel to the audio stream
anders
parents:
8711
diff
changeset
|
23 extern af_info_t af_info_sub; |
10892
2167ac4c1d72
Adding filter for exporting audio data to visual effect applications
anders
parents:
8969
diff
changeset
|
24 extern af_info_t af_info_export; |
13550
81e62cbe57d9
reimplementation of the pl_extrastereo and pl_volnorm plugins
alex
parents:
13269
diff
changeset
|
25 extern af_info_t af_info_volnorm; |
81e62cbe57d9
reimplementation of the pl_extrastereo and pl_volnorm plugins
alex
parents:
13269
diff
changeset
|
26 extern af_info_t af_info_extrastereo; |
13713 | 27 extern af_info_t af_info_lavcresample; |
13721 | 28 extern af_info_t af_info_sweep; |
13996 | 29 extern af_info_t af_info_hrtf; |
14217
5b5ebf93ec16
Adds support for LADSPA (Linux Audio Developer's Simple Plugin API) plugins.
ivo
parents:
13996
diff
changeset
|
30 extern af_info_t af_info_ladspa; |
14750
108423cf7b3f
filter for adding a center channel, adding a high pass filter would be nice
alex
parents:
14569
diff
changeset
|
31 extern af_info_t af_info_center; |
18611
1c2f694d5232
Rename sinesupress to sinesuppress, including af_sinesupress.c file rename.
corey
parents:
18470
diff
changeset
|
32 extern af_info_t af_info_sinesuppress; |
18470 | 33 extern af_info_t af_info_karaoke; |
24896 | 34 extern af_info_t af_info_scaletempo; |
7568 | 35 |
10908 | 36 static af_info_t* filter_list[]={ |
37 &af_info_dummy, | |
38 &af_info_delay, | |
39 &af_info_channels, | |
40 &af_info_format, | |
41 &af_info_resample, | |
42 &af_info_volume, | |
43 &af_info_equalizer, | |
44 &af_info_gate, | |
45 &af_info_comp, | |
46 &af_info_pan, | |
47 &af_info_surround, | |
48 &af_info_sub, | |
49 #ifdef HAVE_SYS_MMAN_H | |
50 &af_info_export, | |
51 #endif | |
13550
81e62cbe57d9
reimplementation of the pl_extrastereo and pl_volnorm plugins
alex
parents:
13269
diff
changeset
|
52 &af_info_volnorm, |
81e62cbe57d9
reimplementation of the pl_extrastereo and pl_volnorm plugins
alex
parents:
13269
diff
changeset
|
53 &af_info_extrastereo, |
13713 | 54 #ifdef USE_LIBAVCODEC |
55 &af_info_lavcresample, | |
56 #endif | |
13721 | 57 &af_info_sweep, |
13996 | 58 &af_info_hrtf, |
14217
5b5ebf93ec16
Adds support for LADSPA (Linux Audio Developer's Simple Plugin API) plugins.
ivo
parents:
13996
diff
changeset
|
59 #ifdef HAVE_LADSPA |
5b5ebf93ec16
Adds support for LADSPA (Linux Audio Developer's Simple Plugin API) plugins.
ivo
parents:
13996
diff
changeset
|
60 &af_info_ladspa, |
5b5ebf93ec16
Adds support for LADSPA (Linux Audio Developer's Simple Plugin API) plugins.
ivo
parents:
13996
diff
changeset
|
61 #endif |
14750
108423cf7b3f
filter for adding a center channel, adding a high pass filter would be nice
alex
parents:
14569
diff
changeset
|
62 &af_info_center, |
18611
1c2f694d5232
Rename sinesupress to sinesuppress, including af_sinesupress.c file rename.
corey
parents:
18470
diff
changeset
|
63 &af_info_sinesuppress, |
18470 | 64 &af_info_karaoke, |
24896 | 65 &af_info_scaletempo, |
10908 | 66 NULL |
7568 | 67 }; |
68 | |
8167 | 69 // Message printing |
70 af_msg_cfg_t af_msg_cfg={0,NULL,NULL}; | |
71 | |
72 // CPU speed | |
73 int* af_cpu_speed = NULL; | |
74 | |
7568 | 75 /* Find a filter in the static list of filters using it's name. This |
76 function is used internally */ | |
18967
36db63e8e5d7
makes several libaf functions static coz they are not used outside their source files. Patch by Stefan Huehner, stefan AT huehner-org
reynaldo
parents:
18611
diff
changeset
|
77 static af_info_t* af_find(char*name) |
7568 | 78 { |
79 int i=0; | |
80 while(filter_list[i]){ | |
81 if(!strcmp(filter_list[i]->name,name)) | |
82 return filter_list[i]; | |
83 i++; | |
84 } | |
8167 | 85 af_msg(AF_MSG_ERROR,"Couldn't find audio filter '%s'\n",name); |
7568 | 86 return NULL; |
87 } | |
88 | |
7615 | 89 /* Find filter in the dynamic filter list using it's name This |
90 function is used for finding already initialized filters */ | |
91 af_instance_t* af_get(af_stream_t* s, char* name) | |
92 { | |
93 af_instance_t* af=s->first; | |
94 // Find the filter | |
95 while(af != NULL){ | |
96 if(!strcmp(af->info->name,name)) | |
97 return af; | |
98 af=af->next; | |
99 } | |
100 return NULL; | |
101 } | |
102 | |
7993
ea0680d87f3f
Changing the behavour of the commandline parameter -af to conform with -vop. Adding new commanline parameter -af-adv for advanced af options. Adding changes to volume control to support commandline parameters.
anders
parents:
7974
diff
changeset
|
103 /*/ Function for creating a new filter of type name. The name may |
ea0680d87f3f
Changing the behavour of the commandline parameter -af to conform with -vop. Adding new commanline parameter -af-adv for advanced af options. Adding changes to volume control to support commandline parameters.
anders
parents:
7974
diff
changeset
|
104 contain the commandline parameters for the filter */ |
18967
36db63e8e5d7
makes several libaf functions static coz they are not used outside their source files. Patch by Stefan Huehner, stefan AT huehner-org
reynaldo
parents:
18611
diff
changeset
|
105 static af_instance_t* af_create(af_stream_t* s, char* name) |
7568 | 106 { |
7993
ea0680d87f3f
Changing the behavour of the commandline parameter -af to conform with -vop. Adding new commanline parameter -af-adv for advanced af options. Adding changes to volume control to support commandline parameters.
anders
parents:
7974
diff
changeset
|
107 char* cmdline = name; |
7998
d48a06d07afb
Adding commandline options for filters and fixing stupid bug in cfg
anders
parents:
7993
diff
changeset
|
108 |
7568 | 109 // Allocate space for the new filter and reset all pointers |
110 af_instance_t* new=malloc(sizeof(af_instance_t)); | |
111 if(!new){ | |
8607 | 112 af_msg(AF_MSG_ERROR,"[libaf] Could not allocate memory\n"); |
17780
16c347e53841
fix memory leak when filter with given name does not exist.
reimar
parents:
16815
diff
changeset
|
113 goto err_out; |
7568 | 114 } |
115 memset(new,0,sizeof(af_instance_t)); | |
116 | |
7993
ea0680d87f3f
Changing the behavour of the commandline parameter -af to conform with -vop. Adding new commanline parameter -af-adv for advanced af options. Adding changes to volume control to support commandline parameters.
anders
parents:
7974
diff
changeset
|
117 // Check for commandline parameters |
12668
ce6ab8cb8597
Send a command throught the filter chain until some item returns AF_OK. Patch by Reimar Doeffinger
alex
parents:
11859
diff
changeset
|
118 strsep(&cmdline, "="); |
7993
ea0680d87f3f
Changing the behavour of the commandline parameter -af to conform with -vop. Adding new commanline parameter -af-adv for advanced af options. Adding changes to volume control to support commandline parameters.
anders
parents:
7974
diff
changeset
|
119 |
7568 | 120 // Find filter from name |
7615 | 121 if(NULL == (new->info=af_find(name))) |
17780
16c347e53841
fix memory leak when filter with given name does not exist.
reimar
parents:
16815
diff
changeset
|
122 goto err_out; |
7615 | 123 |
7993
ea0680d87f3f
Changing the behavour of the commandline parameter -af to conform with -vop. Adding new commanline parameter -af-adv for advanced af options. Adding changes to volume control to support commandline parameters.
anders
parents:
7974
diff
changeset
|
124 /* Make sure that the filter is not already in the list if it is |
ea0680d87f3f
Changing the behavour of the commandline parameter -af to conform with -vop. Adding new commanline parameter -af-adv for advanced af options. Adding changes to volume control to support commandline parameters.
anders
parents:
7974
diff
changeset
|
125 non-reentrant */ |
7615 | 126 if(new->info->flags & AF_FLAGS_NOT_REENTRANT){ |
127 if(af_get(s,name)){ | |
8607 | 128 af_msg(AF_MSG_ERROR,"[libaf] There can only be one instance of" |
129 " the filter '%s' in each stream\n",name); | |
17780
16c347e53841
fix memory leak when filter with given name does not exist.
reimar
parents:
16815
diff
changeset
|
130 goto err_out; |
7615 | 131 } |
132 } | |
7993
ea0680d87f3f
Changing the behavour of the commandline parameter -af to conform with -vop. Adding new commanline parameter -af-adv for advanced af options. Adding changes to volume control to support commandline parameters.
anders
parents:
7974
diff
changeset
|
133 |
8607 | 134 af_msg(AF_MSG_VERBOSE,"[libaf] Adding filter %s \n",name); |
7993
ea0680d87f3f
Changing the behavour of the commandline parameter -af to conform with -vop. Adding new commanline parameter -af-adv for advanced af options. Adding changes to volume control to support commandline parameters.
anders
parents:
7974
diff
changeset
|
135 |
7568 | 136 // Initialize the new filter |
7745
1d3a3dc1f488
Adding volume control and moving control() call parameters to a seperate file
anders
parents:
7665
diff
changeset
|
137 if(AF_OK == new->info->open(new) && |
7993
ea0680d87f3f
Changing the behavour of the commandline parameter -af to conform with -vop. Adding new commanline parameter -af-adv for advanced af options. Adding changes to volume control to support commandline parameters.
anders
parents:
7974
diff
changeset
|
138 AF_ERROR < new->control(new,AF_CONTROL_POST_CREATE,&s->cfg)){ |
ea0680d87f3f
Changing the behavour of the commandline parameter -af to conform with -vop. Adding new commanline parameter -af-adv for advanced af options. Adding changes to volume control to support commandline parameters.
anders
parents:
7974
diff
changeset
|
139 if(cmdline){ |
ea0680d87f3f
Changing the behavour of the commandline parameter -af to conform with -vop. Adding new commanline parameter -af-adv for advanced af options. Adding changes to volume control to support commandline parameters.
anders
parents:
7974
diff
changeset
|
140 if(AF_ERROR<new->control(new,AF_CONTROL_COMMAND_LINE,cmdline)) |
ea0680d87f3f
Changing the behavour of the commandline parameter -af to conform with -vop. Adding new commanline parameter -af-adv for advanced af options. Adding changes to volume control to support commandline parameters.
anders
parents:
7974
diff
changeset
|
141 return new; |
ea0680d87f3f
Changing the behavour of the commandline parameter -af to conform with -vop. Adding new commanline parameter -af-adv for advanced af options. Adding changes to volume control to support commandline parameters.
anders
parents:
7974
diff
changeset
|
142 } |
ea0680d87f3f
Changing the behavour of the commandline parameter -af to conform with -vop. Adding new commanline parameter -af-adv for advanced af options. Adding changes to volume control to support commandline parameters.
anders
parents:
7974
diff
changeset
|
143 else |
ea0680d87f3f
Changing the behavour of the commandline parameter -af to conform with -vop. Adding new commanline parameter -af-adv for advanced af options. Adding changes to volume control to support commandline parameters.
anders
parents:
7974
diff
changeset
|
144 return new; |
ea0680d87f3f
Changing the behavour of the commandline parameter -af to conform with -vop. Adding new commanline parameter -af-adv for advanced af options. Adding changes to volume control to support commandline parameters.
anders
parents:
7974
diff
changeset
|
145 } |
7745
1d3a3dc1f488
Adding volume control and moving control() call parameters to a seperate file
anders
parents:
7665
diff
changeset
|
146 |
17780
16c347e53841
fix memory leak when filter with given name does not exist.
reimar
parents:
16815
diff
changeset
|
147 err_out: |
7568 | 148 free(new); |
8607 | 149 af_msg(AF_MSG_ERROR,"[libaf] Couldn't create or open audio filter '%s'\n", |
150 name); | |
7568 | 151 return NULL; |
152 } | |
153 | |
154 /* Create and insert a new filter of type name before the filter in the | |
155 argument. This function can be called during runtime, the return | |
156 value is the new filter */ | |
18967
36db63e8e5d7
makes several libaf functions static coz they are not used outside their source files. Patch by Stefan Huehner, stefan AT huehner-org
reynaldo
parents:
18611
diff
changeset
|
157 static af_instance_t* af_prepend(af_stream_t* s, af_instance_t* af, char* name) |
7568 | 158 { |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
159 // Create the new filter and make sure it is OK |
7615 | 160 af_instance_t* new=af_create(s,name); |
7568 | 161 if(!new) |
162 return NULL; | |
163 // Update pointers | |
164 new->next=af; | |
165 if(af){ | |
166 new->prev=af->prev; | |
167 af->prev=new; | |
168 } | |
169 else | |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
170 s->last=new; |
7568 | 171 if(new->prev) |
172 new->prev->next=new; | |
173 else | |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
174 s->first=new; |
7568 | 175 return new; |
176 } | |
177 | |
178 /* Create and insert a new filter of type name after the filter in the | |
179 argument. This function can be called during runtime, the return | |
180 value is the new filter */ | |
18967
36db63e8e5d7
makes several libaf functions static coz they are not used outside their source files. Patch by Stefan Huehner, stefan AT huehner-org
reynaldo
parents:
18611
diff
changeset
|
181 static af_instance_t* af_append(af_stream_t* s, af_instance_t* af, char* name) |
7568 | 182 { |
183 // Create the new filter and make sure it is OK | |
7615 | 184 af_instance_t* new=af_create(s,name); |
7568 | 185 if(!new) |
186 return NULL; | |
187 // Update pointers | |
188 new->prev=af; | |
189 if(af){ | |
190 new->next=af->next; | |
191 af->next=new; | |
192 } | |
193 else | |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
194 s->first=new; |
7568 | 195 if(new->next) |
196 new->next->prev=new; | |
197 else | |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
198 s->last=new; |
7568 | 199 return new; |
200 } | |
201 | |
202 // Uninit and remove the filter "af" | |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
203 void af_remove(af_stream_t* s, af_instance_t* af) |
7568 | 204 { |
205 if(!af) return; | |
206 | |
8607 | 207 // Print friendly message |
208 af_msg(AF_MSG_VERBOSE,"[libaf] Removing filter %s \n",af->info->name); | |
209 | |
7745
1d3a3dc1f488
Adding volume control and moving control() call parameters to a seperate file
anders
parents:
7665
diff
changeset
|
210 // Notify filter before changing anything |
1d3a3dc1f488
Adding volume control and moving control() call parameters to a seperate file
anders
parents:
7665
diff
changeset
|
211 af->control(af,AF_CONTROL_PRE_DESTROY,0); |
1d3a3dc1f488
Adding volume control and moving control() call parameters to a seperate file
anders
parents:
7665
diff
changeset
|
212 |
7568 | 213 // Detach pointers |
214 if(af->prev) | |
215 af->prev->next=af->next; | |
216 else | |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
217 s->first=af->next; |
7568 | 218 if(af->next) |
219 af->next->prev=af->prev; | |
220 else | |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
221 s->last=af->prev; |
7568 | 222 |
223 // Uninitialize af and free memory | |
224 af->uninit(af); | |
225 free(af); | |
226 } | |
227 | |
7649
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
228 /* Reinitializes all filters downstream from the filter given in the |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
229 argument the return value is AF_OK if success and AF_ERROR if |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
230 failure */ |
18967
36db63e8e5d7
makes several libaf functions static coz they are not used outside their source files. Patch by Stefan Huehner, stefan AT huehner-org
reynaldo
parents:
18611
diff
changeset
|
231 static int af_reinit(af_stream_t* s, af_instance_t* af) |
7568 | 232 { |
233 do{ | |
234 af_data_t in; // Format of the input to current filter | |
235 int rv=0; // Return value | |
236 | |
15191
7eab9c86ae19
change list traversal so the loop begins at the first filter after removing
henry
parents:
14818
diff
changeset
|
237 // Check if there are any filters left in the list |
7eab9c86ae19
change list traversal so the loop begins at the first filter after removing
henry
parents:
14818
diff
changeset
|
238 if(NULL == af){ |
7eab9c86ae19
change list traversal so the loop begins at the first filter after removing
henry
parents:
14818
diff
changeset
|
239 if(!(af=af_append(s,s->first,"dummy"))) |
7eab9c86ae19
change list traversal so the loop begins at the first filter after removing
henry
parents:
14818
diff
changeset
|
240 return AF_UNKNOWN; |
7eab9c86ae19
change list traversal so the loop begins at the first filter after removing
henry
parents:
14818
diff
changeset
|
241 else |
7eab9c86ae19
change list traversal so the loop begins at the first filter after removing
henry
parents:
14818
diff
changeset
|
242 return AF_ERROR; |
7eab9c86ae19
change list traversal so the loop begins at the first filter after removing
henry
parents:
14818
diff
changeset
|
243 } |
7eab9c86ae19
change list traversal so the loop begins at the first filter after removing
henry
parents:
14818
diff
changeset
|
244 |
7568 | 245 // Check if this is the first filter |
246 if(!af->prev) | |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
247 memcpy(&in,&(s->input),sizeof(af_data_t)); |
7568 | 248 else |
249 memcpy(&in,af->prev->data,sizeof(af_data_t)); | |
250 // Reset just in case... | |
251 in.audio=NULL; | |
252 in.len=0; | |
253 | |
254 rv = af->control(af,AF_CONTROL_REINIT,&in); | |
255 switch(rv){ | |
256 case AF_OK: | |
15191
7eab9c86ae19
change list traversal so the loop begins at the first filter after removing
henry
parents:
14818
diff
changeset
|
257 af = af->next; |
7568 | 258 break; |
259 case AF_FALSE:{ // Configuration filter is needed | |
8167 | 260 // Do auto insertion only if force is not specified |
261 if((AF_INIT_TYPE_MASK & s->cfg.force) != AF_INIT_FORCE){ | |
262 af_instance_t* new = NULL; | |
263 // Insert channels filter | |
264 if((af->prev?af->prev->data->nch:s->input.nch) != in.nch){ | |
265 // Create channels filter | |
266 if(NULL == (new = af_prepend(s,af,"channels"))) | |
267 return AF_ERROR; | |
268 // Set number of output channels | |
269 if(AF_OK != (rv = new->control(new,AF_CONTROL_CHANNELS,&in.nch))) | |
270 return rv; | |
271 // Initialize channels filter | |
272 if(!new->prev) | |
273 memcpy(&in,&(s->input),sizeof(af_data_t)); | |
274 else | |
275 memcpy(&in,new->prev->data,sizeof(af_data_t)); | |
276 if(AF_OK != (rv = new->control(new,AF_CONTROL_REINIT,&in))) | |
277 return rv; | |
278 } | |
279 // Insert format filter | |
14818
663c1ea5f595
finally remove the refences to bps outside libaf. also simplification of some messages and removed redundants
alex
parents:
14750
diff
changeset
|
280 if((af->prev?af->prev->data->format:s->input.format) != in.format){ |
8167 | 281 // Create format filter |
282 if(NULL == (new = af_prepend(s,af,"format"))) | |
283 return AF_ERROR; | |
8607 | 284 // Set output bits per sample |
14335
8380694ba14f
af_bits2fmt and af_str2fmt_short, also removed the extra FORMAT_BPS control in format.c
alex
parents:
14326
diff
changeset
|
285 in.format |= af_bits2fmt(in.bps*8); |
8380694ba14f
af_bits2fmt and af_str2fmt_short, also removed the extra FORMAT_BPS control in format.c
alex
parents:
14326
diff
changeset
|
286 if(AF_OK != (rv = new->control(new,AF_CONTROL_FORMAT_FMT,&in.format))) |
8167 | 287 return rv; |
288 // Initialize format filter | |
289 if(!new->prev) | |
290 memcpy(&in,&(s->input),sizeof(af_data_t)); | |
291 else | |
292 memcpy(&in,new->prev->data,sizeof(af_data_t)); | |
293 if(AF_OK != (rv = new->control(new,AF_CONTROL_REINIT,&in))) | |
294 return rv; | |
295 } | |
8607 | 296 if(!new){ // Should _never_ happen |
297 af_msg(AF_MSG_ERROR,"[libaf] Unable to correct audio format. " | |
298 "This error should never uccur, please send bugreport.\n"); | |
7568 | 299 return AF_ERROR; |
8607 | 300 } |
15191
7eab9c86ae19
change list traversal so the loop begins at the first filter after removing
henry
parents:
14818
diff
changeset
|
301 af=new->next; |
7568 | 302 } |
16072 | 303 else { |
304 af_msg(AF_MSG_ERROR, "[libaf] Automatic filter insertion disabled " | |
305 "but formats do not match. Giving up.\n"); | |
306 return AF_ERROR; | |
307 } | |
7568 | 308 break; |
309 } | |
310 case AF_DETACH:{ // Filter is redundant and wants to be unloaded | |
8167 | 311 // Do auto remove only if force is not specified |
312 if((AF_INIT_TYPE_MASK & s->cfg.force) != AF_INIT_FORCE){ | |
313 af_instance_t* aft=af->prev; | |
314 af_remove(s,af); | |
315 if(aft) | |
15191
7eab9c86ae19
change list traversal so the loop begins at the first filter after removing
henry
parents:
14818
diff
changeset
|
316 af=aft->next; |
8167 | 317 else |
318 af=s->first; // Restart configuration | |
319 } | |
7568 | 320 break; |
321 } | |
322 default: | |
8607 | 323 af_msg(AF_MSG_ERROR,"[libaf] Reinitialization did not work, audio" |
324 " filter '%s' returned error code %i\n",af->info->name,rv); | |
7568 | 325 return AF_ERROR; |
326 } | |
327 }while(af); | |
328 return AF_OK; | |
329 } | |
330 | |
331 // Uninit and remove all filters | |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
332 void af_uninit(af_stream_t* s) |
7568 | 333 { |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
334 while(s->first) |
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
335 af_remove(s,s->first); |
7568 | 336 } |
337 | |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
338 /* Initialize the stream "s". This function creates a new filter list |
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
339 if necessary according to the values set in input and output. Input |
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
340 and output should contain the format of the current movie and the |
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
341 formate of the preferred output respectively. The function is |
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
342 reentrant i.e. if called with an already initialized stream the |
15811
9b4bbb6098f6
make -srate work again, unify audio filter init and preinit.
reimar
parents:
15791
diff
changeset
|
343 stream will be reinitialized. |
9b4bbb6098f6
make -srate work again, unify audio filter init and preinit.
reimar
parents:
15791
diff
changeset
|
344 If one of the prefered output parameters is 0 the one that needs |
9b4bbb6098f6
make -srate work again, unify audio filter init and preinit.
reimar
parents:
15791
diff
changeset
|
345 no conversion is used (i.e. the output format in the last filter). |
9b4bbb6098f6
make -srate work again, unify audio filter init and preinit.
reimar
parents:
15791
diff
changeset
|
346 The return value is 0 if success and -1 if failure */ |
9b4bbb6098f6
make -srate work again, unify audio filter init and preinit.
reimar
parents:
15791
diff
changeset
|
347 int af_init(af_stream_t* s) |
7568 | 348 { |
349 int i=0; | |
350 | |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
351 // Sanity check |
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
352 if(!s) return -1; |
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
353 |
7568 | 354 // Precaution in case caller is misbehaving |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
355 s->input.audio = s->output.audio = NULL; |
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
356 s->input.len = s->output.len = 0; |
7568 | 357 |
358 // Figure out how fast the machine is | |
8167 | 359 if(AF_INIT_AUTO == (AF_INIT_TYPE_MASK & s->cfg.force)) |
360 s->cfg.force = (s->cfg.force & ~AF_INIT_TYPE_MASK) | AF_INIT_TYPE; | |
7568 | 361 |
362 // Check if this is the first call | |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
363 if(!s->first){ |
7568 | 364 // Add all filters in the list (if there are any) |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
365 if(!s->cfg.list){ // To make automatic format conversion work |
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
366 if(!af_append(s,s->first,"dummy")) |
7568 | 367 return -1; |
368 } | |
369 else{ | |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
370 while(s->cfg.list[i]){ |
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
371 if(!af_append(s,s->last,s->cfg.list[i++])) |
7568 | 372 return -1; |
373 } | |
374 } | |
375 } | |
8607 | 376 |
7568 | 377 // Init filters |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
378 if(AF_OK != af_reinit(s,s->first)) |
7568 | 379 return -1; |
380 | |
15312
0313ef8b0730
Prevent segfault when filter chain is empty (e.g. because all
reimar
parents:
15191
diff
changeset
|
381 // make sure the chain is not empty and valid (e.g. because of AF_DETACH) |
0313ef8b0730
Prevent segfault when filter chain is empty (e.g. because all
reimar
parents:
15191
diff
changeset
|
382 if (!s->first) |
0313ef8b0730
Prevent segfault when filter chain is empty (e.g. because all
reimar
parents:
15191
diff
changeset
|
383 if (!af_append(s,s->first,"dummy") || AF_OK != af_reinit(s,s->first)) |
0313ef8b0730
Prevent segfault when filter chain is empty (e.g. because all
reimar
parents:
15191
diff
changeset
|
384 return -1; |
0313ef8b0730
Prevent segfault when filter chain is empty (e.g. because all
reimar
parents:
15191
diff
changeset
|
385 |
7568 | 386 // Check output format |
7745
1d3a3dc1f488
Adding volume control and moving control() call parameters to a seperate file
anders
parents:
7665
diff
changeset
|
387 if((AF_INIT_TYPE_MASK & s->cfg.force) != AF_INIT_FORCE){ |
7568 | 388 af_instance_t* af = NULL; // New filter |
389 // Check output frequency if not OK fix with resample | |
15811
9b4bbb6098f6
make -srate work again, unify audio filter init and preinit.
reimar
parents:
15791
diff
changeset
|
390 if(s->output.rate && s->last->data->rate!=s->output.rate){ |
14326
9261d7dcf5e7
Use lavcresample only when libavcodec is compiled in.
reimar
parents:
14292
diff
changeset
|
391 // try to find a filter that can change samplrate |
9261d7dcf5e7
Use lavcresample only when libavcodec is compiled in.
reimar
parents:
14292
diff
changeset
|
392 af = af_control_any_rev(s, AF_CONTROL_RESAMPLE_RATE | AF_CONTROL_SET, |
9261d7dcf5e7
Use lavcresample only when libavcodec is compiled in.
reimar
parents:
14292
diff
changeset
|
393 &(s->output.rate)); |
9261d7dcf5e7
Use lavcresample only when libavcodec is compiled in.
reimar
parents:
14292
diff
changeset
|
394 if (!af) { |
9261d7dcf5e7
Use lavcresample only when libavcodec is compiled in.
reimar
parents:
14292
diff
changeset
|
395 char *resampler = "resample"; |
9261d7dcf5e7
Use lavcresample only when libavcodec is compiled in.
reimar
parents:
14292
diff
changeset
|
396 #ifdef USE_LIBAVCODEC |
9261d7dcf5e7
Use lavcresample only when libavcodec is compiled in.
reimar
parents:
14292
diff
changeset
|
397 if ((AF_INIT_TYPE_MASK & s->cfg.force) == AF_INIT_SLOW) |
9261d7dcf5e7
Use lavcresample only when libavcodec is compiled in.
reimar
parents:
14292
diff
changeset
|
398 resampler = "lavcresample"; |
9261d7dcf5e7
Use lavcresample only when libavcodec is compiled in.
reimar
parents:
14292
diff
changeset
|
399 #endif |
7745
1d3a3dc1f488
Adding volume control and moving control() call parameters to a seperate file
anders
parents:
7665
diff
changeset
|
400 if((AF_INIT_TYPE_MASK & s->cfg.force) == AF_INIT_SLOW){ |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
401 if(!strcmp(s->first->info->name,"format")) |
14326
9261d7dcf5e7
Use lavcresample only when libavcodec is compiled in.
reimar
parents:
14292
diff
changeset
|
402 af = af_append(s,s->first,resampler); |
7568 | 403 else |
14326
9261d7dcf5e7
Use lavcresample only when libavcodec is compiled in.
reimar
parents:
14292
diff
changeset
|
404 af = af_prepend(s,s->first,resampler); |
7568 | 405 } |
406 else{ | |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
407 if(!strcmp(s->last->info->name,"format")) |
14326
9261d7dcf5e7
Use lavcresample only when libavcodec is compiled in.
reimar
parents:
14292
diff
changeset
|
408 af = af_prepend(s,s->last,resampler); |
7568 | 409 else |
14326
9261d7dcf5e7
Use lavcresample only when libavcodec is compiled in.
reimar
parents:
14292
diff
changeset
|
410 af = af_append(s,s->last,resampler); |
7568 | 411 } |
412 // Init the new filter | |
15191
7eab9c86ae19
change list traversal so the loop begins at the first filter after removing
henry
parents:
14818
diff
changeset
|
413 if(!af || (AF_OK != af->control(af,AF_CONTROL_RESAMPLE_RATE | AF_CONTROL_SET, |
8607 | 414 &(s->output.rate)))) |
7568 | 415 return -1; |
11859
b8bee4f4b8bb
if the user wants fast, use fast code! otherwise the user has to put
rfelker
parents:
10908
diff
changeset
|
416 // Use lin int if the user wants fast |
b8bee4f4b8bb
if the user wants fast, use fast code! otherwise the user has to put
rfelker
parents:
10908
diff
changeset
|
417 if ((AF_INIT_TYPE_MASK & s->cfg.force) == AF_INIT_FAST) { |
b8bee4f4b8bb
if the user wants fast, use fast code! otherwise the user has to put
rfelker
parents:
10908
diff
changeset
|
418 char args[32]; |
14326
9261d7dcf5e7
Use lavcresample only when libavcodec is compiled in.
reimar
parents:
14292
diff
changeset
|
419 sprintf(args, "%d", s->output.rate); |
9261d7dcf5e7
Use lavcresample only when libavcodec is compiled in.
reimar
parents:
14292
diff
changeset
|
420 #ifdef USE_LIBAVCODEC |
9261d7dcf5e7
Use lavcresample only when libavcodec is compiled in.
reimar
parents:
14292
diff
changeset
|
421 if (strcmp(resampler, "lavcresample") == 0) |
9261d7dcf5e7
Use lavcresample only when libavcodec is compiled in.
reimar
parents:
14292
diff
changeset
|
422 strcat(args, ":1"); |
9261d7dcf5e7
Use lavcresample only when libavcodec is compiled in.
reimar
parents:
14292
diff
changeset
|
423 else |
9261d7dcf5e7
Use lavcresample only when libavcodec is compiled in.
reimar
parents:
14292
diff
changeset
|
424 #endif |
9261d7dcf5e7
Use lavcresample only when libavcodec is compiled in.
reimar
parents:
14292
diff
changeset
|
425 strcat(args, ":0:0"); |
11859
b8bee4f4b8bb
if the user wants fast, use fast code! otherwise the user has to put
rfelker
parents:
10908
diff
changeset
|
426 af->control(af, AF_CONTROL_COMMAND_LINE, args); |
b8bee4f4b8bb
if the user wants fast, use fast code! otherwise the user has to put
rfelker
parents:
10908
diff
changeset
|
427 } |
14326
9261d7dcf5e7
Use lavcresample only when libavcodec is compiled in.
reimar
parents:
14292
diff
changeset
|
428 } |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
429 if(AF_OK != af_reinit(s,af)) |
7568 | 430 return -1; |
431 } | |
432 | |
433 // Check number of output channels fix if not OK | |
434 // If needed always inserted last -> easy to screw up other filters | |
15811
9b4bbb6098f6
make -srate work again, unify audio filter init and preinit.
reimar
parents:
15791
diff
changeset
|
435 if(s->output.nch && s->last->data->nch!=s->output.nch){ |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
436 if(!strcmp(s->last->info->name,"format")) |
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
437 af = af_prepend(s,s->last,"channels"); |
7568 | 438 else |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
439 af = af_append(s,s->last,"channels"); |
7568 | 440 // Init the new filter |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
441 if(!af || (AF_OK != af->control(af,AF_CONTROL_CHANNELS,&(s->output.nch)))) |
7568 | 442 return -1; |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
443 if(AF_OK != af_reinit(s,af)) |
7568 | 444 return -1; |
445 } | |
446 | |
447 // Check output format fix if not OK | |
20771
1e78e35b6c7b
Change value used to indicate "unknown audio format" from 0 to -1.
uau
parents:
19883
diff
changeset
|
448 if(s->output.format != AF_FORMAT_UNKNOWN && |
1e78e35b6c7b
Change value used to indicate "unknown audio format" from 0 to -1.
uau
parents:
19883
diff
changeset
|
449 s->last->data->format != s->output.format){ |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
450 if(strcmp(s->last->info->name,"format")) |
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
451 af = af_append(s,s->last,"format"); |
7568 | 452 else |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
453 af = s->last; |
7568 | 454 // Init the new filter |
14335
8380694ba14f
af_bits2fmt and af_str2fmt_short, also removed the extra FORMAT_BPS control in format.c
alex
parents:
14326
diff
changeset
|
455 s->output.format |= af_bits2fmt(s->output.bps*8); |
8380694ba14f
af_bits2fmt and af_str2fmt_short, also removed the extra FORMAT_BPS control in format.c
alex
parents:
14326
diff
changeset
|
456 if(!af || (AF_OK != af->control(af,AF_CONTROL_FORMAT_FMT,&(s->output.format)))) |
7568 | 457 return -1; |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
458 if(AF_OK != af_reinit(s,af)) |
7568 | 459 return -1; |
460 } | |
461 | |
462 // Re init again just in case | |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
463 if(AF_OK != af_reinit(s,s->first)) |
7568 | 464 return -1; |
465 | |
20771
1e78e35b6c7b
Change value used to indicate "unknown audio format" from 0 to -1.
uau
parents:
19883
diff
changeset
|
466 if (s->output.format == AF_FORMAT_UNKNOWN) |
1e78e35b6c7b
Change value used to indicate "unknown audio format" from 0 to -1.
uau
parents:
19883
diff
changeset
|
467 s->output.format = s->last->data->format; |
15811
9b4bbb6098f6
make -srate work again, unify audio filter init and preinit.
reimar
parents:
15791
diff
changeset
|
468 if (!s->output.nch) s->output.nch = s->last->data->nch; |
9b4bbb6098f6
make -srate work again, unify audio filter init and preinit.
reimar
parents:
15791
diff
changeset
|
469 if (!s->output.rate) s->output.rate = s->last->data->rate; |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
470 if((s->last->data->format != s->output.format) || |
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
471 (s->last->data->nch != s->output.nch) || |
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
472 (s->last->data->rate != s->output.rate)) { |
7568 | 473 // Something is stuffed audio out will not work |
8607 | 474 af_msg(AF_MSG_ERROR,"[libaf] Unable to setup filter system can not" |
475 " meet sound-card demands, please send bugreport. \n"); | |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
476 af_uninit(s); |
7568 | 477 return -1; |
478 } | |
479 } | |
480 return 0; | |
481 } | |
482 | |
7649
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
483 /* Add filter during execution. This function adds the filter "name" |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
484 to the stream s. The filter will be inserted somewhere nice in the |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
485 list of filters. The return value is a pointer to the new filter, |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
486 If the filter couldn't be added the return value is NULL. */ |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
487 af_instance_t* af_add(af_stream_t* s, char* name){ |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
488 af_instance_t* new; |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
489 // Sanity check |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
490 if(!s || !s->first || !name) |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
491 return NULL; |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
492 // Insert the filter somwhere nice |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
493 if(!strcmp(s->first->info->name,"format")) |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
494 new = af_append(s, s->first, name); |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
495 else |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
496 new = af_prepend(s, s->first, name); |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
497 if(!new) |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
498 return NULL; |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
499 |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
500 // Reinitalize the filter list |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
501 if(AF_OK != af_reinit(s, s->first)){ |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
502 free(new); |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
503 return NULL; |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
504 } |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
505 return new; |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
506 } |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
507 |
7568 | 508 // Filter data chunk through the filters in the list |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
509 af_data_t* af_play(af_stream_t* s, af_data_t* data) |
7568 | 510 { |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
511 af_instance_t* af=s->first; |
7568 | 512 // Iterate through all filters |
513 do{ | |
16815
78c84594247b
semi-hack: avoid passing 0-length blocks to audio filters.
reimar
parents:
16627
diff
changeset
|
514 if (data->len <= 0) break; |
7568 | 515 data=af->play(af,data); |
516 af=af->next; | |
517 }while(af); | |
518 return data; | |
519 } | |
520 | |
24888 | 521 /* Calculate the minimum output buffer size for given input data d |
522 * when using the RESIZE_LOCAL_BUFFER macro. The +t+1 part ensures the | |
523 * value is >= len*mul rounded upwards to whole samples even if the | |
524 * double 'mul' is inexact. */ | |
525 int af_lencalc(double mul, af_data_t* d) | |
526 { | |
527 int t = d->bps * d->nch; | |
528 return d->len * mul + t + 1; | |
7568 | 529 } |
530 | |
24892 | 531 // Calculate average ratio of filter output size to input size |
532 double af_calc_filter_multiplier(af_stream_t* s) | |
7598
48f8c731efb5
Adding function for estimating required buffer length
anders
parents:
7590
diff
changeset
|
533 { |
48f8c731efb5
Adding function for estimating required buffer length
anders
parents:
7590
diff
changeset
|
534 af_instance_t* af=s->first; |
24888 | 535 double mul = 1; |
7598
48f8c731efb5
Adding function for estimating required buffer length
anders
parents:
7590
diff
changeset
|
536 // Iterate through all filters and calculate total multiplication factor |
48f8c731efb5
Adding function for estimating required buffer length
anders
parents:
7590
diff
changeset
|
537 do{ |
24888 | 538 mul *= af->mul; |
539 af=af->next; | |
7598
48f8c731efb5
Adding function for estimating required buffer length
anders
parents:
7590
diff
changeset
|
540 }while(af); |
8607 | 541 |
24892 | 542 return mul; |
7598
48f8c731efb5
Adding function for estimating required buffer length
anders
parents:
7590
diff
changeset
|
543 } |
48f8c731efb5
Adding function for estimating required buffer length
anders
parents:
7590
diff
changeset
|
544 |
24900 | 545 /* Calculate the total delay [bytes output] caused by the filters */ |
7665
fbd5445cc853
Adding function for calculating the delay caused by the filters
anders
parents:
7649
diff
changeset
|
546 double af_calc_delay(af_stream_t* s) |
fbd5445cc853
Adding function for calculating the delay caused by the filters
anders
parents:
7649
diff
changeset
|
547 { |
fbd5445cc853
Adding function for calculating the delay caused by the filters
anders
parents:
7649
diff
changeset
|
548 af_instance_t* af=s->first; |
fbd5445cc853
Adding function for calculating the delay caused by the filters
anders
parents:
7649
diff
changeset
|
549 register double delay = 0.0; |
fbd5445cc853
Adding function for calculating the delay caused by the filters
anders
parents:
7649
diff
changeset
|
550 // Iterate through all filters |
fbd5445cc853
Adding function for calculating the delay caused by the filters
anders
parents:
7649
diff
changeset
|
551 while(af){ |
fbd5445cc853
Adding function for calculating the delay caused by the filters
anders
parents:
7649
diff
changeset
|
552 delay += af->delay; |
24900 | 553 delay *= af->mul; |
7665
fbd5445cc853
Adding function for calculating the delay caused by the filters
anders
parents:
7649
diff
changeset
|
554 af=af->next; |
fbd5445cc853
Adding function for calculating the delay caused by the filters
anders
parents:
7649
diff
changeset
|
555 } |
fbd5445cc853
Adding function for calculating the delay caused by the filters
anders
parents:
7649
diff
changeset
|
556 return delay; |
fbd5445cc853
Adding function for calculating the delay caused by the filters
anders
parents:
7649
diff
changeset
|
557 } |
fbd5445cc853
Adding function for calculating the delay caused by the filters
anders
parents:
7649
diff
changeset
|
558 |
7568 | 559 /* Helper function called by the macro with the same name this |
560 function should not be called directly */ | |
24890 | 561 int af_resize_local_buffer(af_instance_t* af, af_data_t* data) |
7568 | 562 { |
563 // Calculate new length | |
7589 | 564 register int len = af_lencalc(af->mul,data); |
8607 | 565 af_msg(AF_MSG_VERBOSE,"[libaf] Reallocating memory in module %s, " |
566 "old len = %i, new len = %i\n",af->info->name,af->data->len,len); | |
7568 | 567 // If there is a buffer free it |
568 if(af->data->audio) | |
569 free(af->data->audio); | |
570 // Create new buffer and check that it is OK | |
571 af->data->audio = malloc(len); | |
572 if(!af->data->audio){ | |
8607 | 573 af_msg(AF_MSG_FATAL,"[libaf] Could not allocate memory \n"); |
7568 | 574 return AF_ERROR; |
575 } | |
576 af->data->len=len; | |
577 return AF_OK; | |
578 } | |
12668
ce6ab8cb8597
Send a command throught the filter chain until some item returns AF_OK. Patch by Reimar Doeffinger
alex
parents:
11859
diff
changeset
|
579 |
16627
584bd8980d57
documentation-only patch: make doxygen compatible and create
reimar
parents:
16072
diff
changeset
|
580 // documentation in af.h |
14292
12239a0d5408
Make af_control_any_rev return the matching filter
reimar
parents:
14243
diff
changeset
|
581 af_instance_t *af_control_any_rev (af_stream_t* s, int cmd, void* arg) { |
12668
ce6ab8cb8597
Send a command throught the filter chain until some item returns AF_OK. Patch by Reimar Doeffinger
alex
parents:
11859
diff
changeset
|
582 int res = AF_UNKNOWN; |
ce6ab8cb8597
Send a command throught the filter chain until some item returns AF_OK. Patch by Reimar Doeffinger
alex
parents:
11859
diff
changeset
|
583 af_instance_t* filt = s->last; |
14292
12239a0d5408
Make af_control_any_rev return the matching filter
reimar
parents:
14243
diff
changeset
|
584 while (filt) { |
12668
ce6ab8cb8597
Send a command throught the filter chain until some item returns AF_OK. Patch by Reimar Doeffinger
alex
parents:
11859
diff
changeset
|
585 res = filt->control(filt, cmd, arg); |
14292
12239a0d5408
Make af_control_any_rev return the matching filter
reimar
parents:
14243
diff
changeset
|
586 if (res == AF_OK) |
12239a0d5408
Make af_control_any_rev return the matching filter
reimar
parents:
14243
diff
changeset
|
587 return filt; |
12668
ce6ab8cb8597
Send a command throught the filter chain until some item returns AF_OK. Patch by Reimar Doeffinger
alex
parents:
11859
diff
changeset
|
588 filt = filt->prev; |
ce6ab8cb8597
Send a command throught the filter chain until some item returns AF_OK. Patch by Reimar Doeffinger
alex
parents:
11859
diff
changeset
|
589 } |
14292
12239a0d5408
Make af_control_any_rev return the matching filter
reimar
parents:
14243
diff
changeset
|
590 return NULL; |
12668
ce6ab8cb8597
Send a command throught the filter chain until some item returns AF_OK. Patch by Reimar Doeffinger
alex
parents:
11859
diff
changeset
|
591 } |
ce6ab8cb8597
Send a command throught the filter chain until some item returns AF_OK. Patch by Reimar Doeffinger
alex
parents:
11859
diff
changeset
|
592 |
13269
aa13937da8a0
mplayer -af help now lists all available audio filters.
ivo
parents:
12668
diff
changeset
|
593 void af_help (void) { |
aa13937da8a0
mplayer -af help now lists all available audio filters.
ivo
parents:
12668
diff
changeset
|
594 int i = 0; |
13566
2cfb32a737aa
make af_help conform better to the the afm/vfm/etc equivalents
alex
parents:
13550
diff
changeset
|
595 af_msg(AF_MSG_INFO, "Available audio filters:\n"); |
13269
aa13937da8a0
mplayer -af help now lists all available audio filters.
ivo
parents:
12668
diff
changeset
|
596 while (filter_list[i]) { |
13566
2cfb32a737aa
make af_help conform better to the the afm/vfm/etc equivalents
alex
parents:
13550
diff
changeset
|
597 if (filter_list[i]->comment && filter_list[i]->comment[0]) |
2cfb32a737aa
make af_help conform better to the the afm/vfm/etc equivalents
alex
parents:
13550
diff
changeset
|
598 af_msg(AF_MSG_INFO, " %-15s: %s (%s)\n", filter_list[i]->name, filter_list[i]->info, filter_list[i]->comment); |
2cfb32a737aa
make af_help conform better to the the afm/vfm/etc equivalents
alex
parents:
13550
diff
changeset
|
599 else |
2cfb32a737aa
make af_help conform better to the the afm/vfm/etc equivalents
alex
parents:
13550
diff
changeset
|
600 af_msg(AF_MSG_INFO, " %-15s: %s\n", filter_list[i]->name, filter_list[i]->info); |
13269
aa13937da8a0
mplayer -af help now lists all available audio filters.
ivo
parents:
12668
diff
changeset
|
601 i++; |
aa13937da8a0
mplayer -af help now lists all available audio filters.
ivo
parents:
12668
diff
changeset
|
602 } |
aa13937da8a0
mplayer -af help now lists all available audio filters.
ivo
parents:
12668
diff
changeset
|
603 } |
aa13937da8a0
mplayer -af help now lists all available audio filters.
ivo
parents:
12668
diff
changeset
|
604 |
14818
663c1ea5f595
finally remove the refences to bps outside libaf. also simplification of some messages and removed redundants
alex
parents:
14750
diff
changeset
|
605 void af_fix_parameters(af_data_t *data) |
663c1ea5f595
finally remove the refences to bps outside libaf. also simplification of some messages and removed redundants
alex
parents:
14750
diff
changeset
|
606 { |
663c1ea5f595
finally remove the refences to bps outside libaf. also simplification of some messages and removed redundants
alex
parents:
14750
diff
changeset
|
607 data->bps = af_fmt2bits(data->format)/8; |
663c1ea5f595
finally remove the refences to bps outside libaf. also simplification of some messages and removed redundants
alex
parents:
14750
diff
changeset
|
608 } |