annotate libaf/af_channels.c @ 23514:eb85913b9dc3

Don't set random codec parameters for AC3/DTS in mkv. Those values are not needed anyway. This fixes stream copying from mkv with mencoder. Patch by Trent Piepho.
author aurel
date Sun, 10 Jun 2007 16:45:30 +0000
parents 904e3f3f8bee
children b2402b4f0afa
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 /* Audio filter that adds and removes channels, according to the
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
2 command line parameter channels. It is stupid and can only add
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
3 silence or copy channels not mix or filter.
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 #include <stdio.h>
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
6 #include <stdlib.h>
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
7 #include <string.h>
7975
6e03baea602f Adding compile problem fix from Gabucino
anders
parents: 7615
diff changeset
8 #include <inttypes.h>
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
9
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
10 #include "af.h"
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
11
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
12 #define FR 0
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
13 #define TO 1
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
14
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
15 typedef struct af_channels_s{
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
16 int route[AF_NCH][2];
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
17 int nr;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
18 int router;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
19 }af_channels_t;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
20
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
21 // Local function for copying data
8711
906f7a2dc085 sig 11 fix in reinit and resample + spelling error fixes
anders
parents: 8607
diff changeset
22 static void copy(void* in, void* out, int ins, int inos,int outs, int outos, int len, int bps)
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
23 {
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
24 switch(bps){
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
25 case 1:{
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
26 int8_t* tin = (int8_t*)in;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
27 int8_t* tout = (int8_t*)out;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
28 tin += inos;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
29 tout += outos;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
30 len = len/ins;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
31 while(len--){
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
32 *tout=*tin;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
33 tin +=ins;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
34 tout+=outs;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
35 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
36 break;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
37 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
38 case 2:{
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
39 int16_t* tin = (int16_t*)in;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
40 int16_t* tout = (int16_t*)out;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
41 tin += inos;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
42 tout += outos;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
43 len = len/(2*ins);
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
44 while(len--){
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
45 *tout=*tin;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
46 tin +=ins;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
47 tout+=outs;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
48 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
49 break;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
50 }
12913
e7309a3b65f6 support for 24 bit audio
reimar
parents: 12008
diff changeset
51 case 3:{
e7309a3b65f6 support for 24 bit audio
reimar
parents: 12008
diff changeset
52 int8_t* tin = (int8_t*)in;
e7309a3b65f6 support for 24 bit audio
reimar
parents: 12008
diff changeset
53 int8_t* tout = (int8_t*)out;
e7309a3b65f6 support for 24 bit audio
reimar
parents: 12008
diff changeset
54 tin += 3 * inos;
e7309a3b65f6 support for 24 bit audio
reimar
parents: 12008
diff changeset
55 tout += 3 * outos;
e7309a3b65f6 support for 24 bit audio
reimar
parents: 12008
diff changeset
56 len = len / ( 3 * ins);
e7309a3b65f6 support for 24 bit audio
reimar
parents: 12008
diff changeset
57 while (len--) {
e7309a3b65f6 support for 24 bit audio
reimar
parents: 12008
diff changeset
58 tout[0] = tin[0];
e7309a3b65f6 support for 24 bit audio
reimar
parents: 12008
diff changeset
59 tout[1] = tin[1];
e7309a3b65f6 support for 24 bit audio
reimar
parents: 12008
diff changeset
60 tout[2] = tin[2];
e7309a3b65f6 support for 24 bit audio
reimar
parents: 12008
diff changeset
61 tin += 3 * ins;
e7309a3b65f6 support for 24 bit audio
reimar
parents: 12008
diff changeset
62 tout += 3 * outs;
e7309a3b65f6 support for 24 bit audio
reimar
parents: 12008
diff changeset
63 }
e7309a3b65f6 support for 24 bit audio
reimar
parents: 12008
diff changeset
64 break;
e7309a3b65f6 support for 24 bit audio
reimar
parents: 12008
diff changeset
65 }
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
66 case 4:{
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
67 int32_t* tin = (int32_t*)in;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
68 int32_t* tout = (int32_t*)out;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
69 tin += inos;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
70 tout += outos;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
71 len = len/(4*ins);
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
72 while(len--){
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
73 *tout=*tin;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
74 tin +=ins;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
75 tout+=outs;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
76 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
77 break;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
78 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
79 case 8:{
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
80 int64_t* tin = (int64_t*)in;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
81 int64_t* tout = (int64_t*)out;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
82 tin += inos;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
83 tout += outos;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
84 len = len/(8*ins);
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
85 while(len--){
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
86 *tout=*tin;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
87 tin +=ins;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
88 tout+=outs;
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 break;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
91 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
92 default:
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
93 af_msg(AF_MSG_ERROR,"[channels] Unsupported number of bytes/sample: %i"
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
94 " please report this error on the MPlayer mailing list. \n",bps);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
95 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
96 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
97
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
98 // Make sure the routes are sane
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
99 static int check_routes(af_channels_t* s, int nin, int nout)
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
100 {
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
101 int i;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
102 if((s->nr < 1) || (s->nr > AF_NCH)){
8711
906f7a2dc085 sig 11 fix in reinit and resample + spelling error fixes
anders
parents: 8607
diff changeset
103 af_msg(AF_MSG_ERROR,"[channels] The number of routing pairs must be"
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
104 " between 1 and %i. Current value is %i\n",AF_NCH,s->nr);
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
105 return AF_ERROR;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
106 }
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
107
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
108 for(i=0;i<s->nr;i++){
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
109 if((s->route[i][FR] >= nin) || (s->route[i][TO] >= nout)){
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
110 af_msg(AF_MSG_ERROR,"[channels] Invalid routing in pair nr. %i.\n", i);
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
111 return AF_ERROR;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
112 }
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
113 }
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
114 return AF_OK;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
115 }
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
116
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
117 // Initialization and runtime control
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
118 static int control(struct af_instance_s* af, int cmd, void* arg)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
119 {
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
120 af_channels_t* s = af->setup;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
121 switch(cmd){
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
122 case AF_CONTROL_REINIT:
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
123
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
124 // Set default channel assignment
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
125 if(!s->router){
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
126 int i;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
127 // Make sure this filter isn't redundant
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
128 if(af->data->nch == ((af_data_t*)arg)->nch)
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
129 return AF_DETACH;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
130
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
131 // If mono: fake stereo
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
132 if(((af_data_t*)arg)->nch == 1){
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
133 s->nr = min(af->data->nch,2);
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
134 for(i=0;i<s->nr;i++){
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
135 s->route[i][FR] = 0;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
136 s->route[i][TO] = i;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
137 }
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
138 }
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
139 else{
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
140 s->nr = min(af->data->nch, ((af_data_t*)arg)->nch);
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
141 for(i=0;i<s->nr;i++){
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
142 s->route[i][FR] = i;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
143 s->route[i][TO] = i;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
144 }
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
145 }
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
146 }
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
147
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
148 af->data->rate = ((af_data_t*)arg)->rate;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
149 af->data->format = ((af_data_t*)arg)->format;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
150 af->data->bps = ((af_data_t*)arg)->bps;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
151 af->mul.n = af->data->nch;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
152 af->mul.d = ((af_data_t*)arg)->nch;
14433
95bb94a930a3 always cancel down fractions (frac_t) to avoid overflows and playback
reimar
parents: 12913
diff changeset
153 af_frac_cancel(&af->mul);
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
154 return check_routes(s,((af_data_t*)arg)->nch,af->data->nch);
7998
d48a06d07afb Adding commandline options for filters and fixing stupid bug in cfg
anders
parents: 7975
diff changeset
155 case AF_CONTROL_COMMAND_LINE:{
d48a06d07afb Adding commandline options for filters and fixing stupid bug in cfg
anders
parents: 7975
diff changeset
156 int nch = 0;
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
157 int n = 0;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
158 // Check number of channels and number of routing pairs
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
159 sscanf(arg, "%i:%i%n", &nch, &s->nr, &n);
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
160
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
161 // If router scan commandline for routing pairs
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
162 if(s->nr){
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
163 char* cp = &((char*)arg)[n];
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
164 int ch = 0;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
165 // Sanity check
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
166 if((s->nr < 1) || (s->nr > AF_NCH)){
8711
906f7a2dc085 sig 11 fix in reinit and resample + spelling error fixes
anders
parents: 8607
diff changeset
167 af_msg(AF_MSG_ERROR,"[channels] The number of routing pairs must be"
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
168 " between 1 and %i. Current value is %i\n",AF_NCH,s->nr);
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
169 }
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
170 s->router = 1;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
171 // Scan for pairs on commandline
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
172 while((*cp == ':') && (ch < s->nr)){
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
173 sscanf(cp, ":%i:%i%n" ,&s->route[ch][FR], &s->route[ch][TO], &n);
8711
906f7a2dc085 sig 11 fix in reinit and resample + spelling error fixes
anders
parents: 8607
diff changeset
174 af_msg(AF_MSG_VERBOSE,"[channels] Routing from channel %i to"
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
175 " channel %i\n",s->route[ch][FR],s->route[ch][TO]);
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
176 cp = &cp[n];
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
177 ch++;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
178 }
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
179 }
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
180
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
181 if(AF_OK != af->control(af,AF_CONTROL_CHANNELS | AF_CONTROL_SET ,&nch))
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
182 return AF_ERROR;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
183 return AF_OK;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
184 }
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
185 case AF_CONTROL_CHANNELS | AF_CONTROL_SET:
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
186 // Reinit must be called after this function has been called
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
187
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
188 // Sanity check
12008
8631b43c9d82 10l - replace 6 with AF_NCH
henry
parents: 8711
diff changeset
189 if(((int*)arg)[0] <= 0 || ((int*)arg)[0] > AF_NCH){
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
190 af_msg(AF_MSG_ERROR,"[channels] The number of output channels must be"
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
191 " between 1 and %i. Current value is %i\n",AF_NCH,((int*)arg)[0]);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
192 return AF_ERROR;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
193 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
194
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
195 af->data->nch=((int*)arg)[0];
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
196 if(!s->router)
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
197 af_msg(AF_MSG_VERBOSE,"[channels] Changing number of channels"
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
198 " to %i\n",af->data->nch);
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
199 return AF_OK;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
200 case AF_CONTROL_CHANNELS | AF_CONTROL_GET:
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
201 *(int*)arg = af->data->nch;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
202 return AF_OK;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
203 case AF_CONTROL_CHANNELS_ROUTING | AF_CONTROL_SET:{
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
204 int ch = ((af_control_ext_t*)arg)->ch;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
205 int* route = ((af_control_ext_t*)arg)->arg;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
206 s->route[ch][FR] = route[FR];
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
207 s->route[ch][TO] = route[TO];
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
208 return AF_OK;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
209 }
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
210 case AF_CONTROL_CHANNELS_ROUTING | AF_CONTROL_GET:{
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
211 int ch = ((af_control_ext_t*)arg)->ch;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
212 int* route = ((af_control_ext_t*)arg)->arg;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
213 route[FR] = s->route[ch][FR];
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
214 route[TO] = s->route[ch][TO];
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
215 return AF_OK;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
216 }
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
217 case AF_CONTROL_CHANNELS_NR | AF_CONTROL_SET:
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
218 s->nr = *(int*)arg;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
219 return AF_OK;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
220 case AF_CONTROL_CHANNELS_NR | AF_CONTROL_GET:
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
221 *(int*)arg = s->nr;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
222 return AF_OK;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
223 case AF_CONTROL_CHANNELS_ROUTER | AF_CONTROL_SET:
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
224 s->router = *(int*)arg;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
225 return AF_OK;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
226 case AF_CONTROL_CHANNELS_ROUTER | AF_CONTROL_GET:
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
227 *(int*)arg = s->router;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
228 return AF_OK;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
229 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
230 return AF_UNKNOWN;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
231 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
232
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
233 // Deallocate memory
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
234 static void uninit(struct af_instance_s* af)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
235 {
22179
ecf562795caf Fix memory leaks.
uau
parents: 14433
diff changeset
236 free(af->setup);
ecf562795caf Fix memory leaks.
uau
parents: 14433
diff changeset
237 if (af->data)
ecf562795caf Fix memory leaks.
uau
parents: 14433
diff changeset
238 free(af->data->audio);
ecf562795caf Fix memory leaks.
uau
parents: 14433
diff changeset
239 free(af->data);
7568
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 // Filter data through filter
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
243 static af_data_t* play(struct af_instance_s* af, af_data_t* data)
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
244 {
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
245 af_data_t* c = data; // Current working data
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
246 af_data_t* l = af->data; // Local data
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
247 af_channels_t* s = af->setup;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
248 int i;
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
249
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
250 if(AF_OK != RESIZE_LOCAL_BUFFER(af,data))
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
251 return NULL;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
252
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
253 // Reset unused channels
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
254 memset(l->audio,0,(c->len*af->mul.n)/af->mul.d);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
255
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
256 if(AF_OK == check_routes(s,c->nch,l->nch))
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
257 for(i=0;i<s->nr;i++)
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
258 copy(c->audio,l->audio,c->nch,s->route[i][FR],
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
259 l->nch,s->route[i][TO],c->len,c->bps);
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
260
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
261 // Set output data
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
262 c->audio = l->audio;
7590
0cba73469341 Fixing the fix buffer overrun should work now
anders
parents: 7589
diff changeset
263 c->len = (c->len*af->mul.n)/af->mul.d;
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
264 c->nch = l->nch;
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 return c;
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
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
269 // Allocate memory and set function pointers
22746
fd6f824ef894 Rename open to af_open so as not to conflict with a previous header definition.
diego
parents: 22179
diff changeset
270 static int af_open(af_instance_t* af){
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
271 af->control=control;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
272 af->uninit=uninit;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
273 af->play=play;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
274 af->mul.n=1;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
275 af->mul.d=1;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
276 af->data=calloc(1,sizeof(af_data_t));
8607
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
277 af->setup=calloc(1,sizeof(af_channels_t));
d6f40a06867b Changes includes:
anders
parents: 8167
diff changeset
278 if((af->data == NULL) || (af->setup == NULL))
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
279 return AF_ERROR;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
280 return AF_OK;
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
281 }
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
282
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
283 // Description of this filter
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
284 af_info_t af_info_channels = {
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
285 "Insert or remove channels",
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
286 "channels",
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
287 "Anders",
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
288 "",
7615
c67328dd459a Adding Support for non-reentrant audio filters
anders
parents: 7590
diff changeset
289 AF_FLAGS_REENTRANT,
22746
fd6f824ef894 Rename open to af_open so as not to conflict with a previous header definition.
diego
parents: 22179
diff changeset
290 af_open
7568
d08513b9fed6 Adding new audio output filter layer libaf
anders
parents:
diff changeset
291 };