Mercurial > mplayer.hg
annotate libaf/af.c @ 32385:8d841a288ca7
Move OS-fixup hacks in init code into a separate function.
author | reimar |
---|---|
date | Sat, 09 Oct 2010 15:14:33 +0000 |
parents | fd4cd29b6121 |
children | 71a04d45357c |
rev | line source |
---|---|
28229
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
27391
diff
changeset
|
1 /* |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
27391
diff
changeset
|
2 * This file is part of MPlayer. |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
27391
diff
changeset
|
3 * |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
27391
diff
changeset
|
4 * MPlayer is free software; you can redistribute it and/or modify |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
27391
diff
changeset
|
5 * it under the terms of the GNU General Public License as published by |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
27391
diff
changeset
|
6 * the Free Software Foundation; either version 2 of the License, or |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
27391
diff
changeset
|
7 * (at your option) any later version. |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
27391
diff
changeset
|
8 * |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
27391
diff
changeset
|
9 * MPlayer is distributed in the hope that it will be useful, |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
27391
diff
changeset
|
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
27391
diff
changeset
|
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
27391
diff
changeset
|
12 * GNU General Public License for more details. |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
27391
diff
changeset
|
13 * |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
27391
diff
changeset
|
14 * You should have received a copy of the GNU General Public License along |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
27391
diff
changeset
|
15 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
27391
diff
changeset
|
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
27391
diff
changeset
|
17 */ |
72d0b1444141
Replace informal license notices by standard license header
diego
parents:
27391
diff
changeset
|
18 |
28662
595d419c0610
Add missing #include "config.h", fixes the warning:
diego
parents:
28661
diff
changeset
|
19 #include "config.h" |
7568 | 20 #include <stdio.h> |
21 #include <stdlib.h> | |
22 #include <string.h> | |
30313
7f7591482564
Add a proper header for our strsep implementation so strsep will
reimar
parents:
29263
diff
changeset
|
23 #include "osdep/strsep.h" |
32272
fd4cd29b6121
Automatic downmix using the pan filter when the requested channel count is 2
cigaes
parents:
32263
diff
changeset
|
24 #include "libmpcodecs/dec_audio.h" |
7568 | 25 |
26 #include "af.h" | |
27 | |
28 // Static list of filters | |
32134
12db4ae0b3d1
const-correctness for af_info_t audio filter declarations
diego
parents:
30617
diff
changeset
|
29 extern const af_info_t af_info_dummy; |
12db4ae0b3d1
const-correctness for af_info_t audio filter declarations
diego
parents:
30617
diff
changeset
|
30 extern const af_info_t af_info_delay; |
12db4ae0b3d1
const-correctness for af_info_t audio filter declarations
diego
parents:
30617
diff
changeset
|
31 extern const af_info_t af_info_channels; |
12db4ae0b3d1
const-correctness for af_info_t audio filter declarations
diego
parents:
30617
diff
changeset
|
32 extern const af_info_t af_info_format; |
12db4ae0b3d1
const-correctness for af_info_t audio filter declarations
diego
parents:
30617
diff
changeset
|
33 extern const af_info_t af_info_resample; |
12db4ae0b3d1
const-correctness for af_info_t audio filter declarations
diego
parents:
30617
diff
changeset
|
34 extern const af_info_t af_info_volume; |
12db4ae0b3d1
const-correctness for af_info_t audio filter declarations
diego
parents:
30617
diff
changeset
|
35 extern const af_info_t af_info_equalizer; |
12db4ae0b3d1
const-correctness for af_info_t audio filter declarations
diego
parents:
30617
diff
changeset
|
36 extern const af_info_t af_info_gate; |
12db4ae0b3d1
const-correctness for af_info_t audio filter declarations
diego
parents:
30617
diff
changeset
|
37 extern const af_info_t af_info_comp; |
12db4ae0b3d1
const-correctness for af_info_t audio filter declarations
diego
parents:
30617
diff
changeset
|
38 extern const af_info_t af_info_pan; |
12db4ae0b3d1
const-correctness for af_info_t audio filter declarations
diego
parents:
30617
diff
changeset
|
39 extern const af_info_t af_info_surround; |
12db4ae0b3d1
const-correctness for af_info_t audio filter declarations
diego
parents:
30617
diff
changeset
|
40 extern const af_info_t af_info_sub; |
12db4ae0b3d1
const-correctness for af_info_t audio filter declarations
diego
parents:
30617
diff
changeset
|
41 extern const af_info_t af_info_export; |
12db4ae0b3d1
const-correctness for af_info_t audio filter declarations
diego
parents:
30617
diff
changeset
|
42 extern const af_info_t af_info_volnorm; |
12db4ae0b3d1
const-correctness for af_info_t audio filter declarations
diego
parents:
30617
diff
changeset
|
43 extern const af_info_t af_info_extrastereo; |
12db4ae0b3d1
const-correctness for af_info_t audio filter declarations
diego
parents:
30617
diff
changeset
|
44 extern const af_info_t af_info_lavcac3enc; |
12db4ae0b3d1
const-correctness for af_info_t audio filter declarations
diego
parents:
30617
diff
changeset
|
45 extern const af_info_t af_info_lavcresample; |
12db4ae0b3d1
const-correctness for af_info_t audio filter declarations
diego
parents:
30617
diff
changeset
|
46 extern const af_info_t af_info_sweep; |
12db4ae0b3d1
const-correctness for af_info_t audio filter declarations
diego
parents:
30617
diff
changeset
|
47 extern const af_info_t af_info_hrtf; |
12db4ae0b3d1
const-correctness for af_info_t audio filter declarations
diego
parents:
30617
diff
changeset
|
48 extern const af_info_t af_info_ladspa; |
12db4ae0b3d1
const-correctness for af_info_t audio filter declarations
diego
parents:
30617
diff
changeset
|
49 extern const af_info_t af_info_center; |
12db4ae0b3d1
const-correctness for af_info_t audio filter declarations
diego
parents:
30617
diff
changeset
|
50 extern const af_info_t af_info_sinesuppress; |
12db4ae0b3d1
const-correctness for af_info_t audio filter declarations
diego
parents:
30617
diff
changeset
|
51 extern const af_info_t af_info_karaoke; |
12db4ae0b3d1
const-correctness for af_info_t audio filter declarations
diego
parents:
30617
diff
changeset
|
52 extern const af_info_t af_info_scaletempo; |
12db4ae0b3d1
const-correctness for af_info_t audio filter declarations
diego
parents:
30617
diff
changeset
|
53 extern const af_info_t af_info_stats; |
12db4ae0b3d1
const-correctness for af_info_t audio filter declarations
diego
parents:
30617
diff
changeset
|
54 extern const af_info_t af_info_bs2b; |
7568 | 55 |
32134
12db4ae0b3d1
const-correctness for af_info_t audio filter declarations
diego
parents:
30617
diff
changeset
|
56 static const af_info_t * const filter_list[] = { |
10908 | 57 &af_info_dummy, |
58 &af_info_delay, | |
59 &af_info_channels, | |
60 &af_info_format, | |
61 &af_info_resample, | |
62 &af_info_volume, | |
63 &af_info_equalizer, | |
64 &af_info_gate, | |
65 &af_info_comp, | |
66 &af_info_pan, | |
67 &af_info_surround, | |
68 &af_info_sub, | |
69 #ifdef HAVE_SYS_MMAN_H | |
70 &af_info_export, | |
71 #endif | |
13550
81e62cbe57d9
reimplementation of the pl_extrastereo and pl_volnorm plugins
alex
parents:
13269
diff
changeset
|
72 &af_info_volnorm, |
81e62cbe57d9
reimplementation of the pl_extrastereo and pl_volnorm plugins
alex
parents:
13269
diff
changeset
|
73 &af_info_extrastereo, |
32142
4614728cab25
build system: Merge all FFmpeg library checks into a single FFmpeg check.
diego
parents:
32134
diff
changeset
|
74 #ifdef CONFIG_FFMPEG_A |
25357
b265c001e64a
Add new audio filter for encoding multi-channel audio into ac3 at runtime.
ulion
parents:
25306
diff
changeset
|
75 &af_info_lavcac3enc, |
b265c001e64a
Add new audio filter for encoding multi-channel audio into ac3 at runtime.
ulion
parents:
25306
diff
changeset
|
76 #endif |
32142
4614728cab25
build system: Merge all FFmpeg library checks into a single FFmpeg check.
diego
parents:
32134
diff
changeset
|
77 #ifdef CONFIG_FFMPEG |
13713 | 78 &af_info_lavcresample, |
79 #endif | |
13721 | 80 &af_info_sweep, |
13996 | 81 &af_info_hrtf, |
27391
1d2faa1020fb
Rename a bunch of miscellaneous preprocessor directives.
diego
parents:
27341
diff
changeset
|
82 #ifdef CONFIG_LADSPA |
14217
5b5ebf93ec16
Adds support for LADSPA (Linux Audio Developer's Simple Plugin API) plugins.
ivo
parents:
13996
diff
changeset
|
83 &af_info_ladspa, |
5b5ebf93ec16
Adds support for LADSPA (Linux Audio Developer's Simple Plugin API) plugins.
ivo
parents:
13996
diff
changeset
|
84 #endif |
14750
108423cf7b3f
filter for adding a center channel, adding a high pass filter would be nice
alex
parents:
14569
diff
changeset
|
85 &af_info_center, |
18611
1c2f694d5232
Rename sinesupress to sinesuppress, including af_sinesupress.c file rename.
corey
parents:
18470
diff
changeset
|
86 &af_info_sinesuppress, |
18470 | 87 &af_info_karaoke, |
24896 | 88 &af_info_scaletempo, |
28661
20787bd5c506
Add statistics audio filter that prints information about the audio stream.
diego
parents:
28594
diff
changeset
|
89 &af_info_stats, |
29093 | 90 #ifdef CONFIG_LIBBS2B |
91 &af_info_bs2b, | |
92 #endif | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29093
diff
changeset
|
93 NULL |
7568 | 94 }; |
95 | |
8167 | 96 // CPU speed |
97 int* af_cpu_speed = NULL; | |
98 | |
7568 | 99 /* Find a filter in the static list of filters using it's name. This |
100 function is used internally */ | |
32134
12db4ae0b3d1
const-correctness for af_info_t audio filter declarations
diego
parents:
30617
diff
changeset
|
101 static const af_info_t* af_find(char*name) |
7568 | 102 { |
103 int i=0; | |
104 while(filter_list[i]){ | |
105 if(!strcmp(filter_list[i]->name,name)) | |
106 return filter_list[i]; | |
107 i++; | |
108 } | |
29049 | 109 mp_msg(MSGT_AFILTER, MSGL_ERR, "Couldn't find audio filter '%s'\n",name); |
7568 | 110 return NULL; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29093
diff
changeset
|
111 } |
7568 | 112 |
7615 | 113 /* Find filter in the dynamic filter list using it's name This |
114 function is used for finding already initialized filters */ | |
115 af_instance_t* af_get(af_stream_t* s, char* name) | |
116 { | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29093
diff
changeset
|
117 af_instance_t* af=s->first; |
7615 | 118 // Find the filter |
119 while(af != NULL){ | |
120 if(!strcmp(af->info->name,name)) | |
121 return af; | |
122 af=af->next; | |
123 } | |
124 return NULL; | |
125 } | |
126 | |
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
|
127 /*/ 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
|
128 contain the commandline parameters for the filter */ |
25302
701de923a20d
Fix missing command line bug by making the input parameter constant.
ulion
parents:
25115
diff
changeset
|
129 static af_instance_t* af_create(af_stream_t* s, const char* name_with_cmd) |
7568 | 130 { |
25302
701de923a20d
Fix missing command line bug by making the input parameter constant.
ulion
parents:
25115
diff
changeset
|
131 char* name = strdup(name_with_cmd); |
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
|
132 char* cmdline = name; |
7998
d48a06d07afb
Adding commandline options for filters and fixing stupid bug in cfg
anders
parents:
7993
diff
changeset
|
133 |
7568 | 134 // Allocate space for the new filter and reset all pointers |
135 af_instance_t* new=malloc(sizeof(af_instance_t)); | |
25302
701de923a20d
Fix missing command line bug by making the input parameter constant.
ulion
parents:
25115
diff
changeset
|
136 if (!name || !new) { |
29049 | 137 mp_msg(MSGT_AFILTER, MSGL_ERR, "[libaf] Could not allocate memory\n"); |
17780
16c347e53841
fix memory leak when filter with given name does not exist.
reimar
parents:
16815
diff
changeset
|
138 goto err_out; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29093
diff
changeset
|
139 } |
7568 | 140 memset(new,0,sizeof(af_instance_t)); |
141 | |
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
|
142 // 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
|
143 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
|
144 |
7568 | 145 // Find filter from name |
7615 | 146 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
|
147 goto err_out; |
7615 | 148 |
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
|
149 /* 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
|
150 non-reentrant */ |
7615 | 151 if(new->info->flags & AF_FLAGS_NOT_REENTRANT){ |
152 if(af_get(s,name)){ | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29093
diff
changeset
|
153 mp_msg(MSGT_AFILTER, MSGL_ERR, "[libaf] There can only be one instance of" |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29093
diff
changeset
|
154 " 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
|
155 goto err_out; |
7615 | 156 } |
157 } | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29093
diff
changeset
|
158 |
29049 | 159 mp_msg(MSGT_AFILTER, MSGL_V, "[libaf] Adding filter %s \n",name); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29093
diff
changeset
|
160 |
7568 | 161 // Initialize the new filter |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29093
diff
changeset
|
162 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
|
163 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
|
164 if(cmdline){ |
25306 | 165 if(AF_ERROR>=new->control(new,AF_CONTROL_COMMAND_LINE,cmdline)) |
25302
701de923a20d
Fix missing command line bug by making the input parameter constant.
ulion
parents:
25115
diff
changeset
|
166 goto err_out; |
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
|
167 } |
25302
701de923a20d
Fix missing command line bug by making the input parameter constant.
ulion
parents:
25115
diff
changeset
|
168 free(name); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29093
diff
changeset
|
169 return 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
|
170 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29093
diff
changeset
|
171 |
17780
16c347e53841
fix memory leak when filter with given name does not exist.
reimar
parents:
16815
diff
changeset
|
172 err_out: |
7568 | 173 free(new); |
29049 | 174 mp_msg(MSGT_AFILTER, MSGL_ERR, "[libaf] Couldn't create or open audio filter '%s'\n", |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29093
diff
changeset
|
175 name); |
25302
701de923a20d
Fix missing command line bug by making the input parameter constant.
ulion
parents:
25115
diff
changeset
|
176 free(name); |
7568 | 177 return NULL; |
178 } | |
179 | |
180 /* Create and insert a new filter of type name before the filter in the | |
181 argument. This function can be called during runtime, the return | |
182 value is the new filter */ | |
32262
f67e85fc1f7a
Fix af_append and af_prepend prototypes, the name should be const.
reimar
parents:
32142
diff
changeset
|
183 static af_instance_t* af_prepend(af_stream_t* s, af_instance_t* af, const char* name) |
7568 | 184 { |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
185 // Create the new filter and make sure it is OK |
7615 | 186 af_instance_t* new=af_create(s,name); |
7568 | 187 if(!new) |
188 return NULL; | |
189 // Update pointers | |
190 new->next=af; | |
191 if(af){ | |
192 new->prev=af->prev; | |
193 af->prev=new; | |
194 } | |
195 else | |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
196 s->last=new; |
7568 | 197 if(new->prev) |
198 new->prev->next=new; | |
199 else | |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
200 s->first=new; |
7568 | 201 return new; |
202 } | |
203 | |
204 /* Create and insert a new filter of type name after the filter in the | |
205 argument. This function can be called during runtime, the return | |
206 value is the new filter */ | |
32262
f67e85fc1f7a
Fix af_append and af_prepend prototypes, the name should be const.
reimar
parents:
32142
diff
changeset
|
207 static af_instance_t* af_append(af_stream_t* s, af_instance_t* af, const char* name) |
7568 | 208 { |
209 // Create the new filter and make sure it is OK | |
7615 | 210 af_instance_t* new=af_create(s,name); |
7568 | 211 if(!new) |
212 return NULL; | |
213 // Update pointers | |
214 new->prev=af; | |
215 if(af){ | |
216 new->next=af->next; | |
217 af->next=new; | |
218 } | |
219 else | |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
220 s->first=new; |
7568 | 221 if(new->next) |
222 new->next->prev=new; | |
223 else | |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
224 s->last=new; |
7568 | 225 return new; |
226 } | |
227 | |
228 // 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
|
229 void af_remove(af_stream_t* s, af_instance_t* af) |
7568 | 230 { |
231 if(!af) return; | |
232 | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29093
diff
changeset
|
233 // Print friendly message |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29093
diff
changeset
|
234 mp_msg(MSGT_AFILTER, MSGL_V, "[libaf] Removing filter %s \n",af->info->name); |
8607 | 235 |
7745
1d3a3dc1f488
Adding volume control and moving control() call parameters to a seperate file
anders
parents:
7665
diff
changeset
|
236 // Notify filter before changing anything |
1d3a3dc1f488
Adding volume control and moving control() call parameters to a seperate file
anders
parents:
7665
diff
changeset
|
237 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
|
238 |
7568 | 239 // Detach pointers |
240 if(af->prev) | |
241 af->prev->next=af->next; | |
242 else | |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
243 s->first=af->next; |
7568 | 244 if(af->next) |
245 af->next->prev=af->prev; | |
246 else | |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
247 s->last=af->prev; |
7568 | 248 |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29093
diff
changeset
|
249 // Uninitialize af and free memory |
7568 | 250 af->uninit(af); |
251 free(af); | |
252 } | |
253 | |
7649
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
254 /* Reinitializes all filters downstream from the filter given in the |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
255 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
|
256 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
|
257 static int af_reinit(af_stream_t* s, af_instance_t* af) |
7568 | 258 { |
259 do{ | |
260 af_data_t in; // Format of the input to current filter | |
261 int rv=0; // Return value | |
262 | |
15191
7eab9c86ae19
change list traversal so the loop begins at the first filter after removing
henry
parents:
14818
diff
changeset
|
263 // 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
|
264 if(NULL == af){ |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29093
diff
changeset
|
265 if(!(af=af_append(s,s->first,"dummy"))) |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29093
diff
changeset
|
266 return AF_UNKNOWN; |
15191
7eab9c86ae19
change list traversal so the loop begins at the first filter after removing
henry
parents:
14818
diff
changeset
|
267 else |
7eab9c86ae19
change list traversal so the loop begins at the first filter after removing
henry
parents:
14818
diff
changeset
|
268 return AF_ERROR; |
7eab9c86ae19
change list traversal so the loop begins at the first filter after removing
henry
parents:
14818
diff
changeset
|
269 } |
7eab9c86ae19
change list traversal so the loop begins at the first filter after removing
henry
parents:
14818
diff
changeset
|
270 |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29093
diff
changeset
|
271 // Check if this is the first filter |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29093
diff
changeset
|
272 if(!af->prev) |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
273 memcpy(&in,&(s->input),sizeof(af_data_t)); |
7568 | 274 else |
275 memcpy(&in,af->prev->data,sizeof(af_data_t)); | |
276 // Reset just in case... | |
277 in.audio=NULL; | |
278 in.len=0; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29093
diff
changeset
|
279 |
7568 | 280 rv = af->control(af,AF_CONTROL_REINIT,&in); |
281 switch(rv){ | |
282 case AF_OK: | |
15191
7eab9c86ae19
change list traversal so the loop begins at the first filter after removing
henry
parents:
14818
diff
changeset
|
283 af = af->next; |
7568 | 284 break; |
285 case AF_FALSE:{ // Configuration filter is needed | |
8167 | 286 // Do auto insertion only if force is not specified |
287 if((AF_INIT_TYPE_MASK & s->cfg.force) != AF_INIT_FORCE){ | |
288 af_instance_t* new = NULL; | |
289 // Insert channels filter | |
290 if((af->prev?af->prev->data->nch:s->input.nch) != in.nch){ | |
291 // Create channels filter | |
292 if(NULL == (new = af_prepend(s,af,"channels"))) | |
293 return AF_ERROR; | |
294 // Set number of output channels | |
295 if(AF_OK != (rv = new->control(new,AF_CONTROL_CHANNELS,&in.nch))) | |
296 return rv; | |
297 // Initialize channels filter | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29093
diff
changeset
|
298 if(!new->prev) |
8167 | 299 memcpy(&in,&(s->input),sizeof(af_data_t)); |
300 else | |
301 memcpy(&in,new->prev->data,sizeof(af_data_t)); | |
302 if(AF_OK != (rv = new->control(new,AF_CONTROL_REINIT,&in))) | |
303 return rv; | |
304 } | |
305 // 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
|
306 if((af->prev?af->prev->data->format:s->input.format) != in.format){ |
8167 | 307 // Create format filter |
308 if(NULL == (new = af_prepend(s,af,"format"))) | |
309 return AF_ERROR; | |
8607 | 310 // 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
|
311 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
|
312 if(AF_OK != (rv = new->control(new,AF_CONTROL_FORMAT_FMT,&in.format))) |
8167 | 313 return rv; |
314 // Initialize format filter | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29093
diff
changeset
|
315 if(!new->prev) |
8167 | 316 memcpy(&in,&(s->input),sizeof(af_data_t)); |
317 else | |
318 memcpy(&in,new->prev->data,sizeof(af_data_t)); | |
319 if(AF_OK != (rv = new->control(new,AF_CONTROL_REINIT,&in))) | |
320 return rv; | |
321 } | |
8607 | 322 if(!new){ // Should _never_ happen |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29093
diff
changeset
|
323 mp_msg(MSGT_AFILTER, MSGL_ERR, "[libaf] Unable to correct audio format. " |
8607 | 324 "This error should never uccur, please send bugreport.\n"); |
7568 | 325 return AF_ERROR; |
8607 | 326 } |
15191
7eab9c86ae19
change list traversal so the loop begins at the first filter after removing
henry
parents:
14818
diff
changeset
|
327 af=new->next; |
7568 | 328 } |
16072 | 329 else { |
29049 | 330 mp_msg(MSGT_AFILTER, MSGL_ERR, "[libaf] Automatic filter insertion disabled " |
16072 | 331 "but formats do not match. Giving up.\n"); |
332 return AF_ERROR; | |
333 } | |
7568 | 334 break; |
335 } | |
336 case AF_DETACH:{ // Filter is redundant and wants to be unloaded | |
8167 | 337 // Do auto remove only if force is not specified |
338 if((AF_INIT_TYPE_MASK & s->cfg.force) != AF_INIT_FORCE){ | |
339 af_instance_t* aft=af->prev; | |
340 af_remove(s,af); | |
341 if(aft) | |
15191
7eab9c86ae19
change list traversal so the loop begins at the first filter after removing
henry
parents:
14818
diff
changeset
|
342 af=aft->next; |
8167 | 343 else |
344 af=s->first; // Restart configuration | |
345 } | |
7568 | 346 break; |
347 } | |
348 default: | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29093
diff
changeset
|
349 mp_msg(MSGT_AFILTER, MSGL_ERR, "[libaf] Reinitialization did not work, audio" |
8607 | 350 " filter '%s' returned error code %i\n",af->info->name,rv); |
7568 | 351 return AF_ERROR; |
352 } | |
353 }while(af); | |
354 return AF_OK; | |
355 } | |
356 | |
357 // 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
|
358 void af_uninit(af_stream_t* s) |
7568 | 359 { |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
360 while(s->first) |
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
361 af_remove(s,s->first); |
7568 | 362 } |
363 | |
30617
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
364 /** |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
365 * Extend the filter chain so we get the required output format at the end. |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
366 * \return AF_ERROR on error, AF_OK if successful. |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
367 */ |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
368 static int fixup_output_format(af_stream_t* s) |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
369 { |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
370 af_instance_t* af = NULL; |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
371 // Check number of output channels fix if not OK |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
372 // If needed always inserted last -> easy to screw up other filters |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
373 if(s->output.nch && s->last->data->nch!=s->output.nch){ |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
374 if(!strcmp(s->last->info->name,"format")) |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
375 af = af_prepend(s,s->last,"channels"); |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
376 else |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
377 af = af_append(s,s->last,"channels"); |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
378 // Init the new filter |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
379 if(!af || (AF_OK != af->control(af,AF_CONTROL_CHANNELS,&(s->output.nch)))) |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
380 return AF_ERROR; |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
381 if(AF_OK != af_reinit(s,af)) |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
382 return AF_ERROR; |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
383 } |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
384 |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
385 // Check output format fix if not OK |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
386 if(s->output.format != AF_FORMAT_UNKNOWN && |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
387 s->last->data->format != s->output.format){ |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
388 if(strcmp(s->last->info->name,"format")) |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
389 af = af_append(s,s->last,"format"); |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
390 else |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
391 af = s->last; |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
392 // Init the new filter |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
393 s->output.format |= af_bits2fmt(s->output.bps*8); |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
394 if(!af || (AF_OK != af->control(af,AF_CONTROL_FORMAT_FMT,&(s->output.format)))) |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
395 return AF_ERROR; |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
396 if(AF_OK != af_reinit(s,af)) |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
397 return AF_ERROR; |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
398 } |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
399 |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
400 // Re init again just in case |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
401 if(AF_OK != af_reinit(s,s->first)) |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
402 return AF_ERROR; |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
403 |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
404 if (s->output.format == AF_FORMAT_UNKNOWN) |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
405 s->output.format = s->last->data->format; |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
406 if (!s->output.nch) s->output.nch = s->last->data->nch; |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
407 if (!s->output.rate) s->output.rate = s->last->data->rate; |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
408 if((s->last->data->format != s->output.format) || |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
409 (s->last->data->nch != s->output.nch) || |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
410 (s->last->data->rate != s->output.rate)) { |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
411 return AF_ERROR; |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
412 } |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
413 return AF_OK; |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
414 } |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
415 |
32272
fd4cd29b6121
Automatic downmix using the pan filter when the requested channel count is 2
cigaes
parents:
32263
diff
changeset
|
416 /** |
fd4cd29b6121
Automatic downmix using the pan filter when the requested channel count is 2
cigaes
parents:
32263
diff
changeset
|
417 * Automatic downmix to stereo in case the codec does not implement it. |
fd4cd29b6121
Automatic downmix using the pan filter when the requested channel count is 2
cigaes
parents:
32263
diff
changeset
|
418 */ |
fd4cd29b6121
Automatic downmix using the pan filter when the requested channel count is 2
cigaes
parents:
32263
diff
changeset
|
419 static void af_downmix(af_stream_t* s) |
fd4cd29b6121
Automatic downmix using the pan filter when the requested channel count is 2
cigaes
parents:
32263
diff
changeset
|
420 { |
fd4cd29b6121
Automatic downmix using the pan filter when the requested channel count is 2
cigaes
parents:
32263
diff
changeset
|
421 static const char * const downmix_strs[AF_NCH + 1] = { |
fd4cd29b6121
Automatic downmix using the pan filter when the requested channel count is 2
cigaes
parents:
32263
diff
changeset
|
422 /* FL FR RL RR FC LF AL AR */ |
fd4cd29b6121
Automatic downmix using the pan filter when the requested channel count is 2
cigaes
parents:
32263
diff
changeset
|
423 [3] = "pan=2:" "0.6:0:" "0:0.6:" "0.4:0.4", |
fd4cd29b6121
Automatic downmix using the pan filter when the requested channel count is 2
cigaes
parents:
32263
diff
changeset
|
424 [4] = "pan=2:" "0.6:0:" "0:0.6:" "0.4:0:" "0:0.4", |
fd4cd29b6121
Automatic downmix using the pan filter when the requested channel count is 2
cigaes
parents:
32263
diff
changeset
|
425 [5] = "pan=2:" "0.5:0:" "0:0.5:" "0.2:0:" "0:0.2:" "0.3:0.3", |
fd4cd29b6121
Automatic downmix using the pan filter when the requested channel count is 2
cigaes
parents:
32263
diff
changeset
|
426 [6] = "pan=2:" "0.4:0:" "0:0.4:" "0.2:0:" "0:0.2:" "0.3:0.3:" "0.1:0.1", |
fd4cd29b6121
Automatic downmix using the pan filter when the requested channel count is 2
cigaes
parents:
32263
diff
changeset
|
427 [7] = "pan=2:" "0.4:0:" "0:0.4:" "0.2:0:" "0:0.2:" "0.3:0.3:" "0.1:0:" "0:0.1", |
fd4cd29b6121
Automatic downmix using the pan filter when the requested channel count is 2
cigaes
parents:
32263
diff
changeset
|
428 [8] = "pan=2:" "0.4:0:" "0:0.4:" "0.15:0:" "0:0.15:" "0.25:0.25:" "0.1:0.1:" "0.1:0:" "0:0.1", |
fd4cd29b6121
Automatic downmix using the pan filter when the requested channel count is 2
cigaes
parents:
32263
diff
changeset
|
429 }; |
fd4cd29b6121
Automatic downmix using the pan filter when the requested channel count is 2
cigaes
parents:
32263
diff
changeset
|
430 const char *af_pan_str = downmix_strs[s->input.nch]; |
fd4cd29b6121
Automatic downmix using the pan filter when the requested channel count is 2
cigaes
parents:
32263
diff
changeset
|
431 |
fd4cd29b6121
Automatic downmix using the pan filter when the requested channel count is 2
cigaes
parents:
32263
diff
changeset
|
432 if (af_pan_str) |
fd4cd29b6121
Automatic downmix using the pan filter when the requested channel count is 2
cigaes
parents:
32263
diff
changeset
|
433 af_append(s, s->first, af_pan_str); |
fd4cd29b6121
Automatic downmix using the pan filter when the requested channel count is 2
cigaes
parents:
32263
diff
changeset
|
434 } |
fd4cd29b6121
Automatic downmix using the pan filter when the requested channel count is 2
cigaes
parents:
32263
diff
changeset
|
435 |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
436 /* 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
|
437 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
|
438 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
|
439 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
|
440 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
|
441 stream will be reinitialized. |
9b4bbb6098f6
make -srate work again, unify audio filter init and preinit.
reimar
parents:
15791
diff
changeset
|
442 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
|
443 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
|
444 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
|
445 int af_init(af_stream_t* s) |
7568 | 446 { |
447 int i=0; | |
448 | |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
449 // Sanity check |
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
450 if(!s) return -1; |
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
451 |
7568 | 452 // 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
|
453 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
|
454 s->input.len = s->output.len = 0; |
7568 | 455 |
456 // Figure out how fast the machine is | |
8167 | 457 if(AF_INIT_AUTO == (AF_INIT_TYPE_MASK & s->cfg.force)) |
458 s->cfg.force = (s->cfg.force & ~AF_INIT_TYPE_MASK) | AF_INIT_TYPE; | |
7568 | 459 |
460 // 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
|
461 if(!s->first){ |
32272
fd4cd29b6121
Automatic downmix using the pan filter when the requested channel count is 2
cigaes
parents:
32263
diff
changeset
|
462 // Append a downmix pan filter at the beginning of the chain if needed |
fd4cd29b6121
Automatic downmix using the pan filter when the requested channel count is 2
cigaes
parents:
32263
diff
changeset
|
463 if (s->input.nch != audio_output_channels && audio_output_channels == 2) |
fd4cd29b6121
Automatic downmix using the pan filter when the requested channel count is 2
cigaes
parents:
32263
diff
changeset
|
464 af_downmix(s); |
7568 | 465 // Add all filters in the list (if there are any) |
32263 | 466 if (s->cfg.list) { |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
467 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
|
468 if(!af_append(s,s->last,s->cfg.list[i++])) |
7568 | 469 return -1; |
470 } | |
471 } | |
472 } | |
8607 | 473 |
32263 | 474 // If we do not have any filters otherwise |
475 // add dummy to make automatic format conversion work | |
476 if (!s->first && !af_append(s, s->first, "dummy")) | |
477 return -1; | |
478 | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29093
diff
changeset
|
479 // Init filters |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
480 if(AF_OK != af_reinit(s,s->first)) |
7568 | 481 return -1; |
482 | |
15312
0313ef8b0730
Prevent segfault when filter chain is empty (e.g. because all
reimar
parents:
15191
diff
changeset
|
483 // 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
|
484 if (!s->first) |
0313ef8b0730
Prevent segfault when filter chain is empty (e.g. because all
reimar
parents:
15191
diff
changeset
|
485 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
|
486 return -1; |
0313ef8b0730
Prevent segfault when filter chain is empty (e.g. because all
reimar
parents:
15191
diff
changeset
|
487 |
7568 | 488 // Check output format |
7745
1d3a3dc1f488
Adding volume control and moving control() call parameters to a seperate file
anders
parents:
7665
diff
changeset
|
489 if((AF_INIT_TYPE_MASK & s->cfg.force) != AF_INIT_FORCE){ |
7568 | 490 af_instance_t* af = NULL; // New filter |
491 // 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
|
492 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
|
493 // try to find a filter that can change samplrate |
9261d7dcf5e7
Use lavcresample only when libavcodec is compiled in.
reimar
parents:
14292
diff
changeset
|
494 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
|
495 &(s->output.rate)); |
9261d7dcf5e7
Use lavcresample only when libavcodec is compiled in.
reimar
parents:
14292
diff
changeset
|
496 if (!af) { |
9261d7dcf5e7
Use lavcresample only when libavcodec is compiled in.
reimar
parents:
14292
diff
changeset
|
497 char *resampler = "resample"; |
32142
4614728cab25
build system: Merge all FFmpeg library checks into a single FFmpeg check.
diego
parents:
32134
diff
changeset
|
498 #ifdef CONFIG_FFMPEG |
14326
9261d7dcf5e7
Use lavcresample only when libavcodec is compiled in.
reimar
parents:
14292
diff
changeset
|
499 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
|
500 resampler = "lavcresample"; |
9261d7dcf5e7
Use lavcresample only when libavcodec is compiled in.
reimar
parents:
14292
diff
changeset
|
501 #endif |
7745
1d3a3dc1f488
Adding volume control and moving control() call parameters to a seperate file
anders
parents:
7665
diff
changeset
|
502 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
|
503 if(!strcmp(s->first->info->name,"format")) |
14326
9261d7dcf5e7
Use lavcresample only when libavcodec is compiled in.
reimar
parents:
14292
diff
changeset
|
504 af = af_append(s,s->first,resampler); |
7568 | 505 else |
14326
9261d7dcf5e7
Use lavcresample only when libavcodec is compiled in.
reimar
parents:
14292
diff
changeset
|
506 af = af_prepend(s,s->first,resampler); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29093
diff
changeset
|
507 } |
7568 | 508 else{ |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
509 if(!strcmp(s->last->info->name,"format")) |
14326
9261d7dcf5e7
Use lavcresample only when libavcodec is compiled in.
reimar
parents:
14292
diff
changeset
|
510 af = af_prepend(s,s->last,resampler); |
7568 | 511 else |
14326
9261d7dcf5e7
Use lavcresample only when libavcodec is compiled in.
reimar
parents:
14292
diff
changeset
|
512 af = af_append(s,s->last,resampler); |
7568 | 513 } |
514 // Init the new filter | |
15191
7eab9c86ae19
change list traversal so the loop begins at the first filter after removing
henry
parents:
14818
diff
changeset
|
515 if(!af || (AF_OK != af->control(af,AF_CONTROL_RESAMPLE_RATE | AF_CONTROL_SET, |
8607 | 516 &(s->output.rate)))) |
7568 | 517 return -1; |
11859
b8bee4f4b8bb
if the user wants fast, use fast code! otherwise the user has to put
rfelker
parents:
10908
diff
changeset
|
518 // 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
|
519 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
|
520 char args[32]; |
14326
9261d7dcf5e7
Use lavcresample only when libavcodec is compiled in.
reimar
parents:
14292
diff
changeset
|
521 sprintf(args, "%d", s->output.rate); |
32142
4614728cab25
build system: Merge all FFmpeg library checks into a single FFmpeg check.
diego
parents:
32134
diff
changeset
|
522 #ifdef CONFIG_FFMPEG |
14326
9261d7dcf5e7
Use lavcresample only when libavcodec is compiled in.
reimar
parents:
14292
diff
changeset
|
523 if (strcmp(resampler, "lavcresample") == 0) |
9261d7dcf5e7
Use lavcresample only when libavcodec is compiled in.
reimar
parents:
14292
diff
changeset
|
524 strcat(args, ":1"); |
9261d7dcf5e7
Use lavcresample only when libavcodec is compiled in.
reimar
parents:
14292
diff
changeset
|
525 else |
9261d7dcf5e7
Use lavcresample only when libavcodec is compiled in.
reimar
parents:
14292
diff
changeset
|
526 #endif |
9261d7dcf5e7
Use lavcresample only when libavcodec is compiled in.
reimar
parents:
14292
diff
changeset
|
527 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
|
528 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
|
529 } |
14326
9261d7dcf5e7
Use lavcresample only when libavcodec is compiled in.
reimar
parents:
14292
diff
changeset
|
530 } |
7571
8819fdf88b5d
Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents:
7568
diff
changeset
|
531 if(AF_OK != af_reinit(s,af)) |
7568 | 532 return -1; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29093
diff
changeset
|
533 } |
30617
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
534 if (AF_OK != fixup_output_format(s)) { |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29093
diff
changeset
|
535 // Something is stuffed audio out will not work |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29093
diff
changeset
|
536 mp_msg(MSGT_AFILTER, MSGL_ERR, "[libaf] Unable to setup filter system can not" |
8607 | 537 " 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
|
538 af_uninit(s); |
7568 | 539 return -1; |
540 } | |
541 } | |
542 return 0; | |
543 } | |
544 | |
7649
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
545 /* Add filter during execution. This function adds the filter "name" |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
546 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
|
547 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
|
548 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
|
549 af_instance_t* af_add(af_stream_t* s, char* name){ |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
550 af_instance_t* new; |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
551 // Sanity check |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
552 if(!s || !s->first || !name) |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
553 return NULL; |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
554 // Insert the filter somwhere nice |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
555 if(!strcmp(s->first->info->name,"format")) |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
556 new = af_append(s, s->first, name); |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
557 else |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
558 new = af_prepend(s, s->first, name); |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
559 if(!new) |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
560 return NULL; |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
561 |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
562 // Reinitalize the filter list |
30617
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
563 if(AF_OK != af_reinit(s, s->first) || |
22aef54d8833
Move code that makes the filter chain match the desired output format into
reimar
parents:
30313
diff
changeset
|
564 AF_OK != fixup_output_format(s)){ |
7649
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
565 free(new); |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
566 return NULL; |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
567 } |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
568 return new; |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
569 } |
90e16aa8ae5f
Adding functionality for adding filters during execution
anders
parents:
7617
diff
changeset
|
570 |
7568 | 571 // 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
|
572 af_data_t* af_play(af_stream_t* s, af_data_t* data) |
7568 | 573 { |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29093
diff
changeset
|
574 af_instance_t* af=s->first; |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29093
diff
changeset
|
575 // Iterate through all filters |
7568 | 576 do{ |
16815
78c84594247b
semi-hack: avoid passing 0-length blocks to audio filters.
reimar
parents:
16627
diff
changeset
|
577 if (data->len <= 0) break; |
7568 | 578 data=af->play(af,data); |
579 af=af->next; | |
25115
5a0da5dcadd3
Prevent from using data->len when data is NULL (when play() return NULL).
ulion
parents:
24900
diff
changeset
|
580 }while(af && data); |
7568 | 581 return data; |
582 } | |
583 | |
24888 | 584 /* Calculate the minimum output buffer size for given input data d |
585 * when using the RESIZE_LOCAL_BUFFER macro. The +t+1 part ensures the | |
586 * value is >= len*mul rounded upwards to whole samples even if the | |
587 * double 'mul' is inexact. */ | |
588 int af_lencalc(double mul, af_data_t* d) | |
589 { | |
590 int t = d->bps * d->nch; | |
591 return d->len * mul + t + 1; | |
7568 | 592 } |
593 | |
24892 | 594 // Calculate average ratio of filter output size to input size |
595 double af_calc_filter_multiplier(af_stream_t* s) | |
7598
48f8c731efb5
Adding function for estimating required buffer length
anders
parents:
7590
diff
changeset
|
596 { |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29093
diff
changeset
|
597 af_instance_t* af=s->first; |
24888 | 598 double mul = 1; |
7598
48f8c731efb5
Adding function for estimating required buffer length
anders
parents:
7590
diff
changeset
|
599 // Iterate through all filters and calculate total multiplication factor |
48f8c731efb5
Adding function for estimating required buffer length
anders
parents:
7590
diff
changeset
|
600 do{ |
24888 | 601 mul *= af->mul; |
602 af=af->next; | |
7598
48f8c731efb5
Adding function for estimating required buffer length
anders
parents:
7590
diff
changeset
|
603 }while(af); |
8607 | 604 |
24892 | 605 return mul; |
7598
48f8c731efb5
Adding function for estimating required buffer length
anders
parents:
7590
diff
changeset
|
606 } |
48f8c731efb5
Adding function for estimating required buffer length
anders
parents:
7590
diff
changeset
|
607 |
24900 | 608 /* 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
|
609 double af_calc_delay(af_stream_t* s) |
fbd5445cc853
Adding function for calculating the delay caused by the filters
anders
parents:
7649
diff
changeset
|
610 { |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29093
diff
changeset
|
611 af_instance_t* af=s->first; |
7665
fbd5445cc853
Adding function for calculating the delay caused by the filters
anders
parents:
7649
diff
changeset
|
612 register double delay = 0.0; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29093
diff
changeset
|
613 // Iterate through all filters |
7665
fbd5445cc853
Adding function for calculating the delay caused by the filters
anders
parents:
7649
diff
changeset
|
614 while(af){ |
fbd5445cc853
Adding function for calculating the delay caused by the filters
anders
parents:
7649
diff
changeset
|
615 delay += af->delay; |
24900 | 616 delay *= af->mul; |
7665
fbd5445cc853
Adding function for calculating the delay caused by the filters
anders
parents:
7649
diff
changeset
|
617 af=af->next; |
fbd5445cc853
Adding function for calculating the delay caused by the filters
anders
parents:
7649
diff
changeset
|
618 } |
fbd5445cc853
Adding function for calculating the delay caused by the filters
anders
parents:
7649
diff
changeset
|
619 return delay; |
fbd5445cc853
Adding function for calculating the delay caused by the filters
anders
parents:
7649
diff
changeset
|
620 } |
fbd5445cc853
Adding function for calculating the delay caused by the filters
anders
parents:
7649
diff
changeset
|
621 |
7568 | 622 /* Helper function called by the macro with the same name this |
623 function should not be called directly */ | |
24890 | 624 int af_resize_local_buffer(af_instance_t* af, af_data_t* data) |
7568 | 625 { |
626 // Calculate new length | |
7589 | 627 register int len = af_lencalc(af->mul,data); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29093
diff
changeset
|
628 mp_msg(MSGT_AFILTER, MSGL_V, "[libaf] Reallocating memory in module %s, " |
8607 | 629 "old len = %i, new len = %i\n",af->info->name,af->data->len,len); |
7568 | 630 // If there is a buffer free it |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29093
diff
changeset
|
631 if(af->data->audio) |
7568 | 632 free(af->data->audio); |
633 // Create new buffer and check that it is OK | |
634 af->data->audio = malloc(len); | |
635 if(!af->data->audio){ | |
29049 | 636 mp_msg(MSGT_AFILTER, MSGL_FATAL, "[libaf] Could not allocate memory \n"); |
7568 | 637 return AF_ERROR; |
638 } | |
639 af->data->len=len; | |
640 return AF_OK; | |
641 } | |
12668
ce6ab8cb8597
Send a command throught the filter chain until some item returns AF_OK. Patch by Reimar Doeffinger
alex
parents:
11859
diff
changeset
|
642 |
16627
584bd8980d57
documentation-only patch: make doxygen compatible and create
reimar
parents:
16072
diff
changeset
|
643 // documentation in af.h |
14292
12239a0d5408
Make af_control_any_rev return the matching filter
reimar
parents:
14243
diff
changeset
|
644 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
|
645 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
|
646 af_instance_t* filt = s->last; |
14292
12239a0d5408
Make af_control_any_rev return the matching filter
reimar
parents:
14243
diff
changeset
|
647 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
|
648 res = filt->control(filt, cmd, arg); |
14292
12239a0d5408
Make af_control_any_rev return the matching filter
reimar
parents:
14243
diff
changeset
|
649 if (res == AF_OK) |
12239a0d5408
Make af_control_any_rev return the matching filter
reimar
parents:
14243
diff
changeset
|
650 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
|
651 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
|
652 } |
14292
12239a0d5408
Make af_control_any_rev return the matching filter
reimar
parents:
14243
diff
changeset
|
653 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
|
654 } |
ce6ab8cb8597
Send a command throught the filter chain until some item returns AF_OK. Patch by Reimar Doeffinger
alex
parents:
11859
diff
changeset
|
655 |
13269
aa13937da8a0
mplayer -af help now lists all available audio filters.
ivo
parents:
12668
diff
changeset
|
656 void af_help (void) { |
aa13937da8a0
mplayer -af help now lists all available audio filters.
ivo
parents:
12668
diff
changeset
|
657 int i = 0; |
29049 | 658 mp_msg(MSGT_AFILTER, MSGL_INFO, "Available audio filters:\n"); |
13269
aa13937da8a0
mplayer -af help now lists all available audio filters.
ivo
parents:
12668
diff
changeset
|
659 while (filter_list[i]) { |
13566
2cfb32a737aa
make af_help conform better to the the afm/vfm/etc equivalents
alex
parents:
13550
diff
changeset
|
660 if (filter_list[i]->comment && filter_list[i]->comment[0]) |
29049 | 661 mp_msg(MSGT_AFILTER, MSGL_INFO, " %-15s: %s (%s)\n", filter_list[i]->name, filter_list[i]->info, filter_list[i]->comment); |
13566
2cfb32a737aa
make af_help conform better to the the afm/vfm/etc equivalents
alex
parents:
13550
diff
changeset
|
662 else |
29049 | 663 mp_msg(MSGT_AFILTER, MSGL_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
|
664 i++; |
aa13937da8a0
mplayer -af help now lists all available audio filters.
ivo
parents:
12668
diff
changeset
|
665 } |
aa13937da8a0
mplayer -af help now lists all available audio filters.
ivo
parents:
12668
diff
changeset
|
666 } |
aa13937da8a0
mplayer -af help now lists all available audio filters.
ivo
parents:
12668
diff
changeset
|
667 |
14818
663c1ea5f595
finally remove the refences to bps outside libaf. also simplification of some messages and removed redundants
alex
parents:
14750
diff
changeset
|
668 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
|
669 { |
663c1ea5f595
finally remove the refences to bps outside libaf. also simplification of some messages and removed redundants
alex
parents:
14750
diff
changeset
|
670 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
|
671 } |