annotate libaf/af.c @ 7617:faa7dad7b4b1

Removing annoying printf
author anders
date Sun, 06 Oct 2002 11:45:49 +0000
parents c67328dd459a
children 90e16aa8ae5f
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
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
159 /* Reinitializes all filters downstream from the filter given in the argument */
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
160 int af_reinit(af_stream_t* s, af_instance_t* af)
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
161 {
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 return AF_ERROR;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
164
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
165 do{
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
166 af_data_t in; // Format of the input to current filter
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
167 int rv=0; // Return value
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
168
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
169 // Check if this is the first filter
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
170 if(!af->prev)
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
171 memcpy(&in,&(s->input),sizeof(af_data_t));
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
172 else
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
173 memcpy(&in,af->prev->data,sizeof(af_data_t));
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
174 // Reset just in case...
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
175 in.audio=NULL;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
176 in.len=0;
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 rv = af->control(af,AF_CONTROL_REINIT,&in);
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
179 switch(rv){
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
180 case AF_OK:
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
181 break;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
182 case AF_FALSE:{ // Configuration filter is needed
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
183 af_instance_t* new = NULL;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
184 // Insert channels filter
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
185 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
186 // Create 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(NULL == (new = af_prepend(s,af,"channels")))
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
188 return AF_ERROR;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
189 // Set number of output channels
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
190 if(AF_OK != (rv = new->control(new,AF_CONTROL_CHANNELS,&in.nch)))
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
191 return rv;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
192 // Initialize channels filter
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
193 if(!new->prev)
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
194 memcpy(&in,&(s->input),sizeof(af_data_t));
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
195 else
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
196 memcpy(&in,new->prev->data,sizeof(af_data_t));
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
197 if(AF_OK != (rv = new->control(new,AF_CONTROL_REINIT,&in)))
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
198 return rv;
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 // Insert format filter
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
201 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
202 ((af->prev?af->prev->data->bps:s->input.bps) != in.bps)){
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
203 // Create format filter
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
204 if(NULL == (new = af_prepend(s,af,"format")))
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
205 return AF_ERROR;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
206 // Set output format
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
207 if(AF_OK != (rv = new->control(new,AF_CONTROL_FORMAT,&in)))
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
208 return rv;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
209 // Initialize format filter
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
210 if(!new->prev)
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
211 memcpy(&in,&(s->input),sizeof(af_data_t));
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
212 else
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
213 memcpy(&in,new->prev->data,sizeof(af_data_t));
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
214 if(AF_OK != (rv = new->control(new,AF_CONTROL_REINIT,&in)))
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
215 return rv;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
216 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
217 if(!new) // Should _never_ happen
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
218 return AF_ERROR;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
219 af=new;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
220 break;
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 case AF_DETACH:{ // Filter is redundant and wants to be unloaded
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
223 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
224 af_remove(s,af);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
225 if(aft)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
226 af=aft;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
227 else
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
228 af=s->first; // Restart configuration
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
229 break;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
230 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
231 default:
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
232 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
233 return AF_ERROR;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
234 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
235 af=af->next;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
236 }while(af);
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
237 return AF_OK;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
238 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
239
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
240 // 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
241 void af_uninit(af_stream_t* s)
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
242 {
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
243 while(s->first)
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
244 af_remove(s,s->first);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
245 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
246
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
247 /* 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
248 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
249 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
250 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
251 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
252 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
253 -1 if failure */
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
254 int af_init(af_stream_t* s)
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
255 {
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
256 int cfg=SLOW; // configuration type
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
257 int i=0;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
258
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
259 // Sanity check
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
260 if(!s) return -1;
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
261
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
262 // 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
263 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
264 s->input.len = s->output.len = 0;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
265
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
266 // 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
267 if(s->cfg.force)
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
268 cfg=s->cfg.force;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
269 else{
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
270 # if defined(HAVE_SSE) || defined(HAVE_3DNOWEX)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
271 cfg=FAST;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
272 # else
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
273 cfg=SLOW;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
274 # endif
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
275 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
276
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
277 // 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
278 if(!s->first){
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
279 // 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
280 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
281 if(!af_append(s,s->first,"dummy"))
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
282 return -1;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
283 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
284 else{
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
285 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
286 if(!af_append(s,s->last,s->cfg.list[i++]))
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
287 return -1;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
288 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
289 }
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 // Init filters
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
293 if(AF_OK != af_reinit(s,s->first))
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
294 return -1;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
295
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
296 // Check output format
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
297 if(cfg!=FORCE){
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
298 af_instance_t* af = NULL; // New filter
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
299 // 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
300 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
301 if(NULL==(af=af_get(s,"resample"))){
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
302 if(cfg==SLOW){
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
303 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
304 af = af_append(s,s->first,"resample");
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
305 else
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
306 af = af_prepend(s,s->first,"resample");
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
307 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
308 else{
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
309 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
310 af = af_prepend(s,s->last,"resample");
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
311 else
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
312 af = af_append(s,s->last,"resample");
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
313 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
314 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
315 // 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
316 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
317 return -1;
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
318 if(AF_OK != af_reinit(s,af))
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
319 return -1;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
320 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
321
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
322 // Check number of output channels fix if not OK
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
323 // 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
324 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
325 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
326 af = af_prepend(s,s->last,"channels");
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
327 else
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
328 af = af_append(s,s->last,"channels");
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
329 // 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
330 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
331 return -1;
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
332 if(AF_OK != af_reinit(s,af))
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
333 return -1;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
334 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
335
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
336 // 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
337 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
338 (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
339 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
340 af = af_append(s,s->last,"format");
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
341 else
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
342 af = s->last;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
343 // 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
344 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
345 return -1;
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,af))
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
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
350 // 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
351 if(AF_OK != af_reinit(s,s->first))
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
352 return -1;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
353
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
354 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
355 (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
356 (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
357 (s->last->data->rate != s->output.rate)) {
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
358 // Something is stuffed audio out will not work
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
359 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
360 af_uninit(s);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
361 return -1;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
362 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
363 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
364 return 0;
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
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
367 // 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
368 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
369 {
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
370 af_instance_t* af=s->first;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
371 // Iterate through all filters
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
372 do{
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
373 data=af->play(af,data);
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
374 af=af->next;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
375 }while(af);
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
376 return data;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
377 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
378
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
379 /* Helper function used to calculate the exact buffer length needed
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
380 when buffers are resized. The returned length is >= than what is
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
381 needed */
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
382 inline int af_lencalc(frac_t mul, af_data_t* d){
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
383 register int t = d->bps*d->nch;
7590
0cba73469341 Fixing the fix buffer overrun should work now
anders
parents: 7589
diff changeset
384 return t*(((d->len/t)*mul.n)/mul.d + 1);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
385 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
386
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
387 /* Calculate how long the output from the filters will be given the
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
388 input length "len". The calculated length is >= the actual
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
389 length. */
7571
8819fdf88b5d Adding support for multiple audio streams and removing annoying message from resample and format
anders
parents: 7568
diff changeset
390 int af_outputlen(af_stream_t* s, int len)
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
391 {
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
392 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
393 af_instance_t* af=s->first;
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
394 register frac_t mul = {1,1};
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
395 // Iterate through all filters
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
396 do{
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
397 mul.n *= af->mul.n;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
398 mul.d *= af->mul.d;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
399 af=af->next;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
400 }while(af);
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
401 return t * (((len/t)*mul.n + 1)/mul.d);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
402 }
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 /* 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
405 certain output length, i.e. the return value of this function is
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
406 the input length required to produce the output length "len". The
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
407 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
408 int af_inputlen(af_stream_t* s, int len)
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
409 {
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
410 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
411 af_instance_t* af=s->first;
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
412 register frac_t mul = {1,1};
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
413 // Iterate through all filters
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
414 do{
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
415 mul.n *= af->mul.n;
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
416 mul.d *= af->mul.d;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
417 af=af->next;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
418 }while(af);
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
419 return t * (((len/t) * mul.d - 1)/mul.n);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
420 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
421
7598
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
422 /* 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
423 a certain output length OUT but with the following three constraints:
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
424 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
425 block length
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
426 2. OUT <= max_outsize, where max_outsize is the maximum possible
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
427 output block length
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
428 3. If possible OUT >= len.
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
429 Return -1 in case of error */
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
430 int af_calc_insize_constrained(af_stream_t* s, int len,
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
431 int max_outsize,int max_insize)
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
432 {
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
433 int t = s->input.bps*s->input.nch;
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
434 int in = 0;
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
435 int out = 0;
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
436 af_instance_t* af=s->first;
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
437 register frac_t mul = {1,1};
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
438 // Iterate through all filters and calculate total multiplication factor
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
439 do{
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
440 mul.n *= af->mul.n;
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
441 mul.d *= af->mul.d;
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
442 af=af->next;
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
443 }while(af);
7603
c89106306f5a af_calc_insize_constrained() rounding changes, works better for me this way
arpi
parents: 7599
diff changeset
444 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
445
c89106306f5a af_calc_insize_constrained() rounding changes, works better for me this way
arpi
parents: 7599
diff changeset
446 if(in>max_insize) in=t*(max_insize/t);
7598
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
447
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
448 // Try to meet constraint nr 3.
7612
arpi
parents: 7603
diff changeset
449 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
450 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
451 in+=t;
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
452 }
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
453
7603
c89106306f5a af_calc_insize_constrained() rounding changes, works better for me this way
arpi
parents: 7599
diff changeset
454 // printf("Could no meet constraint nr 3. in=%d out=%d len=%d max_in=%d max_out=%d",
c89106306f5a af_calc_insize_constrained() rounding changes, works better for me this way
arpi
parents: 7599
diff changeset
455 // in,out,len,max_insize,max_outsize);
c89106306f5a af_calc_insize_constrained() rounding changes, works better for me this way
arpi
parents: 7599
diff changeset
456
7598
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
457 // 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
458 while(out > max_outsize || in > max_insize){
7598
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
459 in-=t;
7603
c89106306f5a af_calc_insize_constrained() rounding changes, works better for me this way
arpi
parents: 7599
diff changeset
460 if(in<t) return -1; // Input parameters are probably incorrect
7598
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
461 out = t * (((in/t)*mul.n + 1)/mul.d);
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
462 }
7603
c89106306f5a af_calc_insize_constrained() rounding changes, works better for me this way
arpi
parents: 7599
diff changeset
463 return in;
7598
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
464 }
48f8c731efb5 Adding function for estimating required buffer length
anders
parents: 7590
diff changeset
465
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
466 /* Helper function called by the macro with the same name this
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
467 function should not be called directly */
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
468 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
469 {
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
470 // Calculate new length
7589
443b440798a5 Redesign of buffer length calculation
anders
parents: 7581
diff changeset
471 register int len = af_lencalc(af->mul,data);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
472 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
473 // If there is a buffer free it
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
474 if(af->data->audio)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
475 free(af->data->audio);
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
476 // Create new buffer and check that it is OK
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
477 af->data->audio = malloc(len);
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
478 if(!af->data->audio){
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
479 mp_msg(MSGT_AFILTER,MSGL_ERR,"Could not allocate memory \n");
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
480 return AF_ERROR;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
481 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
482 af->data->len=len;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
483 return AF_OK;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
484 }