annotate libaf/af.c @ 18175:01ca8a5fb8a6

minor fixes: get rid of pointless inline attributes and some additional checks fo ppm reading
author reimar
date Fri, 21 Apr 2006 18:46:17 +0000
parents 0aa3fef68422
children 4231482179b6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
1 #include <stdio.h>
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
2 #include <stdlib.h>
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
3 #include <string.h>
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
4
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
5 #ifdef HAVE_MALLOC_H
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
6 #include <malloc.h>
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
7 #endif
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
8
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
9 #include "af.h"
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
10
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
11 // Static list of filters
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
12 extern af_info_t af_info_dummy;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
13 extern af_info_t af_info_delay;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
14 extern af_info_t af_info_channels;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
15 extern af_info_t af_info_format;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
16 extern af_info_t af_info_resample;
7974
db1f16543379 enable volume filter and fix nonsense default volume (still not usable
rfelker
parents: 7745
diff changeset
17 extern af_info_t af_info_volume;
8073
c0e556f9986b Adding equalizer filter + some cosmetics
anders
parents: 7998
diff changeset
18 extern af_info_t af_info_equalizer;
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
19 extern af_info_t af_info_gate;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
20 extern af_info_t af_info_comp;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
21 extern af_info_t af_info_pan;
8678
db0810dcab33 Port of pl_surround.c to af-layer.
ranma
parents: 8607
diff changeset
22 extern af_info_t af_info_surround;
8832
a1578b329cc0 Adding sub-woofer filter, use this filter to add a sub channel to the audio stream
anders
parents: 8711
diff changeset
23 extern af_info_t af_info_sub;
10892
2167ac4c1d72 Adding filter for exporting audio data to visual effect applications
anders
parents: 8969
diff changeset
24 extern af_info_t af_info_export;
13550
81e62cbe57d9 reimplementation of the pl_extrastereo and pl_volnorm plugins
alex
parents: 13269
diff changeset
25 extern af_info_t af_info_volnorm;
81e62cbe57d9 reimplementation of the pl_extrastereo and pl_volnorm plugins
alex
parents: 13269
diff changeset
26 extern af_info_t af_info_extrastereo;
13713
28bb0f15ac91 libavcodec resampling ...
michael
parents: 13566
diff changeset
27 extern af_info_t af_info_lavcresample;
13721
0c2e5c9476df sine sweep generator
michael
parents: 13713
diff changeset
28 extern af_info_t af_info_sweep;
13996
be8f4abbe960 head related transfer function
henry
parents: 13721
diff changeset
29 extern af_info_t af_info_hrtf;
14217
5b5ebf93ec16 Adds support for LADSPA (Linux Audio Developer's Simple Plugin API) plugins.
ivo
parents: 13996
diff changeset
30 extern af_info_t af_info_ladspa;
14750
108423cf7b3f filter for adding a center channel, adding a high pass filter would be nice
alex
parents: 14569
diff changeset
31 extern af_info_t af_info_center;
18082
0aa3fef68422 very simple filter which can remove a sine at a specified frequency, usefull to get rid of the 50/60hz noise on ultra crappy equipment
michael
parents: 17780
diff changeset
32 extern af_info_t af_info_sinesupress;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
33
10908
dcca52fe32bd disable af export for systems without mmap
faust3
parents: 10892
diff changeset
34 static af_info_t* filter_list[]={
dcca52fe32bd disable af export for systems without mmap
faust3
parents: 10892
diff changeset
35 &af_info_dummy,
dcca52fe32bd disable af export for systems without mmap
faust3
parents: 10892
diff changeset
36 &af_info_delay,
dcca52fe32bd disable af export for systems without mmap
faust3
parents: 10892
diff changeset
37 &af_info_channels,
dcca52fe32bd disable af export for systems without mmap
faust3
parents: 10892
diff changeset
38 &af_info_format,
dcca52fe32bd disable af export for systems without mmap
faust3
parents: 10892
diff changeset
39 &af_info_resample,
dcca52fe32bd disable af export for systems without mmap
faust3
parents: 10892
diff changeset
40 &af_info_volume,
dcca52fe32bd disable af export for systems without mmap
faust3
parents: 10892
diff changeset
41 &af_info_equalizer,
dcca52fe32bd disable af export for systems without mmap
faust3
parents: 10892
diff changeset
42 &af_info_gate,
dcca52fe32bd disable af export for systems without mmap
faust3
parents: 10892
diff changeset
43 &af_info_comp,
dcca52fe32bd disable af export for systems without mmap
faust3
parents: 10892
diff changeset
44 &af_info_pan,
dcca52fe32bd disable af export for systems without mmap
faust3
parents: 10892
diff changeset
45 &af_info_surround,
dcca52fe32bd disable af export for systems without mmap
faust3
parents: 10892
diff changeset
46 &af_info_sub,
dcca52fe32bd disable af export for systems without mmap
faust3
parents: 10892
diff changeset
47 #ifdef HAVE_SYS_MMAN_H
dcca52fe32bd disable af export for systems without mmap
faust3
parents: 10892
diff changeset
48 &af_info_export,
dcca52fe32bd disable af export for systems without mmap
faust3
parents: 10892
diff changeset
49 #endif
13550
81e62cbe57d9 reimplementation of the pl_extrastereo and pl_volnorm plugins
alex
parents: 13269
diff changeset
50 &af_info_volnorm,
81e62cbe57d9 reimplementation of the pl_extrastereo and pl_volnorm plugins
alex
parents: 13269
diff changeset
51 &af_info_extrastereo,
13713
28bb0f15ac91 libavcodec resampling ...
michael
parents: 13566
diff changeset
52 #ifdef USE_LIBAVCODEC
28bb0f15ac91 libavcodec resampling ...
michael
parents: 13566
diff changeset
53 &af_info_lavcresample,
28bb0f15ac91 libavcodec resampling ...
michael
parents: 13566
diff changeset
54 #endif
13721
0c2e5c9476df sine sweep generator
michael
parents: 13713
diff changeset
55 &af_info_sweep,
13996
be8f4abbe960 head related transfer function
henry
parents: 13721
diff changeset
56 &af_info_hrtf,
14217
5b5ebf93ec16 Adds support for LADSPA (Linux Audio Developer's Simple Plugin API) plugins.
ivo
parents: 13996
diff changeset
57 #ifdef HAVE_LADSPA
5b5ebf93ec16 Adds support for LADSPA (Linux Audio Developer's Simple Plugin API) plugins.
ivo
parents: 13996
diff changeset
58 &af_info_ladspa,
5b5ebf93ec16 Adds support for LADSPA (Linux Audio Developer's Simple Plugin API) plugins.
ivo
parents: 13996
diff changeset
59 #endif
14750
108423cf7b3f filter for adding a center channel, adding a high pass filter would be nice
alex
parents: 14569
diff changeset
60 &af_info_center,
18082
0aa3fef68422 very simple filter which can remove a sine at a specified frequency, usefull to get rid of the 50/60hz noise on ultra crappy equipment
michael
parents: 17780
diff changeset
61 &af_info_sinesupress,
10908
dcca52fe32bd disable af export for systems without mmap
faust3
parents: 10892
diff changeset
62 NULL
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
63 };
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
64
8167
e8832e66babd New features:
anders
parents: 8073
diff changeset
65 // Message printing
e8832e66babd New features:
anders
parents: 8073
diff changeset
66 af_msg_cfg_t af_msg_cfg={0,NULL,NULL};
e8832e66babd New features:
anders
parents: 8073
diff changeset
67
e8832e66babd New features:
anders
parents: 8073
diff changeset
68 // CPU speed
e8832e66babd New features:
anders
parents: 8073
diff changeset
69 int* af_cpu_speed = NULL;
e8832e66babd New features:
anders
parents: 8073
diff changeset
70
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
71 /* 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
72 function is used internally */
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
73 af_info_t* af_find(char*name)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
74 {
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
75 int i=0;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
76 while(filter_list[i]){
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
77 if(!strcmp(filter_list[i]->name,name))
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
78 return filter_list[i];
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
79 i++;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
80 }
8167
e8832e66babd New features:
anders
parents: 8073
diff changeset
81 af_msg(AF_MSG_ERROR,"Couldn't find audio filter '%s'\n",name);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
82 return NULL;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
83 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
84
7615
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
85 /* 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
86 function is used for finding already initialized filters */
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
87 af_instance_t* af_get(af_stream_t* s, char* name)
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
88 {
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
89 af_instance_t* af=s->first;
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
90 // Find the filter
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
91 while(af != NULL){
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
92 if(!strcmp(af->info->name,name))
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
93 return af;
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
94 af=af->next;
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
95 }
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
96 return NULL;
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
97 }
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
98
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
99 /*/ 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
100 contain the commandline parameters for the filter */
7615
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
101 af_instance_t* af_create(af_stream_t* s, char* name)
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
102 {
7993
ea0680d87f3f Changing the behavour of the commandline parameter -af to conform with -vop. Adding new commanline parameter -af-adv for advanced af options. Adding changes to volume control to support commandline parameters.
anders
parents: 7974
diff changeset
103 char* cmdline = name;
7998
d48a06d07afb Adding commandline options for filters and fixing stupid bug in cfg
anders
parents: 7993
diff changeset
104
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
105 // Allocate space for the new filter and reset all pointers
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
106 af_instance_t* new=malloc(sizeof(af_instance_t));
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
107 if(!new){
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
108 af_msg(AF_MSG_ERROR,"[libaf] Could not allocate memory\n");
17780
16c347e53841 fix memory leak when filter with given name does not exist.
reimar
parents: 16815
diff changeset
109 goto err_out;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
110 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
111 memset(new,0,sizeof(af_instance_t));
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
112
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
113 // 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
114 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
115
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
116 // Find filter from name
7615
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
117 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
118 goto err_out;
7615
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
119
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
120 /* 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
121 non-reentrant */
7615
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
122 if(new->info->flags & AF_FLAGS_NOT_REENTRANT){
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
123 if(af_get(s,name)){
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
124 af_msg(AF_MSG_ERROR,"[libaf] There can only be one instance of"
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
125 " 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
126 goto err_out;
7615
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
127 }
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
128 }
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
129
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
130 af_msg(AF_MSG_VERBOSE,"[libaf] Adding filter %s \n",name);
7993
ea0680d87f3f Changing the behavour of the commandline parameter -af to conform with -vop. Adding new commanline parameter -af-adv for advanced af options. Adding changes to volume control to support commandline parameters.
anders
parents: 7974
diff changeset
131
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
132 // Initialize the new filter
7745
1d3a3dc1f488 Adding volume control and moving control() call parameters to a seperate file
anders
parents: 7665
diff changeset
133 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
134 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
135 if(cmdline){
ea0680d87f3f Changing the behavour of the commandline parameter -af to conform with -vop. Adding new commanline parameter -af-adv for advanced af options. Adding changes to volume control to support commandline parameters.
anders
parents: 7974
diff changeset
136 if(AF_ERROR<new->control(new,AF_CONTROL_COMMAND_LINE,cmdline))
ea0680d87f3f Changing the behavour of the commandline parameter -af to conform with -vop. Adding new commanline parameter -af-adv for advanced af options. Adding changes to volume control to support commandline parameters.
anders
parents: 7974
diff changeset
137 return new;
ea0680d87f3f Changing the behavour of the commandline parameter -af to conform with -vop. Adding new commanline parameter -af-adv for advanced af options. Adding changes to volume control to support commandline parameters.
anders
parents: 7974
diff changeset
138 }
ea0680d87f3f Changing the behavour of the commandline parameter -af to conform with -vop. Adding new commanline parameter -af-adv for advanced af options. Adding changes to volume control to support commandline parameters.
anders
parents: 7974
diff changeset
139 else
ea0680d87f3f Changing the behavour of the commandline parameter -af to conform with -vop. Adding new commanline parameter -af-adv for advanced af options. Adding changes to volume control to support commandline parameters.
anders
parents: 7974
diff changeset
140 return new;
ea0680d87f3f Changing the behavour of the commandline parameter -af to conform with -vop. Adding new commanline parameter -af-adv for advanced af options. Adding changes to volume control to support commandline parameters.
anders
parents: 7974
diff changeset
141 }
7745
1d3a3dc1f488 Adding volume control and moving control() call parameters to a seperate file
anders
parents: 7665
diff changeset
142
17780
16c347e53841 fix memory leak when filter with given name does not exist.
reimar
parents: 16815
diff changeset
143 err_out:
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
144 free(new);
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
145 af_msg(AF_MSG_ERROR,"[libaf] Couldn't create or open audio filter '%s'\n",
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
146 name);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
147 return NULL;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
148 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
149
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
150 /* 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
151 argument. This function can be called during runtime, the return
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
152 value is the new filter */
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
153 af_instance_t* af_prepend(af_stream_t* s, af_instance_t* af, char* name)
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
154 {
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
155 // Create the new filter and make sure it is OK
7615
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
156 af_instance_t* new=af_create(s,name);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
157 if(!new)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
158 return NULL;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
159 // Update pointers
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
160 new->next=af;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
161 if(af){
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
162 new->prev=af->prev;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
163 af->prev=new;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
164 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
165 else
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
166 s->last=new;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
167 if(new->prev)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
168 new->prev->next=new;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
169 else
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
170 s->first=new;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
171 return new;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
172 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
173
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
174 /* 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
175 argument. This function can be called during runtime, the return
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
176 value is the new filter */
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
177 af_instance_t* af_append(af_stream_t* s, af_instance_t* af, char* name)
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
178 {
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
179 // Create the new filter and make sure it is OK
7615
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
180 af_instance_t* new=af_create(s,name);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
181 if(!new)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
182 return NULL;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
183 // Update pointers
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
184 new->prev=af;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
185 if(af){
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
186 new->next=af->next;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
187 af->next=new;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
188 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
189 else
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
190 s->first=new;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
191 if(new->next)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
192 new->next->prev=new;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
193 else
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
194 s->last=new;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
195 return new;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
196 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
197
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
198 // 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
199 void af_remove(af_stream_t* s, af_instance_t* af)
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
200 {
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
201 if(!af) return;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
202
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
203 // Print friendly message
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
204 af_msg(AF_MSG_VERBOSE,"[libaf] Removing filter %s \n",af->info->name);
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
205
7745
1d3a3dc1f488 Adding volume control and moving control() call parameters to a seperate file
anders
parents: 7665
diff changeset
206 // Notify filter before changing anything
1d3a3dc1f488 Adding volume control and moving control() call parameters to a seperate file
anders
parents: 7665
diff changeset
207 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
208
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
209 // Detach pointers
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
210 if(af->prev)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
211 af->prev->next=af->next;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
212 else
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
213 s->first=af->next;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
214 if(af->next)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
215 af->next->prev=af->prev;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
216 else
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
217 s->last=af->prev;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
218
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
219 // Uninitialize af and free memory
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
220 af->uninit(af);
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
221 free(af);
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
222 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
223
7649
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
224 /* Reinitializes all filters downstream from the filter given in the
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
225 argument the return value is AF_OK if success and AF_ERROR if
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
226 failure */
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
227 int af_reinit(af_stream_t* s, af_instance_t* af)
7568
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 do{
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
230 af_data_t in; // Format of the input to current filter
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
231 int rv=0; // Return value
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
232
15191
7eab9c86ae19 change list traversal so the loop begins at the first filter after removing
henry
parents: 14818
diff changeset
233 // 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
234 if(NULL == af){
7eab9c86ae19 change list traversal so the loop begins at the first filter after removing
henry
parents: 14818
diff changeset
235 if(!(af=af_append(s,s->first,"dummy")))
7eab9c86ae19 change list traversal so the loop begins at the first filter after removing
henry
parents: 14818
diff changeset
236 return AF_UNKNOWN;
7eab9c86ae19 change list traversal so the loop begins at the first filter after removing
henry
parents: 14818
diff changeset
237 else
7eab9c86ae19 change list traversal so the loop begins at the first filter after removing
henry
parents: 14818
diff changeset
238 return AF_ERROR;
7eab9c86ae19 change list traversal so the loop begins at the first filter after removing
henry
parents: 14818
diff changeset
239 }
7eab9c86ae19 change list traversal so the loop begins at the first filter after removing
henry
parents: 14818
diff changeset
240
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
241 // Check if this is the first filter
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
242 if(!af->prev)
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
243 memcpy(&in,&(s->input),sizeof(af_data_t));
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
244 else
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
245 memcpy(&in,af->prev->data,sizeof(af_data_t));
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
246 // Reset just in case...
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
247 in.audio=NULL;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
248 in.len=0;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
249
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
250 rv = af->control(af,AF_CONTROL_REINIT,&in);
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
251 switch(rv){
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
252 case AF_OK:
15191
7eab9c86ae19 change list traversal so the loop begins at the first filter after removing
henry
parents: 14818
diff changeset
253 af = af->next;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
254 break;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
255 case AF_FALSE:{ // Configuration filter is needed
8167
e8832e66babd New features:
anders
parents: 8073
diff changeset
256 // Do auto insertion only if force is not specified
e8832e66babd New features:
anders
parents: 8073
diff changeset
257 if((AF_INIT_TYPE_MASK & s->cfg.force) != AF_INIT_FORCE){
e8832e66babd New features:
anders
parents: 8073
diff changeset
258 af_instance_t* new = NULL;
e8832e66babd New features:
anders
parents: 8073
diff changeset
259 // Insert channels filter
e8832e66babd New features:
anders
parents: 8073
diff changeset
260 if((af->prev?af->prev->data->nch:s->input.nch) != in.nch){
e8832e66babd New features:
anders
parents: 8073
diff changeset
261 // Create channels filter
e8832e66babd New features:
anders
parents: 8073
diff changeset
262 if(NULL == (new = af_prepend(s,af,"channels")))
e8832e66babd New features:
anders
parents: 8073
diff changeset
263 return AF_ERROR;
e8832e66babd New features:
anders
parents: 8073
diff changeset
264 // Set number of output channels
e8832e66babd New features:
anders
parents: 8073
diff changeset
265 if(AF_OK != (rv = new->control(new,AF_CONTROL_CHANNELS,&in.nch)))
e8832e66babd New features:
anders
parents: 8073
diff changeset
266 return rv;
e8832e66babd New features:
anders
parents: 8073
diff changeset
267 // Initialize channels filter
e8832e66babd New features:
anders
parents: 8073
diff changeset
268 if(!new->prev)
e8832e66babd New features:
anders
parents: 8073
diff changeset
269 memcpy(&in,&(s->input),sizeof(af_data_t));
e8832e66babd New features:
anders
parents: 8073
diff changeset
270 else
e8832e66babd New features:
anders
parents: 8073
diff changeset
271 memcpy(&in,new->prev->data,sizeof(af_data_t));
e8832e66babd New features:
anders
parents: 8073
diff changeset
272 if(AF_OK != (rv = new->control(new,AF_CONTROL_REINIT,&in)))
e8832e66babd New features:
anders
parents: 8073
diff changeset
273 return rv;
e8832e66babd New features:
anders
parents: 8073
diff changeset
274 }
e8832e66babd New features:
anders
parents: 8073
diff changeset
275 // 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
276 if((af->prev?af->prev->data->format:s->input.format) != in.format){
8167
e8832e66babd New features:
anders
parents: 8073
diff changeset
277 // Create format filter
e8832e66babd New features:
anders
parents: 8073
diff changeset
278 if(NULL == (new = af_prepend(s,af,"format")))
e8832e66babd New features:
anders
parents: 8073
diff changeset
279 return AF_ERROR;
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
280 // 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
281 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
282 if(AF_OK != (rv = new->control(new,AF_CONTROL_FORMAT_FMT,&in.format)))
8167
e8832e66babd New features:
anders
parents: 8073
diff changeset
283 return rv;
e8832e66babd New features:
anders
parents: 8073
diff changeset
284 // Initialize format filter
e8832e66babd New features:
anders
parents: 8073
diff changeset
285 if(!new->prev)
e8832e66babd New features:
anders
parents: 8073
diff changeset
286 memcpy(&in,&(s->input),sizeof(af_data_t));
e8832e66babd New features:
anders
parents: 8073
diff changeset
287 else
e8832e66babd New features:
anders
parents: 8073
diff changeset
288 memcpy(&in,new->prev->data,sizeof(af_data_t));
e8832e66babd New features:
anders
parents: 8073
diff changeset
289 if(AF_OK != (rv = new->control(new,AF_CONTROL_REINIT,&in)))
e8832e66babd New features:
anders
parents: 8073
diff changeset
290 return rv;
e8832e66babd New features:
anders
parents: 8073
diff changeset
291 }
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
292 if(!new){ // Should _never_ happen
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
293 af_msg(AF_MSG_ERROR,"[libaf] Unable to correct audio format. "
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
294 "This error should never uccur, please send bugreport.\n");
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
295 return AF_ERROR;
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
296 }
15191
7eab9c86ae19 change list traversal so the loop begins at the first filter after removing
henry
parents: 14818
diff changeset
297 af=new->next;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
298 }
16072
456246827b88 Avoid hang with -af-adv force=3
reimar
parents: 15811
diff changeset
299 else {
456246827b88 Avoid hang with -af-adv force=3
reimar
parents: 15811
diff changeset
300 af_msg(AF_MSG_ERROR, "[libaf] Automatic filter insertion disabled "
456246827b88 Avoid hang with -af-adv force=3
reimar
parents: 15811
diff changeset
301 "but formats do not match. Giving up.\n");
456246827b88 Avoid hang with -af-adv force=3
reimar
parents: 15811
diff changeset
302 return AF_ERROR;
456246827b88 Avoid hang with -af-adv force=3
reimar
parents: 15811
diff changeset
303 }
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
304 break;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
305 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
306 case AF_DETACH:{ // Filter is redundant and wants to be unloaded
8167
e8832e66babd New features:
anders
parents: 8073
diff changeset
307 // Do auto remove only if force is not specified
e8832e66babd New features:
anders
parents: 8073
diff changeset
308 if((AF_INIT_TYPE_MASK & s->cfg.force) != AF_INIT_FORCE){
e8832e66babd New features:
anders
parents: 8073
diff changeset
309 af_instance_t* aft=af->prev;
e8832e66babd New features:
anders
parents: 8073
diff changeset
310 af_remove(s,af);
e8832e66babd New features:
anders
parents: 8073
diff changeset
311 if(aft)
15191
7eab9c86ae19 change list traversal so the loop begins at the first filter after removing
henry
parents: 14818
diff changeset
312 af=aft->next;
8167
e8832e66babd New features:
anders
parents: 8073
diff changeset
313 else
e8832e66babd New features:
anders
parents: 8073
diff changeset
314 af=s->first; // Restart configuration
e8832e66babd New features:
anders
parents: 8073
diff changeset
315 }
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
316 break;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
317 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
318 default:
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
319 af_msg(AF_MSG_ERROR,"[libaf] Reinitialization did not work, audio"
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
320 " filter '%s' returned error code %i\n",af->info->name,rv);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
321 return AF_ERROR;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
322 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
323 }while(af);
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
324 return AF_OK;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
325 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
326
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
327 // 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
328 void af_uninit(af_stream_t* s)
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
329 {
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
330 while(s->first)
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
331 af_remove(s,s->first);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
332 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
333
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
334 /* 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
335 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
336 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
337 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
338 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
339 stream will be reinitialized.
9b4bbb6098f6 make -srate work again, unify audio filter init and preinit.
reimar
parents: 15791
diff changeset
340 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
341 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
342 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
343 int af_init(af_stream_t* s)
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
344 {
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
345 int i=0;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
346
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
347 // Sanity check
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
348 if(!s) return -1;
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
349
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
350 // 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
351 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
352 s->input.len = s->output.len = 0;
7568
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 // Figure out how fast the machine is
8167
e8832e66babd New features:
anders
parents: 8073
diff changeset
355 if(AF_INIT_AUTO == (AF_INIT_TYPE_MASK & s->cfg.force))
e8832e66babd New features:
anders
parents: 8073
diff changeset
356 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
357
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
358 // 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
359 if(!s->first){
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
360 // Add all filters in the list (if there are any)
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
361 if(!s->cfg.list){ // To make automatic format conversion work
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
362 if(!af_append(s,s->first,"dummy"))
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
363 return -1;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
364 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
365 else{
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
366 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
367 if(!af_append(s,s->last,s->cfg.list[i++]))
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
368 return -1;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
369 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
370 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
371 }
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
372
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
373 // Init filters
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
374 if(AF_OK != af_reinit(s,s->first))
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
375 return -1;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
376
15312
0313ef8b0730 Prevent segfault when filter chain is empty (e.g. because all
reimar
parents: 15191
diff changeset
377 // 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
378 if (!s->first)
0313ef8b0730 Prevent segfault when filter chain is empty (e.g. because all
reimar
parents: 15191
diff changeset
379 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
380 return -1;
0313ef8b0730 Prevent segfault when filter chain is empty (e.g. because all
reimar
parents: 15191
diff changeset
381
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
382 // Check output format
7745
1d3a3dc1f488 Adding volume control and moving control() call parameters to a seperate file
anders
parents: 7665
diff changeset
383 if((AF_INIT_TYPE_MASK & s->cfg.force) != AF_INIT_FORCE){
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
384 af_instance_t* af = NULL; // New filter
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
385 // 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
386 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
387 // try to find a filter that can change samplrate
9261d7dcf5e7 Use lavcresample only when libavcodec is compiled in.
reimar
parents: 14292
diff changeset
388 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
389 &(s->output.rate));
9261d7dcf5e7 Use lavcresample only when libavcodec is compiled in.
reimar
parents: 14292
diff changeset
390 if (!af) {
9261d7dcf5e7 Use lavcresample only when libavcodec is compiled in.
reimar
parents: 14292
diff changeset
391 char *resampler = "resample";
9261d7dcf5e7 Use lavcresample only when libavcodec is compiled in.
reimar
parents: 14292
diff changeset
392 #ifdef USE_LIBAVCODEC
9261d7dcf5e7 Use lavcresample only when libavcodec is compiled in.
reimar
parents: 14292
diff changeset
393 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
394 resampler = "lavcresample";
9261d7dcf5e7 Use lavcresample only when libavcodec is compiled in.
reimar
parents: 14292
diff changeset
395 #endif
7745
1d3a3dc1f488 Adding volume control and moving control() call parameters to a seperate file
anders
parents: 7665
diff changeset
396 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
397 if(!strcmp(s->first->info->name,"format"))
14326
9261d7dcf5e7 Use lavcresample only when libavcodec is compiled in.
reimar
parents: 14292
diff changeset
398 af = af_append(s,s->first,resampler);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
399 else
14326
9261d7dcf5e7 Use lavcresample only when libavcodec is compiled in.
reimar
parents: 14292
diff changeset
400 af = af_prepend(s,s->first,resampler);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
401 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
402 else{
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
403 if(!strcmp(s->last->info->name,"format"))
14326
9261d7dcf5e7 Use lavcresample only when libavcodec is compiled in.
reimar
parents: 14292
diff changeset
404 af = af_prepend(s,s->last,resampler);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
405 else
14326
9261d7dcf5e7 Use lavcresample only when libavcodec is compiled in.
reimar
parents: 14292
diff changeset
406 af = af_append(s,s->last,resampler);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
407 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
408 // Init the new filter
15191
7eab9c86ae19 change list traversal so the loop begins at the first filter after removing
henry
parents: 14818
diff changeset
409 if(!af || (AF_OK != af->control(af,AF_CONTROL_RESAMPLE_RATE | AF_CONTROL_SET,
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
410 &(s->output.rate))))
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
411 return -1;
11859
b8bee4f4b8bb if the user wants fast, use fast code! otherwise the user has to put
rfelker
parents: 10908
diff changeset
412 // 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
413 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
414 char args[32];
14326
9261d7dcf5e7 Use lavcresample only when libavcodec is compiled in.
reimar
parents: 14292
diff changeset
415 sprintf(args, "%d", s->output.rate);
9261d7dcf5e7 Use lavcresample only when libavcodec is compiled in.
reimar
parents: 14292
diff changeset
416 #ifdef USE_LIBAVCODEC
9261d7dcf5e7 Use lavcresample only when libavcodec is compiled in.
reimar
parents: 14292
diff changeset
417 if (strcmp(resampler, "lavcresample") == 0)
9261d7dcf5e7 Use lavcresample only when libavcodec is compiled in.
reimar
parents: 14292
diff changeset
418 strcat(args, ":1");
9261d7dcf5e7 Use lavcresample only when libavcodec is compiled in.
reimar
parents: 14292
diff changeset
419 else
9261d7dcf5e7 Use lavcresample only when libavcodec is compiled in.
reimar
parents: 14292
diff changeset
420 #endif
9261d7dcf5e7 Use lavcresample only when libavcodec is compiled in.
reimar
parents: 14292
diff changeset
421 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
422 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
423 }
14326
9261d7dcf5e7 Use lavcresample only when libavcodec is compiled in.
reimar
parents: 14292
diff changeset
424 }
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
425 if(AF_OK != af_reinit(s,af))
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
426 return -1;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
427 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
428
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
429 // Check number of output channels fix if not OK
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
430 // If needed always inserted last -> easy to screw up other filters
15811
9b4bbb6098f6 make -srate work again, unify audio filter init and preinit.
reimar
parents: 15791
diff changeset
431 if(s->output.nch && s->last->data->nch!=s->output.nch){
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
432 if(!strcmp(s->last->info->name,"format"))
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
433 af = af_prepend(s,s->last,"channels");
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
434 else
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
435 af = af_append(s,s->last,"channels");
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
436 // Init the new filter
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
437 if(!af || (AF_OK != af->control(af,AF_CONTROL_CHANNELS,&(s->output.nch))))
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
438 return -1;
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
439 if(AF_OK != af_reinit(s,af))
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
440 return -1;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
441 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
442
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
443 // Check output format fix if not OK
15811
9b4bbb6098f6 make -srate work again, unify audio filter init and preinit.
reimar
parents: 15791
diff changeset
444 if(s->output.format && s->last->data->format != s->output.format){
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
445 if(strcmp(s->last->info->name,"format"))
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
446 af = af_append(s,s->last,"format");
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
447 else
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
448 af = s->last;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
449 // Init the new filter
14335
8380694ba14f af_bits2fmt and af_str2fmt_short, also removed the extra FORMAT_BPS control in format.c
alex
parents: 14326
diff changeset
450 s->output.format |= af_bits2fmt(s->output.bps*8);
8380694ba14f af_bits2fmt and af_str2fmt_short, also removed the extra FORMAT_BPS control in format.c
alex
parents: 14326
diff changeset
451 if(!af || (AF_OK != af->control(af,AF_CONTROL_FORMAT_FMT,&(s->output.format))))
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
452 return -1;
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
453 if(AF_OK != af_reinit(s,af))
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
454 return -1;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
455 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
456
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
457 // Re init again just in case
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
458 if(AF_OK != af_reinit(s,s->first))
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
459 return -1;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
460
15811
9b4bbb6098f6 make -srate work again, unify audio filter init and preinit.
reimar
parents: 15791
diff changeset
461 if (!s->output.format) s->output.format = s->last->data->format;
9b4bbb6098f6 make -srate work again, unify audio filter init and preinit.
reimar
parents: 15791
diff changeset
462 if (!s->output.nch) s->output.nch = s->last->data->nch;
9b4bbb6098f6 make -srate work again, unify audio filter init and preinit.
reimar
parents: 15791
diff changeset
463 if (!s->output.rate) s->output.rate = s->last->data->rate;
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
464 if((s->last->data->format != s->output.format) ||
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
465 (s->last->data->nch != s->output.nch) ||
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
466 (s->last->data->rate != s->output.rate)) {
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
467 // Something is stuffed audio out will not work
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
468 af_msg(AF_MSG_ERROR,"[libaf] Unable to setup filter system can not"
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
469 " meet sound-card demands, please send bugreport. \n");
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
470 af_uninit(s);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
471 return -1;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
472 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
473 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
474 return 0;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
475 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
476
7649
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
477 /* Add filter during execution. This function adds the filter "name"
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
478 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
479 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
480 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
481 af_instance_t* af_add(af_stream_t* s, char* name){
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
482 af_instance_t* new;
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
483 // Sanity check
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
484 if(!s || !s->first || !name)
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
485 return NULL;
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
486 // Insert the filter somwhere nice
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
487 if(!strcmp(s->first->info->name,"format"))
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
488 new = af_append(s, s->first, name);
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
489 else
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
490 new = af_prepend(s, s->first, name);
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
491 if(!new)
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
492 return NULL;
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
493
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
494 // Reinitalize the filter list
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
495 if(AF_OK != af_reinit(s, s->first)){
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
496 free(new);
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
497 return NULL;
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
498 }
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
499 return new;
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
500 }
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
501
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
502 // 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
503 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
504 {
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
505 af_instance_t* af=s->first;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
506 // Iterate through all filters
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
507 do{
16815
78c84594247b semi-hack: avoid passing 0-length blocks to audio filters.
reimar
parents: 16627
diff changeset
508 if (data->len <= 0) break;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
509 data=af->play(af,data);
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
510 af=af->next;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
511 }while(af);
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
512 return data;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
513 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
514
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
515 /* Helper function used to calculate the exact buffer length needed
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
516 when buffers are resized. The returned length is >= than what is
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
517 needed */
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
518 inline int af_lencalc(frac_t mul, af_data_t* d){
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
519 register int t = d->bps*d->nch;
7590
0cba73469341 Fixing the fix buffer overrun should work now
anders
parents: 7589
diff changeset
520 return t*(((d->len/t)*mul.n)/mul.d + 1);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
521 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
522
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
523 /* Calculate how long the output from the filters will be given the
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
524 input length "len". The calculated length is >= the actual
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
525 length. */
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
526 int af_outputlen(af_stream_t* s, int len)
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
527 {
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
528 int t = s->input.bps*s->input.nch;
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
529 af_instance_t* af=s->first;
14569
408dfb63ff95 Make this file compile with gcc-4.0.0:
gpoirier
parents: 14433
diff changeset
530 frac_t mul = {1,1};
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
531 // Iterate through all filters
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
532 do{
14433
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
533 af_frac_mul(&mul, &af->mul);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
534 af=af->next;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
535 }while(af);
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
536 return t * (((len/t)*mul.n + 1)/mul.d);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
537 }
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 /* Calculate how long the input to the filters should be to produce a
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
540 certain output length, i.e. the return value of this function is
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
541 the input length required to produce the output length "len". The
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
542 calculated length is <= the actual length */
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
543 int af_inputlen(af_stream_t* s, int len)
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
544 {
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
545 int t = s->input.bps*s->input.nch;
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
546 af_instance_t* af=s->first;
14569
408dfb63ff95 Make this file compile with gcc-4.0.0:
gpoirier
parents: 14433
diff changeset
547 frac_t mul = {1,1};
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
548 // Iterate through all filters
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
549 do{
14433
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
550 af_frac_mul(&mul, &af->mul);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
551 af=af->next;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
552 }while(af);
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
553 return t * (((len/t) * mul.d - 1)/mul.n);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
554 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
555
7598
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
556 /* Calculate how long the input IN to the filters should be to produce
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
557 a certain output length OUT but with the following three constraints:
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
558 1. IN <= max_insize, where max_insize is the maximum possible input
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
559 block length
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
560 2. OUT <= max_outsize, where max_outsize is the maximum possible
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
561 output block length
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
562 3. If possible OUT >= len.
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
563 Return -1 in case of error */
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
564 int af_calc_insize_constrained(af_stream_t* s, int len,
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
565 int max_outsize,int max_insize)
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
566 {
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
567 int t = s->input.bps*s->input.nch;
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
568 int in = 0;
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
569 int out = 0;
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
570 af_instance_t* af=s->first;
14569
408dfb63ff95 Make this file compile with gcc-4.0.0:
gpoirier
parents: 14433
diff changeset
571 frac_t mul = {1,1};
7598
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
572 // Iterate through all filters and calculate total multiplication factor
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
573 do{
14433
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
574 af_frac_mul(&mul, &af->mul);
7598
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
575 af=af->next;
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
576 }while(af);
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
577 // Sanity check
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
578 if(!mul.n || !mul.d)
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
579 return -1;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
580
7603
c89106306f5a af_calc_insize_constrained() rounding changes, works better for me this way
arpi
parents: 7599
diff changeset
581 in = t * (((len/t) * mul.d - 1)/mul.n);
c89106306f5a af_calc_insize_constrained() rounding changes, works better for me this way
arpi
parents: 7599
diff changeset
582
c89106306f5a af_calc_insize_constrained() rounding changes, works better for me this way
arpi
parents: 7599
diff changeset
583 if(in>max_insize) in=t*(max_insize/t);
7598
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
584
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
585 // Try to meet constraint nr 3.
7612
arpi
parents: 7603
diff changeset
586 while((out=t * (((in/t+1)*mul.n - 1)/mul.d)) <= max_outsize && in<=max_insize){
7603
c89106306f5a af_calc_insize_constrained() rounding changes, works better for me this way
arpi
parents: 7599
diff changeset
587 if( (t * (((in/t)*mul.n))/mul.d) >= len) return in;
7598
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
588 in+=t;
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
589 }
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
590
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
591 // Could no meet constraint nr 3.
7603
c89106306f5a af_calc_insize_constrained() rounding changes, works better for me this way
arpi
parents: 7599
diff changeset
592 while(out > max_outsize || in > max_insize){
7598
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
593 in-=t;
7603
c89106306f5a af_calc_insize_constrained() rounding changes, works better for me this way
arpi
parents: 7599
diff changeset
594 if(in<t) return -1; // Input parameters are probably incorrect
7598
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
595 out = t * (((in/t)*mul.n + 1)/mul.d);
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
596 }
7603
c89106306f5a af_calc_insize_constrained() rounding changes, works better for me this way
arpi
parents: 7599
diff changeset
597 return in;
7598
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
598 }
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
599
7665
fbd5445cc853 Adding function for calculating the delay caused by the filters
anders
parents: 7649
diff changeset
600 /* Calculate the total delay [ms] caused by the filters */
fbd5445cc853 Adding function for calculating the delay caused by the filters
anders
parents: 7649
diff changeset
601 double af_calc_delay(af_stream_t* s)
fbd5445cc853 Adding function for calculating the delay caused by the filters
anders
parents: 7649
diff changeset
602 {
fbd5445cc853 Adding function for calculating the delay caused by the filters
anders
parents: 7649
diff changeset
603 af_instance_t* af=s->first;
fbd5445cc853 Adding function for calculating the delay caused by the filters
anders
parents: 7649
diff changeset
604 register double delay = 0.0;
fbd5445cc853 Adding function for calculating the delay caused by the filters
anders
parents: 7649
diff changeset
605 // Iterate through all filters
fbd5445cc853 Adding function for calculating the delay caused by the filters
anders
parents: 7649
diff changeset
606 while(af){
fbd5445cc853 Adding function for calculating the delay caused by the filters
anders
parents: 7649
diff changeset
607 delay += af->delay;
fbd5445cc853 Adding function for calculating the delay caused by the filters
anders
parents: 7649
diff changeset
608 af=af->next;
fbd5445cc853 Adding function for calculating the delay caused by the filters
anders
parents: 7649
diff changeset
609 }
fbd5445cc853 Adding function for calculating the delay caused by the filters
anders
parents: 7649
diff changeset
610 return delay;
fbd5445cc853 Adding function for calculating the delay caused by the filters
anders
parents: 7649
diff changeset
611 }
fbd5445cc853 Adding function for calculating the delay caused by the filters
anders
parents: 7649
diff changeset
612
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
613 /* Helper function called by the macro with the same name this
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
614 function should not be called directly */
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
615 inline int af_resize_local_buffer(af_instance_t* af, af_data_t* data)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
616 {
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
617 // Calculate new length
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
618 register int len = af_lencalc(af->mul,data);
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
619 af_msg(AF_MSG_VERBOSE,"[libaf] Reallocating memory in module %s, "
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
620 "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
621 // If there is a buffer free it
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
622 if(af->data->audio)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
623 free(af->data->audio);
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
624 // Create new buffer and check that it is OK
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
625 af->data->audio = malloc(len);
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
626 if(!af->data->audio){
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
627 af_msg(AF_MSG_FATAL,"[libaf] Could not allocate memory \n");
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
628 return AF_ERROR;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
629 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
630 af->data->len=len;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
631 return AF_OK;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
632 }
12668
ce6ab8cb8597 Send a command throught the filter chain until some item returns AF_OK. Patch by Reimar Doeffinger
alex
parents: 11859
diff changeset
633
16627
584bd8980d57 documentation-only patch: make doxygen compatible and create
reimar
parents: 16072
diff changeset
634 // documentation in af.h
14292
12239a0d5408 Make af_control_any_rev return the matching filter
reimar
parents: 14243
diff changeset
635 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
636 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
637 af_instance_t* filt = s->last;
14292
12239a0d5408 Make af_control_any_rev return the matching filter
reimar
parents: 14243
diff changeset
638 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
639 res = filt->control(filt, cmd, arg);
14292
12239a0d5408 Make af_control_any_rev return the matching filter
reimar
parents: 14243
diff changeset
640 if (res == AF_OK)
12239a0d5408 Make af_control_any_rev return the matching filter
reimar
parents: 14243
diff changeset
641 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
642 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
643 }
14292
12239a0d5408 Make af_control_any_rev return the matching filter
reimar
parents: 14243
diff changeset
644 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
645 }
ce6ab8cb8597 Send a command throught the filter chain until some item returns AF_OK. Patch by Reimar Doeffinger
alex
parents: 11859
diff changeset
646
14433
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
647 /**
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
648 * \brief calculate greatest common divisior of a and b.
16627
584bd8980d57 documentation-only patch: make doxygen compatible and create
reimar
parents: 16072
diff changeset
649 * \ingroup af_filter
584bd8980d57 documentation-only patch: make doxygen compatible and create
reimar
parents: 16072
diff changeset
650 *
14433
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
651 * Extended for negative and 0 values. If both are 0 the result is 1.
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
652 * The sign of the result will be so that it has the same sign as b.
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
653 */
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
654 int af_gcd(register int a, register int b) {
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
655 int b_org = b;
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
656 while (b != 0) {
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
657 a %= b;
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
658 if (a == 0)
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
659 break;
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
660 b %= a;
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
661 }
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
662 // the result is either in a or b. As the other one is 0 just add them.
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
663 a += b;
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
664 if (!a)
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
665 return 1;
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
666 if (a * b_org < 0)
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
667 return -a;
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
668 return a;
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
669 }
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
670
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
671 /**
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
672 * \brief cancel down a fraction f
16627
584bd8980d57 documentation-only patch: make doxygen compatible and create
reimar
parents: 16072
diff changeset
673 * \param f fraction to cancel down
584bd8980d57 documentation-only patch: make doxygen compatible and create
reimar
parents: 16072
diff changeset
674 * \ingroup af_filter
14433
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
675 */
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
676 void af_frac_cancel(frac_t *f) {
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
677 int gcd = af_gcd(f->n, f->d);
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
678 f->n /= gcd;
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
679 f->d /= gcd;
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
680 }
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
681
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
682 /**
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
683 * \brief multiply out by in and store result in out.
16627
584bd8980d57 documentation-only patch: make doxygen compatible and create
reimar
parents: 16072
diff changeset
684 * \param out [inout] fraction to multiply by in
584bd8980d57 documentation-only patch: make doxygen compatible and create
reimar
parents: 16072
diff changeset
685 * \param in [in] fraction to multiply out by
584bd8980d57 documentation-only patch: make doxygen compatible and create
reimar
parents: 16072
diff changeset
686 * \ingroup af_filter
584bd8980d57 documentation-only patch: make doxygen compatible and create
reimar
parents: 16072
diff changeset
687 *
584bd8980d57 documentation-only patch: make doxygen compatible and create
reimar
parents: 16072
diff changeset
688 * the resulting fraction will be cancelled down
14433
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
689 * if in and out were.
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
690 */
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
691 void af_frac_mul(frac_t *out, const frac_t *in) {
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
692 int gcd1 = af_gcd(out->n, in->d);
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
693 int gcd2 = af_gcd(in->n, out->d);
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
694 out->n = (out->n / gcd1) * (in->n / gcd2);
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
695 out->d = (out->d / gcd2) * (in->d / gcd1);
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
696 }
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 14335
diff changeset
697
13269
aa13937da8a0 mplayer -af help now lists all available audio filters.
ivo
parents: 12668
diff changeset
698 void af_help (void) {
aa13937da8a0 mplayer -af help now lists all available audio filters.
ivo
parents: 12668
diff changeset
699 int i = 0;
13566
2cfb32a737aa make af_help conform better to the the afm/vfm/etc equivalents
alex
parents: 13550
diff changeset
700 af_msg(AF_MSG_INFO, "Available audio filters:\n");
15789
32d9c8a0a02b adds some more -identify output, patch by kiriuja < mplayer DASH patches PAM en DASH directo POUM net>
gpoirier
parents: 15312
diff changeset
701 if (identify)
15791
8f34f3636322 Fix mp_msg vs af_msg usage as pointed out by Ivo.
diego
parents: 15789
diff changeset
702 af_msg(AF_MSG_INFO, "ID_AUDIO_FILTERS\n");
13269
aa13937da8a0 mplayer -af help now lists all available audio filters.
ivo
parents: 12668
diff changeset
703 while (filter_list[i]) {
13566
2cfb32a737aa make af_help conform better to the the afm/vfm/etc equivalents
alex
parents: 13550
diff changeset
704 if (filter_list[i]->comment && filter_list[i]->comment[0])
2cfb32a737aa make af_help conform better to the the afm/vfm/etc equivalents
alex
parents: 13550
diff changeset
705 af_msg(AF_MSG_INFO, " %-15s: %s (%s)\n", filter_list[i]->name, filter_list[i]->info, filter_list[i]->comment);
2cfb32a737aa make af_help conform better to the the afm/vfm/etc equivalents
alex
parents: 13550
diff changeset
706 else
2cfb32a737aa make af_help conform better to the the afm/vfm/etc equivalents
alex
parents: 13550
diff changeset
707 af_msg(AF_MSG_INFO, " %-15s: %s\n", filter_list[i]->name, filter_list[i]->info);
13269
aa13937da8a0 mplayer -af help now lists all available audio filters.
ivo
parents: 12668
diff changeset
708 i++;
aa13937da8a0 mplayer -af help now lists all available audio filters.
ivo
parents: 12668
diff changeset
709 }
aa13937da8a0 mplayer -af help now lists all available audio filters.
ivo
parents: 12668
diff changeset
710 }
aa13937da8a0 mplayer -af help now lists all available audio filters.
ivo
parents: 12668
diff changeset
711
14818
663c1ea5f595 finally remove the refences to bps outside libaf. also simplification of some messages and removed redundants
alex
parents: 14750
diff changeset
712 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
713 {
663c1ea5f595 finally remove the refences to bps outside libaf. also simplification of some messages and removed redundants
alex
parents: 14750
diff changeset
714 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
715 }