annotate libaf/af.c @ 34507:582ca9169495

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