kc3-lang/SDL

Browse

Commit bec721f08a583eb13705e99b18c98828a3b0036e

Ryan C. Gordon 2022-07-20T17:22:41

audio: Fixed dst pointer on channel conversions that grow in-place. 

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269

diff --git a/build-scripts/gen_audio_channel_conversion.c b/build-scripts/gen_audio_channel_conversion.c
index e74ed26..37b370e 100644
--- a/build-scripts/gen_audio_channel_conversion.c
+++ b/build-scripts/gen_audio_channel_conversion.c
@@ -266,7 +266,7 @@ static void write_converter(const int fromchans, const int tochans)
            "{\n", remove_dots(fromstr), remove_dots(tostr));
 
     if (convert_backwards) {  /* must convert backwards when growing the output in-place. */
-        printf("    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / %d) * %d)));\n", fromchans, tochans - 1);
+        printf("    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / %d) * %d))) - %d;\n", fromchans, tochans, tochans);
         printf("    const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - %d;\n", fromchans);
     } else {
         printf("    float *dst = (float *) cvt->buf;\n");
diff --git a/src/audio/SDL_audio_channel_converters.h b/src/audio/SDL_audio_channel_converters.h
index 5794a12..fea9ad1 100644
--- a/src/audio/SDL_audio_channel_converters.h
+++ b/src/audio/SDL_audio_channel_converters.h
@@ -24,7 +24,7 @@
 static void SDLCALL
 SDL_ConvertMonoToStereo(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 1) * 1)));
+    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 1) * 2))) - 2;
     const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 1;
     int i;
 
@@ -47,7 +47,7 @@ SDL_ConvertMonoToStereo(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 static void SDLCALL
 SDL_ConvertMonoTo21(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 1) * 2)));
+    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 1) * 3))) - 3;
     const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 1;
     int i;
 
@@ -71,7 +71,7 @@ SDL_ConvertMonoTo21(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 static void SDLCALL
 SDL_ConvertMonoToQuad(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 1) * 3)));
+    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 1) * 4))) - 4;
     const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 1;
     int i;
 
@@ -96,7 +96,7 @@ SDL_ConvertMonoToQuad(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 static void SDLCALL
 SDL_ConvertMonoTo41(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 1) * 4)));
+    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 1) * 5))) - 5;
     const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 1;
     int i;
 
@@ -122,7 +122,7 @@ SDL_ConvertMonoTo41(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 static void SDLCALL
 SDL_ConvertMonoTo51(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 1) * 5)));
+    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 1) * 6))) - 6;
     const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 1;
     int i;
 
@@ -149,7 +149,7 @@ SDL_ConvertMonoTo51(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 static void SDLCALL
 SDL_ConvertMonoTo61(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 1) * 6)));
+    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 1) * 7))) - 7;
     const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 1;
     int i;
 
@@ -177,7 +177,7 @@ SDL_ConvertMonoTo61(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 static void SDLCALL
 SDL_ConvertMonoTo71(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 1) * 7)));
+    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 1) * 8))) - 8;
     const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 1;
     int i;
 
@@ -226,7 +226,7 @@ SDL_ConvertStereoToMono(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 static void SDLCALL
 SDL_ConvertStereoTo21(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 2) * 2)));
+    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 2) * 3))) - 3;
     const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 2;
     int i;
 
@@ -249,7 +249,7 @@ SDL_ConvertStereoTo21(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 static void SDLCALL
 SDL_ConvertStereoToQuad(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 2) * 3)));
+    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 2) * 4))) - 4;
     const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 2;
     int i;
 
@@ -273,7 +273,7 @@ SDL_ConvertStereoToQuad(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 static void SDLCALL
 SDL_ConvertStereoTo41(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 2) * 4)));
+    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 2) * 5))) - 5;
     const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 2;
     int i;
 
@@ -298,7 +298,7 @@ SDL_ConvertStereoTo41(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 static void SDLCALL
 SDL_ConvertStereoTo51(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 2) * 5)));
+    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 2) * 6))) - 6;
     const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 2;
     int i;
 
@@ -324,7 +324,7 @@ SDL_ConvertStereoTo51(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 static void SDLCALL
 SDL_ConvertStereoTo61(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 2) * 6)));
+    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 2) * 7))) - 7;
     const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 2;
     int i;
 
@@ -351,7 +351,7 @@ SDL_ConvertStereoTo61(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 static void SDLCALL
 SDL_ConvertStereoTo71(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 2) * 7)));
+    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 2) * 8))) - 8;
     const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 2;
     int i;
 
@@ -421,7 +421,7 @@ SDL_Convert21ToStereo(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 static void SDLCALL
 SDL_Convert21ToQuad(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 3) * 3)));
+    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 3) * 4))) - 4;
     const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 3;
     int i;
 
@@ -446,7 +446,7 @@ SDL_Convert21ToQuad(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 static void SDLCALL
 SDL_Convert21To41(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 3) * 4)));
+    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 3) * 5))) - 5;
     const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 3;
     int i;
 
@@ -471,7 +471,7 @@ SDL_Convert21To41(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 static void SDLCALL
 SDL_Convert21To51(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 3) * 5)));
+    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 3) * 6))) - 6;
     const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 3;
     int i;
 
@@ -497,7 +497,7 @@ SDL_Convert21To51(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 static void SDLCALL
 SDL_Convert21To61(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 3) * 6)));
+    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 3) * 7))) - 7;
     const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 3;
     int i;
 
@@ -524,7 +524,7 @@ SDL_Convert21To61(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 static void SDLCALL
 SDL_Convert21To71(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 3) * 7)));
+    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 3) * 8))) - 8;
     const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 3;
     int i;
 
@@ -619,7 +619,7 @@ SDL_ConvertQuadTo21(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 static void SDLCALL
 SDL_ConvertQuadTo41(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 4) * 4)));
+    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 4) * 5))) - 5;
     const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 4;
     int i;
 
@@ -644,7 +644,7 @@ SDL_ConvertQuadTo41(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 static void SDLCALL
 SDL_ConvertQuadTo51(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 4) * 5)));
+    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 4) * 6))) - 6;
     const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 4;
     int i;
 
@@ -670,7 +670,7 @@ SDL_ConvertQuadTo51(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 static void SDLCALL
 SDL_ConvertQuadTo61(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 4) * 6)));
+    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 4) * 7))) - 7;
     const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 4;
     int i;
 
@@ -699,7 +699,7 @@ SDL_ConvertQuadTo61(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 static void SDLCALL
 SDL_ConvertQuadTo71(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 4) * 7)));
+    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 4) * 8))) - 8;
     const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 4;
     int i;
 
@@ -819,7 +819,7 @@ SDL_Convert41ToQuad(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 static void SDLCALL
 SDL_Convert41To51(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 5) * 5)));
+    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 5) * 6))) - 6;
     const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 5;
     int i;
 
@@ -845,7 +845,7 @@ SDL_Convert41To51(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 static void SDLCALL
 SDL_Convert41To61(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 5) * 6)));
+    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 5) * 7))) - 7;
     const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 5;
     int i;
 
@@ -874,7 +874,7 @@ SDL_Convert41To61(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 static void SDLCALL
 SDL_Convert41To71(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 5) * 7)));
+    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 5) * 8))) - 8;
     const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 5;
     int i;
 
@@ -1022,7 +1022,7 @@ SDL_Convert51To41(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 static void SDLCALL
 SDL_Convert51To61(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 6) * 6)));
+    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 6) * 7))) - 7;
     const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 6;
     int i;
 
@@ -1051,7 +1051,7 @@ SDL_Convert51To61(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 static void SDLCALL
 SDL_Convert51To71(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 6) * 7)));
+    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 6) * 8))) - 8;
     const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 6;
     int i;
 
@@ -1235,7 +1235,7 @@ SDL_Convert61To51(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 static void SDLCALL
 SDL_Convert61To71(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 7) * 7)));
+    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 7) * 8))) - 8;
     const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 7;
     int i;
kmx.io     mail     discord kmxgit v0.4.0