annotate libaf/af.c @ 8832:a1578b329cc0

Adding sub-woofer filter, use this filter to add a sub channel to the audio stream
author anders
date Tue, 07 Jan 2003 10:33:30 +0000
parents 906f7a2dc085
children a892e5f051e1
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;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
24
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
25 static af_info_t* filter_list[]={ \
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
26 &af_info_dummy,\
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
27 &af_info_delay,\
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
28 &af_info_channels,\
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
29 &af_info_format,\
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
30 &af_info_resample,\
7974
db1f16543379 enable volume filter and fix nonsense default volume (still not usable
rfelker
parents: 7745
diff changeset
31 &af_info_volume,\
8073
c0e556f9986b Adding equalizer filter + some cosmetics
anders
parents: 7998
diff changeset
32 &af_info_equalizer,\
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
33 &af_info_gate,\
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
34 &af_info_comp,\
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
35 &af_info_pan,\
8678
db0810dcab33 Port of pl_surround.c to af-layer.
ranma
parents: 8607
diff changeset
36 &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
37 &af_info_sub,\
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
38 NULL \
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
39 };
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
40
8167
e8832e66babd New features:
anders
parents: 8073
diff changeset
41 // Message printing
e8832e66babd New features:
anders
parents: 8073
diff changeset
42 af_msg_cfg_t af_msg_cfg={0,NULL,NULL};
e8832e66babd New features:
anders
parents: 8073
diff changeset
43
e8832e66babd New features:
anders
parents: 8073
diff changeset
44 // CPU speed
e8832e66babd New features:
anders
parents: 8073
diff changeset
45 int* af_cpu_speed = NULL;
e8832e66babd New features:
anders
parents: 8073
diff changeset
46
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
47 /* 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
48 function is used internally */
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
49 af_info_t* af_find(char*name)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
50 {
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
51 int i=0;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
52 while(filter_list[i]){
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
53 if(!strcmp(filter_list[i]->name,name))
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
54 return filter_list[i];
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
55 i++;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
56 }
8167
e8832e66babd New features:
anders
parents: 8073
diff changeset
57 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
58 return NULL;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
59 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
60
7615
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
61 /* 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
62 function is used for finding already initialized filters */
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
63 af_instance_t* af_get(af_stream_t* s, char* name)
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
64 {
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
65 af_instance_t* af=s->first;
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
66 // Find the filter
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
67 while(af != NULL){
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
68 if(!strcmp(af->info->name,name))
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
69 return af;
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
70 af=af->next;
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
71 }
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
72 return NULL;
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
73 }
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
74
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
75 /*/ 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
76 contain the commandline parameters for the filter */
7615
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
77 af_instance_t* af_create(af_stream_t* s, char* name)
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
78 {
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
79 char* cmdline = name;
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
80 char* delim = "=";
7998
d48a06d07afb Adding commandline options for filters and fixing stupid bug in cfg
anders
parents: 7993
diff changeset
81
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
82 // Allocate space for the new filter and reset all pointers
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
83 af_instance_t* new=malloc(sizeof(af_instance_t));
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
84 if(!new){
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
85 af_msg(AF_MSG_ERROR,"[libaf] Could not allocate memory\n");
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
86 return NULL;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
87 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
88 memset(new,0,sizeof(af_instance_t));
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
89
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
90 // Check for commandline parameters
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
91 strsep(&cmdline, delim);
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
92
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
93 // Find filter from name
7615
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
94 if(NULL == (new->info=af_find(name)))
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
95 return NULL;
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
96
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
97 /* 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
98 non-reentrant */
7615
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
99 if(new->info->flags & AF_FLAGS_NOT_REENTRANT){
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
100 if(af_get(s,name)){
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
101 af_msg(AF_MSG_ERROR,"[libaf] There can only be one instance of"
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
102 " the filter '%s' in each stream\n",name);
7615
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
103 free(new);
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
104 return NULL;
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
105 }
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
106 }
7993
ea0680d87f3f Changing the behavour of the commandline parameter -af to conform with -vop. Adding new commanline parameter -af-adv for advanced af options. Adding changes to volume control to support commandline parameters.
anders
parents: 7974
diff changeset
107
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
108 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
109
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
110 // Initialize the new filter
7745
1d3a3dc1f488 Adding volume control and moving control() call parameters to a seperate file
anders
parents: 7665
diff changeset
111 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
112 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
113 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
114 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
115 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
116 }
ea0680d87f3f Changing the behavour of the commandline parameter -af to conform with -vop. Adding new commanline parameter -af-adv for advanced af options. Adding changes to volume control to support commandline parameters.
anders
parents: 7974
diff changeset
117 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
118 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
119 }
7745
1d3a3dc1f488 Adding volume control and moving control() call parameters to a seperate file
anders
parents: 7665
diff changeset
120
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
121 free(new);
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
122 af_msg(AF_MSG_ERROR,"[libaf] Couldn't create or open audio filter '%s'\n",
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
123 name);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
124 return NULL;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
125 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
126
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
127 /* 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
128 argument. This function can be called during runtime, the return
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
129 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
130 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
131 {
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
132 // Create the new filter and make sure it is OK
7615
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
133 af_instance_t* new=af_create(s,name);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
134 if(!new)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
135 return NULL;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
136 // Update pointers
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
137 new->next=af;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
138 if(af){
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
139 new->prev=af->prev;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
140 af->prev=new;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
141 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
142 else
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
143 s->last=new;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
144 if(new->prev)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
145 new->prev->next=new;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
146 else
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
147 s->first=new;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
148 return new;
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
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
151 /* 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
152 argument. This function can be called during runtime, the return
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
153 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
154 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
155 {
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
156 // Create the new filter and make sure it is OK
7615
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
157 af_instance_t* new=af_create(s,name);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
158 if(!new)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
159 return NULL;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
160 // Update pointers
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
161 new->prev=af;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
162 if(af){
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
163 new->next=af->next;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
164 af->next=new;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
165 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
166 else
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
167 s->first=new;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
168 if(new->next)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
169 new->next->prev=new;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
170 else
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
171 s->last=new;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
172 return new;
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
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
175 // 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
176 void af_remove(af_stream_t* s, af_instance_t* af)
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
177 {
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
178 if(!af) return;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
179
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
180 // Print friendly message
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
181 af_msg(AF_MSG_VERBOSE,"[libaf] Removing filter %s \n",af->info->name);
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
182
7745
1d3a3dc1f488 Adding volume control and moving control() call parameters to a seperate file
anders
parents: 7665
diff changeset
183 // Notify filter before changing anything
1d3a3dc1f488 Adding volume control and moving control() call parameters to a seperate file
anders
parents: 7665
diff changeset
184 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
185
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
186 // Detach pointers
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
187 if(af->prev)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
188 af->prev->next=af->next;
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=af->next;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
191 if(af->next)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
192 af->next->prev=af->prev;
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=af->prev;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
195
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
196 // Uninitialize af and free memory
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
197 af->uninit(af);
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
198 free(af);
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
199 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
200
7649
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
201 /* Reinitializes all filters downstream from the filter given in the
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
202 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
203 failure */
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
204 int af_reinit(af_stream_t* s, af_instance_t* af)
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
205 {
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
206 if(!af)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
207 return AF_ERROR;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
208
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
209 do{
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
210 af_data_t in; // Format of the input to current filter
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
211 int rv=0; // Return value
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
212
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
213 // Check if this is the first filter
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
214 if(!af->prev)
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
215 memcpy(&in,&(s->input),sizeof(af_data_t));
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
216 else
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
217 memcpy(&in,af->prev->data,sizeof(af_data_t));
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
218 // Reset just in case...
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
219 in.audio=NULL;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
220 in.len=0;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
221
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
222 rv = af->control(af,AF_CONTROL_REINIT,&in);
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
223 switch(rv){
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
224 case AF_OK:
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
225 break;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
226 case AF_FALSE:{ // Configuration filter is needed
8167
e8832e66babd New features:
anders
parents: 8073
diff changeset
227 // Do auto insertion only if force is not specified
e8832e66babd New features:
anders
parents: 8073
diff changeset
228 if((AF_INIT_TYPE_MASK & s->cfg.force) != AF_INIT_FORCE){
e8832e66babd New features:
anders
parents: 8073
diff changeset
229 af_instance_t* new = NULL;
e8832e66babd New features:
anders
parents: 8073
diff changeset
230 // Insert channels filter
e8832e66babd New features:
anders
parents: 8073
diff changeset
231 if((af->prev?af->prev->data->nch:s->input.nch) != in.nch){
e8832e66babd New features:
anders
parents: 8073
diff changeset
232 // Create channels filter
e8832e66babd New features:
anders
parents: 8073
diff changeset
233 if(NULL == (new = af_prepend(s,af,"channels")))
e8832e66babd New features:
anders
parents: 8073
diff changeset
234 return AF_ERROR;
e8832e66babd New features:
anders
parents: 8073
diff changeset
235 // Set number of output channels
e8832e66babd New features:
anders
parents: 8073
diff changeset
236 if(AF_OK != (rv = new->control(new,AF_CONTROL_CHANNELS,&in.nch)))
e8832e66babd New features:
anders
parents: 8073
diff changeset
237 return rv;
e8832e66babd New features:
anders
parents: 8073
diff changeset
238 // Initialize channels filter
e8832e66babd New features:
anders
parents: 8073
diff changeset
239 if(!new->prev)
e8832e66babd New features:
anders
parents: 8073
diff changeset
240 memcpy(&in,&(s->input),sizeof(af_data_t));
e8832e66babd New features:
anders
parents: 8073
diff changeset
241 else
e8832e66babd New features:
anders
parents: 8073
diff changeset
242 memcpy(&in,new->prev->data,sizeof(af_data_t));
e8832e66babd New features:
anders
parents: 8073
diff changeset
243 if(AF_OK != (rv = new->control(new,AF_CONTROL_REINIT,&in)))
e8832e66babd New features:
anders
parents: 8073
diff changeset
244 return rv;
e8832e66babd New features:
anders
parents: 8073
diff changeset
245 }
e8832e66babd New features:
anders
parents: 8073
diff changeset
246 // Insert format filter
e8832e66babd New features:
anders
parents: 8073
diff changeset
247 if(((af->prev?af->prev->data->format:s->input.format) != in.format) ||
e8832e66babd New features:
anders
parents: 8073
diff changeset
248 ((af->prev?af->prev->data->bps:s->input.bps) != in.bps)){
e8832e66babd New features:
anders
parents: 8073
diff changeset
249 // Create format filter
e8832e66babd New features:
anders
parents: 8073
diff changeset
250 if(NULL == (new = af_prepend(s,af,"format")))
e8832e66babd New features:
anders
parents: 8073
diff changeset
251 return AF_ERROR;
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
252 // Set output bits per sample
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
253 if(AF_OK != (rv = new->control(new,AF_CONTROL_FORMAT_BPS,&in.bps)) ||
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
254 AF_OK != (rv = new->control(new,AF_CONTROL_FORMAT_FMT,&in.format)))
8167
e8832e66babd New features:
anders
parents: 8073
diff changeset
255 return rv;
e8832e66babd New features:
anders
parents: 8073
diff changeset
256 // Initialize format filter
e8832e66babd New features:
anders
parents: 8073
diff changeset
257 if(!new->prev)
e8832e66babd New features:
anders
parents: 8073
diff changeset
258 memcpy(&in,&(s->input),sizeof(af_data_t));
e8832e66babd New features:
anders
parents: 8073
diff changeset
259 else
e8832e66babd New features:
anders
parents: 8073
diff changeset
260 memcpy(&in,new->prev->data,sizeof(af_data_t));
e8832e66babd New features:
anders
parents: 8073
diff changeset
261 if(AF_OK != (rv = new->control(new,AF_CONTROL_REINIT,&in)))
e8832e66babd New features:
anders
parents: 8073
diff changeset
262 return rv;
e8832e66babd New features:
anders
parents: 8073
diff changeset
263 }
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
264 if(!new){ // Should _never_ happen
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
265 af_msg(AF_MSG_ERROR,"[libaf] Unable to correct audio format. "
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
266 "This error should never uccur, please send bugreport.\n");
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
267 return AF_ERROR;
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
268 }
8167
e8832e66babd New features:
anders
parents: 8073
diff changeset
269 af=new;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
270 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
271 break;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
272 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
273 case AF_DETACH:{ // Filter is redundant and wants to be unloaded
8167
e8832e66babd New features:
anders
parents: 8073
diff changeset
274 // Do auto remove only if force is not specified
e8832e66babd New features:
anders
parents: 8073
diff changeset
275 if((AF_INIT_TYPE_MASK & s->cfg.force) != AF_INIT_FORCE){
e8832e66babd New features:
anders
parents: 8073
diff changeset
276 af_instance_t* aft=af->prev;
e8832e66babd New features:
anders
parents: 8073
diff changeset
277 af_remove(s,af);
e8832e66babd New features:
anders
parents: 8073
diff changeset
278 if(aft)
e8832e66babd New features:
anders
parents: 8073
diff changeset
279 af=aft;
e8832e66babd New features:
anders
parents: 8073
diff changeset
280 else
e8832e66babd New features:
anders
parents: 8073
diff changeset
281 af=s->first; // Restart configuration
e8832e66babd New features:
anders
parents: 8073
diff changeset
282 }
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
283 break;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
284 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
285 default:
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
286 af_msg(AF_MSG_ERROR,"[libaf] Reinitialization did not work, audio"
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
287 " filter '%s' returned error code %i\n",af->info->name,rv);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
288 return AF_ERROR;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
289 }
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
290 // Check if there are any filters left in the list
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
291 if(NULL == af){
8711
906f7a2dc085 sig 11 fix in reinit and resample + spelling error fixes
anders
parents: 8678
diff changeset
292 if(!(af=af_append(s,s->first,"dummy")))
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
293 return -1;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
294 }
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
295 else
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
296 af=af->next;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
297 }while(af);
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
298 return AF_OK;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
299 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
300
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
301 // 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
302 void af_uninit(af_stream_t* s)
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
303 {
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
304 while(s->first)
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
305 af_remove(s,s->first);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
306 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
307
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
308 /* 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
309 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
310 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
311 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
312 reentrant i.e. if called with an already initialized stream the
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
313 stream will be reinitialized. The return value is 0 if success and
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
314 -1 if failure */
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
315 int af_init(af_stream_t* s)
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
316 {
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
317 int i=0;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
318
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
319 // Sanity check
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
320 if(!s) return -1;
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
321
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
322 // 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
323 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
324 s->input.len = s->output.len = 0;
7568
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 // Figure out how fast the machine is
8167
e8832e66babd New features:
anders
parents: 8073
diff changeset
327 if(AF_INIT_AUTO == (AF_INIT_TYPE_MASK & s->cfg.force))
e8832e66babd New features:
anders
parents: 8073
diff changeset
328 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
329
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
330 // 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
331 if(!s->first){
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
332 // 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
333 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
334 if(!af_append(s,s->first,"dummy"))
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
335 return -1;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
336 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
337 else{
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
338 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
339 if(!af_append(s,s->last,s->cfg.list[i++]))
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
340 return -1;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
341 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
342 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
343 }
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
344
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
345 // Init filters
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
346 if(AF_OK != af_reinit(s,s->first))
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
347 return -1;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
348
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
349 // Check output format
7745
1d3a3dc1f488 Adding volume control and moving control() call parameters to a seperate file
anders
parents: 7665
diff changeset
350 if((AF_INIT_TYPE_MASK & s->cfg.force) != AF_INIT_FORCE){
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
351 af_instance_t* af = NULL; // New filter
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
352 // Check output frequency if not OK fix with resample
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
353 if(s->last->data->rate!=s->output.rate){
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
354 if(NULL==(af=af_get(s,"resample"))){
7745
1d3a3dc1f488 Adding volume control and moving control() call parameters to a seperate file
anders
parents: 7665
diff changeset
355 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
356 if(!strcmp(s->first->info->name,"format"))
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
357 af = af_append(s,s->first,"resample");
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
358 else
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
359 af = af_prepend(s,s->first,"resample");
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
360 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
361 else{
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
362 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
363 af = af_prepend(s,s->last,"resample");
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
364 else
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
365 af = af_append(s,s->last,"resample");
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
366 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
367 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
368 // Init the new filter
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
369 if(!af || (AF_OK != af->control(af,AF_CONTROL_RESAMPLE_RATE,
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
370 &(s->output.rate))))
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
371 return -1;
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
372 if(AF_OK != af_reinit(s,af))
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
373 return -1;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
374 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
375
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
376 // Check number of output channels fix if not OK
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
377 // If needed always inserted last -> easy to screw up other filters
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
378 if(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
379 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
380 af = af_prepend(s,s->last,"channels");
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
381 else
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
382 af = af_append(s,s->last,"channels");
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
383 // 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
384 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
385 return -1;
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
386 if(AF_OK != af_reinit(s,af))
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
387 return -1;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
388 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
389
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
390 // Check output format fix if not OK
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
391 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
392 (s->last->data->bps != s->output.bps)){
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
393 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
394 af = af_append(s,s->last,"format");
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
395 else
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
396 af = s->last;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
397 // Init the new filter
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
398 if(!af ||(AF_OK != af->control(af,AF_CONTROL_FORMAT_BPS,&(s->output.bps)))
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
399 || (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
400 return -1;
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
401 if(AF_OK != af_reinit(s,af))
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
402 return -1;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
403 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
404
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
405 // 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
406 if(AF_OK != af_reinit(s,s->first))
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
407 return -1;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
408
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
409 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
410 (s->last->data->bps != s->output.bps) ||
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
411 (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
412 (s->last->data->rate != s->output.rate)) {
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
413 // Something is stuffed audio out will not work
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
414 af_msg(AF_MSG_ERROR,"[libaf] Unable to setup filter system can not"
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
415 " 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
416 af_uninit(s);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
417 return -1;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
418 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
419 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
420 return 0;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
421 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
422
7649
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
423 /* Add filter during execution. This function adds the filter "name"
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
424 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
425 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
426 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
427 af_instance_t* af_add(af_stream_t* s, char* name){
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
428 af_instance_t* new;
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
429 // Sanity check
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
430 if(!s || !s->first || !name)
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
431 return NULL;
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
432 // Insert the filter somwhere nice
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
433 if(!strcmp(s->first->info->name,"format"))
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
434 new = af_append(s, s->first, name);
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
435 else
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
436 new = af_prepend(s, s->first, name);
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
437 if(!new)
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
438 return NULL;
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
439
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
440 // Reinitalize the filter list
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
441 if(AF_OK != af_reinit(s, s->first)){
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
442 free(new);
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
443 return NULL;
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
444 }
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
445 return new;
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
446 }
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
447
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
448 // 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
449 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
450 {
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
451 af_instance_t* af=s->first;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
452 // Iterate through all filters
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
453 do{
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
454 data=af->play(af,data);
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
455 af=af->next;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
456 }while(af);
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
457 return data;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
458 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
459
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
460 /* Helper function used to calculate the exact buffer length needed
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
461 when buffers are resized. The returned length is >= than what is
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
462 needed */
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
463 inline int af_lencalc(frac_t mul, af_data_t* d){
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
464 register int t = d->bps*d->nch;
7590
0cba73469341 Fixing the fix buffer overrun should work now
anders
parents: 7589
diff changeset
465 return t*(((d->len/t)*mul.n)/mul.d + 1);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
466 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
467
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
468 /* Calculate how long the output from the filters will be given the
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
469 input length "len". The calculated length is >= the actual
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
470 length. */
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
471 int af_outputlen(af_stream_t* s, int len)
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
472 {
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
473 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
474 af_instance_t* af=s->first;
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
475 register frac_t mul = {1,1};
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
476 // Iterate through all filters
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
477 do{
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
478 mul.n *= af->mul.n;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
479 mul.d *= af->mul.d;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
480 af=af->next;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
481 }while(af);
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
482 return t * (((len/t)*mul.n + 1)/mul.d);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
483 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
484
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
485 /* 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
486 certain output length, i.e. the return value of this function is
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
487 the input length required to produce the output length "len". The
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
488 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
489 int af_inputlen(af_stream_t* s, int len)
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
490 {
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
491 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
492 af_instance_t* af=s->first;
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
493 register frac_t mul = {1,1};
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
494 // Iterate through all filters
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
495 do{
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
496 mul.n *= af->mul.n;
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
497 mul.d *= af->mul.d;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
498 af=af->next;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
499 }while(af);
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
500 return t * (((len/t) * mul.d - 1)/mul.n);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
501 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
502
7598
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
503 /* 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
504 a certain output length OUT but with the following three constraints:
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
505 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
506 block length
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
507 2. OUT <= max_outsize, where max_outsize is the maximum possible
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
508 output block length
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
509 3. If possible OUT >= len.
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
510 Return -1 in case of error */
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
511 int af_calc_insize_constrained(af_stream_t* s, int len,
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
512 int max_outsize,int max_insize)
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
513 {
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
514 int t = s->input.bps*s->input.nch;
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
515 int in = 0;
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
516 int out = 0;
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
517 af_instance_t* af=s->first;
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
518 register frac_t mul = {1,1};
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
519 // Iterate through all filters and calculate total multiplication factor
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
520 do{
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
521 mul.n *= af->mul.n;
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
522 mul.d *= af->mul.d;
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
523 af=af->next;
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
524 }while(af);
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
525 // Sanity check
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
526 if(!mul.n || !mul.d)
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
527 return -1;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
528
7603
c89106306f5a af_calc_insize_constrained() rounding changes, works better for me this way
arpi
parents: 7599
diff changeset
529 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
530
c89106306f5a af_calc_insize_constrained() rounding changes, works better for me this way
arpi
parents: 7599
diff changeset
531 if(in>max_insize) in=t*(max_insize/t);
7598
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
532
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
533 // Try to meet constraint nr 3.
7612
arpi
parents: 7603
diff changeset
534 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
535 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
536 in+=t;
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
537 }
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
538
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
539 // 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
540 while(out > max_outsize || in > max_insize){
7598
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
541 in-=t;
7603
c89106306f5a af_calc_insize_constrained() rounding changes, works better for me this way
arpi
parents: 7599
diff changeset
542 if(in<t) return -1; // Input parameters are probably incorrect
7598
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
543 out = t * (((in/t)*mul.n + 1)/mul.d);
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
544 }
7603
c89106306f5a af_calc_insize_constrained() rounding changes, works better for me this way
arpi
parents: 7599
diff changeset
545 return in;
7598
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
546 }
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
547
7665
fbd5445cc853 Adding function for calculating the delay caused by the filters
anders
parents: 7649
diff changeset
548 /* 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
549 double af_calc_delay(af_stream_t* s)
fbd5445cc853 Adding function for calculating the delay caused by the filters
anders
parents: 7649
diff changeset
550 {
fbd5445cc853 Adding function for calculating the delay caused by the filters
anders
parents: 7649
diff changeset
551 af_instance_t* af=s->first;
fbd5445cc853 Adding function for calculating the delay caused by the filters
anders
parents: 7649
diff changeset
552 register double delay = 0.0;
fbd5445cc853 Adding function for calculating the delay caused by the filters
anders
parents: 7649
diff changeset
553 // Iterate through all filters
fbd5445cc853 Adding function for calculating the delay caused by the filters
anders
parents: 7649
diff changeset
554 while(af){
fbd5445cc853 Adding function for calculating the delay caused by the filters
anders
parents: 7649
diff changeset
555 delay += af->delay;
fbd5445cc853 Adding function for calculating the delay caused by the filters
anders
parents: 7649
diff changeset
556 af=af->next;
fbd5445cc853 Adding function for calculating the delay caused by the filters
anders
parents: 7649
diff changeset
557 }
fbd5445cc853 Adding function for calculating the delay caused by the filters
anders
parents: 7649
diff changeset
558 return delay;
fbd5445cc853 Adding function for calculating the delay caused by the filters
anders
parents: 7649
diff changeset
559 }
fbd5445cc853 Adding function for calculating the delay caused by the filters
anders
parents: 7649
diff changeset
560
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
561 /* Helper function called by the macro with the same name this
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
562 function should not be called directly */
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
563 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
564 {
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
565 // Calculate new length
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
566 register int len = af_lencalc(af->mul,data);
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
567 af_msg(AF_MSG_VERBOSE,"[libaf] Reallocating memory in module %s, "
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
568 "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
569 // If there is a buffer free it
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
570 if(af->data->audio)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
571 free(af->data->audio);
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
572 // Create new buffer and check that it is OK
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
573 af->data->audio = malloc(len);
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
574 if(!af->data->audio){
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
575 af_msg(AF_MSG_FATAL,"[libaf] Could not allocate memory \n");
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
576 return AF_ERROR;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
577 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
578 af->data->len=len;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
579 return AF_OK;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
580 }