annotate libaf/af.c @ 7649:90e16aa8ae5f

Adding functionality for adding filters during execution
author anders
date Mon, 07 Oct 2002 10:46:01 +0000
parents faa7dad7b4b1
children fbd5445cc853
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 "../config.h"
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
10 #include "../mp_msg.h"
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
11
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
12 #include "af.h"
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
13
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
14 // Static list of filters
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
15 extern af_info_t af_info_dummy;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
16 extern af_info_t af_info_delay;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
17 extern af_info_t af_info_channels;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
18 extern af_info_t af_info_format;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
19 extern af_info_t af_info_resample;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
20
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
21 static af_info_t* filter_list[]={ \
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
22 &af_info_dummy,\
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
23 &af_info_delay,\
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
24 &af_info_channels,\
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
25 &af_info_format,\
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
26 &af_info_resample,\
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
27 NULL \
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
28 };
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
29
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
30 /* 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
31 function is used internally */
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
32 af_info_t* af_find(char*name)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
33 {
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
34 int i=0;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
35 while(filter_list[i]){
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
36 if(!strcmp(filter_list[i]->name,name))
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
37 return filter_list[i];
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
38 i++;
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 mp_msg(MSGT_AFILTER,MSGL_ERR,"Couldn't find audio filter '%s'\n",name);
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
41 return NULL;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
42 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
43
7615
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
44 /* 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
45 function is used for finding already initialized filters */
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
46 af_instance_t* af_get(af_stream_t* s, char* name)
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
47 {
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
48 af_instance_t* af=s->first;
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
49 // Find the filter
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
50 while(af != NULL){
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
51 if(!strcmp(af->info->name,name))
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
52 return af;
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
53 af=af->next;
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
54 }
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
55 return NULL;
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
56 }
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
57
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
58 // Function for creating a new filter of type name
7615
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
59 af_instance_t* af_create(af_stream_t* s, char* name)
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
60 {
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
61 // Allocate space for the new filter and reset all pointers
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
62 af_instance_t* new=malloc(sizeof(af_instance_t));
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
63 if(!new){
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
64 mp_msg(MSGT_AFILTER,MSGL_ERR,"Could not allocate memory\n");
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
65 return NULL;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
66 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
67 memset(new,0,sizeof(af_instance_t));
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
68
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
69 // Find filter from name
7615
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
70 if(NULL == (new->info=af_find(name)))
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
71 return NULL;
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
72
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
73 // Make sure that the filter is not already in the list if it is non-reentrant
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
74 if(new->info->flags & AF_FLAGS_NOT_REENTRANT){
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
75 if(af_get(s,name)){
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
76 mp_msg(MSGT_AFILTER,MSGL_ERR,"There can only be one instance of the filter '%s' in each stream\n",name);
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
77 free(new);
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
78 return NULL;
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
79 }
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
80 }
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
81
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
82 // Initialize the new filter
7615
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
83 if(AF_OK==new->info->open(new))
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
84 return new;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
85
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
86 free(new);
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
87 mp_msg(MSGT_AFILTER,MSGL_ERR,"Couldn't create audio filter '%s'\n",name);
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
88 return NULL;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
89 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
90
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
91 /* 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
92 argument. This function can be called during runtime, the return
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
93 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
94 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
95 {
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
96 // Create the new filter and make sure it is OK
7615
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
97 af_instance_t* new=af_create(s,name);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
98 if(!new)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
99 return NULL;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
100 // Update pointers
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
101 new->next=af;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
102 if(af){
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
103 new->prev=af->prev;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
104 af->prev=new;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
105 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
106 else
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
107 s->last=new;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
108 if(new->prev)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
109 new->prev->next=new;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
110 else
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
111 s->first=new;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
112 return new;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
113 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
114
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
115 /* 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
116 argument. This function can be called during runtime, the return
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
117 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
118 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
119 {
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
120 // Create the new filter and make sure it is OK
7615
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7612
diff changeset
121 af_instance_t* new=af_create(s,name);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
122 if(!new)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
123 return NULL;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
124 // Update pointers
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
125 new->prev=af;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
126 if(af){
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
127 new->next=af->next;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
128 af->next=new;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
129 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
130 else
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
131 s->first=new;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
132 if(new->next)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
133 new->next->prev=new;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
134 else
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
135 s->last=new;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
136 return new;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
137 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
138
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
139 // 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
140 void af_remove(af_stream_t* s, af_instance_t* af)
7568
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 if(!af) return;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
143
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
144 // Detach pointers
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
145 if(af->prev)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
146 af->prev->next=af->next;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
147 else
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
148 s->first=af->next;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
149 if(af->next)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
150 af->next->prev=af->prev;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
151 else
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
152 s->last=af->prev;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
153
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
154 // Uninitialize af and free memory
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
155 af->uninit(af);
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
156 free(af);
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
157 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
158
7649
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
159 /* Reinitializes all filters downstream from the filter given in the
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
160 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
161 failure */
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
162 int af_reinit(af_stream_t* s, af_instance_t* af)
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
163 {
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
164 if(!af)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
165 return AF_ERROR;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
166
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
167 do{
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
168 af_data_t in; // Format of the input to current filter
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
169 int rv=0; // Return value
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
170
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
171 // Check if this is the first filter
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
172 if(!af->prev)
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
173 memcpy(&in,&(s->input),sizeof(af_data_t));
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
174 else
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
175 memcpy(&in,af->prev->data,sizeof(af_data_t));
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
176 // Reset just in case...
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
177 in.audio=NULL;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
178 in.len=0;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
179
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
180 rv = af->control(af,AF_CONTROL_REINIT,&in);
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
181 switch(rv){
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
182 case AF_OK:
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
183 break;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
184 case AF_FALSE:{ // Configuration filter is needed
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
185 af_instance_t* new = NULL;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
186 // Insert channels filter
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
187 if((af->prev?af->prev->data->nch:s->input.nch) != in.nch){
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
188 // Create channels filter
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
189 if(NULL == (new = af_prepend(s,af,"channels")))
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
190 return AF_ERROR;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
191 // Set number of output channels
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
192 if(AF_OK != (rv = new->control(new,AF_CONTROL_CHANNELS,&in.nch)))
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
193 return rv;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
194 // Initialize channels filter
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
195 if(!new->prev)
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
196 memcpy(&in,&(s->input),sizeof(af_data_t));
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
197 else
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
198 memcpy(&in,new->prev->data,sizeof(af_data_t));
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
199 if(AF_OK != (rv = new->control(new,AF_CONTROL_REINIT,&in)))
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
200 return rv;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
201 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
202 // Insert format filter
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
203 if(((af->prev?af->prev->data->format:s->input.format) != in.format) ||
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
204 ((af->prev?af->prev->data->bps:s->input.bps) != in.bps)){
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
205 // Create format filter
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
206 if(NULL == (new = af_prepend(s,af,"format")))
7568
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 // Set output format
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
209 if(AF_OK != (rv = new->control(new,AF_CONTROL_FORMAT,&in)))
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
210 return rv;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
211 // Initialize format filter
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
212 if(!new->prev)
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
213 memcpy(&in,&(s->input),sizeof(af_data_t));
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
214 else
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
215 memcpy(&in,new->prev->data,sizeof(af_data_t));
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
216 if(AF_OK != (rv = new->control(new,AF_CONTROL_REINIT,&in)))
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
217 return rv;
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 if(!new) // Should _never_ happen
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
220 return AF_ERROR;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
221 af=new;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
222 break;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
223 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
224 case AF_DETACH:{ // Filter is redundant and wants to be unloaded
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
225 af_instance_t* aft=af->prev;
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
226 af_remove(s,af);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
227 if(aft)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
228 af=aft;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
229 else
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
230 af=s->first; // Restart configuration
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
231 break;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
232 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
233 default:
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
234 mp_msg(MSGT_AFILTER,MSGL_ERR,"Reinitialization did not work, audio filter '%s' returned error code %i\n",af->info->name,rv);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
235 return AF_ERROR;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
236 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
237 af=af->next;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
238 }while(af);
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
239 return AF_OK;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
240 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
241
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
242 // 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
243 void af_uninit(af_stream_t* s)
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
244 {
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
245 while(s->first)
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
246 af_remove(s,s->first);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
247 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
248
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
249 /* 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
250 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
251 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
252 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
253 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
254 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
255 -1 if failure */
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
256 int af_init(af_stream_t* s)
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
257 {
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
258 int cfg=SLOW; // configuration type
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
259 int i=0;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
260
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
261 // Sanity check
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
262 if(!s) return -1;
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
263
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
264 // 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
265 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
266 s->input.len = s->output.len = 0;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
267
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
268 // Figure out how fast the machine is
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
269 if(s->cfg.force)
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
270 cfg=s->cfg.force;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
271 else{
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
272 # if defined(HAVE_SSE) || defined(HAVE_3DNOWEX)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
273 cfg=FAST;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
274 # else
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
275 cfg=SLOW;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
276 # endif
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
277 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
278
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
279 // 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
280 if(!s->first){
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
281 // 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
282 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
283 if(!af_append(s,s->first,"dummy"))
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
284 return -1;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
285 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
286 else{
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
287 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
288 if(!af_append(s,s->last,s->cfg.list[i++]))
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
289 return -1;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
290 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
291 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
292 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
293
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
294 // Init filters
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
295 if(AF_OK != af_reinit(s,s->first))
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
296 return -1;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
297
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
298 // Check output format
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
299 if(cfg!=FORCE){
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
300 af_instance_t* af = NULL; // New filter
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
301 // 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
302 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
303 if(NULL==(af=af_get(s,"resample"))){
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
304 if(cfg==SLOW){
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
305 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
306 af = af_append(s,s->first,"resample");
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
307 else
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
308 af = af_prepend(s,s->first,"resample");
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
309 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
310 else{
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
311 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
312 af = af_prepend(s,s->last,"resample");
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
313 else
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
314 af = af_append(s,s->last,"resample");
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
315 }
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 // 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
318 if(!af || (AF_OK != af->control(af,AF_CONTROL_RESAMPLE,&(s->output.rate))))
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
319 return -1;
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
320 if(AF_OK != af_reinit(s,af))
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
321 return -1;
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
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
324 // Check number of output channels fix if not OK
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
325 // 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
326 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
327 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
328 af = af_prepend(s,s->last,"channels");
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
329 else
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
330 af = af_append(s,s->last,"channels");
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
331 // 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
332 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
333 return -1;
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
334 if(AF_OK != af_reinit(s,af))
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
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
338 // 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
339 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
340 (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
341 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
342 af = af_append(s,s->last,"format");
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
343 else
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
344 af = s->last;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
345 // 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
346 if(!af ||(AF_OK != af->control(af,AF_CONTROL_FORMAT,&(s->output))))
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
347 return -1;
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
348 if(AF_OK != af_reinit(s,af))
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
349 return -1;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
350 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
351
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
352 // 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
353 if(AF_OK != af_reinit(s,s->first))
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
354 return -1;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
355
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
356 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
357 (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
358 (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
359 (s->last->data->rate != s->output.rate)) {
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
360 // Something is stuffed audio out will not work
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
361 mp_msg(MSGT_AFILTER,MSGL_ERR,"Unable to setup filter system can not meet sound-card demands, please report this error on MPlayer development mailing list. \n");
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
362 af_uninit(s);
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 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
366 return 0;
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
7649
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
369 /* Add filter during execution. This function adds the filter "name"
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
370 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
371 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
372 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
373 af_instance_t* af_add(af_stream_t* s, char* name){
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
374 af_instance_t* new;
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
375 // Sanity check
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
376 if(!s || !s->first || !name)
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
377 return NULL;
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
378 // Insert the filter somwhere nice
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
379 if(!strcmp(s->first->info->name,"format"))
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
380 new = af_append(s, s->first, name);
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
381 else
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
382 new = af_prepend(s, s->first, name);
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
383 if(!new)
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
384 return NULL;
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
385
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
386 // Reinitalize the filter list
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
387 if(AF_OK != af_reinit(s, s->first)){
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
388 free(new);
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
389 return NULL;
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
390 }
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
391 return new;
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
392 }
90e16aa8ae5f Adding functionality for adding filters during execution
anders
parents: 7617
diff changeset
393
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
394 // 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
395 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
396 {
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
397 af_instance_t* af=s->first;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
398 // Iterate through all filters
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
399 do{
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
400 data=af->play(af,data);
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
401 af=af->next;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
402 }while(af);
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
403 return data;
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
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
406 /* Helper function used to calculate the exact buffer length needed
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
407 when buffers are resized. The returned length is >= than what is
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
408 needed */
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
409 inline int af_lencalc(frac_t mul, af_data_t* d){
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
410 register int t = d->bps*d->nch;
7590
0cba73469341 Fixing the fix buffer overrun should work now
anders
parents: 7589
diff changeset
411 return t*(((d->len/t)*mul.n)/mul.d + 1);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
412 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
413
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
414 /* Calculate how long the output from the filters will be given the
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
415 input length "len". The calculated length is >= the actual
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
416 length. */
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
417 int af_outputlen(af_stream_t* s, int len)
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
418 {
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
419 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
420 af_instance_t* af=s->first;
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
421 register frac_t mul = {1,1};
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
422 // Iterate through all filters
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
423 do{
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
424 mul.n *= af->mul.n;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
425 mul.d *= af->mul.d;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
426 af=af->next;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
427 }while(af);
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
428 return t * (((len/t)*mul.n + 1)/mul.d);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
429 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
430
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
431 /* 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
432 certain output length, i.e. the return value of this function is
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
433 the input length required to produce the output length "len". The
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
434 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
435 int af_inputlen(af_stream_t* s, int len)
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
436 {
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
437 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
438 af_instance_t* af=s->first;
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
439 register frac_t mul = {1,1};
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
440 // Iterate through all filters
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
441 do{
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
442 mul.n *= af->mul.n;
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
443 mul.d *= af->mul.d;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
444 af=af->next;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
445 }while(af);
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
446 return t * (((len/t) * mul.d - 1)/mul.n);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
447 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
448
7598
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
449 /* 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
450 a certain output length OUT but with the following three constraints:
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
451 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
452 block length
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
453 2. OUT <= max_outsize, where max_outsize is the maximum possible
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
454 output block length
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
455 3. If possible OUT >= len.
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
456 Return -1 in case of error */
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
457 int af_calc_insize_constrained(af_stream_t* s, int len,
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
458 int max_outsize,int max_insize)
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
459 {
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
460 int t = s->input.bps*s->input.nch;
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
461 int in = 0;
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
462 int out = 0;
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
463 af_instance_t* af=s->first;
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
464 register frac_t mul = {1,1};
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
465 // Iterate through all filters and calculate total multiplication factor
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
466 do{
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
467 mul.n *= af->mul.n;
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
468 mul.d *= af->mul.d;
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
469 af=af->next;
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
470 }while(af);
7603
c89106306f5a af_calc_insize_constrained() rounding changes, works better for me this way
arpi
parents: 7599
diff changeset
471 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
472
c89106306f5a af_calc_insize_constrained() rounding changes, works better for me this way
arpi
parents: 7599
diff changeset
473 if(in>max_insize) in=t*(max_insize/t);
7598
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
474
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
475 // Try to meet constraint nr 3.
7612
arpi
parents: 7603
diff changeset
476 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
477 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
478 in+=t;
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
479 }
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
480
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
481 // 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
482 while(out > max_outsize || in > max_insize){
7598
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
483 in-=t;
7603
c89106306f5a af_calc_insize_constrained() rounding changes, works better for me this way
arpi
parents: 7599
diff changeset
484 if(in<t) return -1; // Input parameters are probably incorrect
7598
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
485 out = t * (((in/t)*mul.n + 1)/mul.d);
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
486 }
7603
c89106306f5a af_calc_insize_constrained() rounding changes, works better for me this way
arpi
parents: 7599
diff changeset
487 return in;
7598
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
488 }
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
489
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
490 /* Helper function called by the macro with the same name this
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
491 function should not be called directly */
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
492 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
493 {
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
494 // Calculate new length
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
495 register int len = af_lencalc(af->mul,data);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
496 mp_msg(MSGT_AFILTER,MSGL_V,"Reallocating memory in module %s, old len = %i, new len = %i\n",af->info->name,af->data->len,len);
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
497 // If there is a buffer free it
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
498 if(af->data->audio)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
499 free(af->data->audio);
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
500 // Create new buffer and check that it is OK
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
501 af->data->audio = malloc(len);
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
502 if(!af->data->audio){
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
503 mp_msg(MSGT_AFILTER,MSGL_ERR,"Could not allocate memory \n");
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
504 return AF_ERROR;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
505 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
506 af->data->len=len;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
507 return AF_OK;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
508 }