Mercurial > sdl-ios-xcode
annotate src/thread/linux/clone.S @ 942:41a59de7f2ed
Here are patches for SDL12 and SDL_mixer for 4 or 6 channel
surround sound on Linux using the Alsa driver. To use them, naturally
you need a sound card that will do 4 or 6 channels and probably also a
recent version of the Alsa drivers and library. Since the only SDL
output driver that knows about surround sound is the Alsa driver,
you���ll want to choose it, using:
export SDL_AUDIODRIVER=alsa
There are no syntactic changes to the programming API. No new
library calls, no differences in arguments.
There are two semantic changes:
(1) For library calls with number of channels as an argument, formerly
you could use only 1 or 2 for the number of channels. Now you
can also use 4 or 6.
(2) The two "left" and "right" arguments to Mix_SetPanning, for the
case of 4 or 6 channels, no longer simply control the volumes of
the left and right channels. Now the "left" argument is converted
to an angle and Mix_SetPosition is called, and the "right" argu-
ment is ignored.
With two exceptions, so far as I know, the modified SDL12 and
SDL_mixer work the same way as the original versions, when opened for
1 or 2 channel output. The two exceptions are bugs which I fixed.
Well, the first, anyway, is a bug for sure. When rate conversions up
or down by a factor of two are applied (in src/audio/SDL_audiocvt.c),
streams with different numbers of channels (that is, mono and stereo)
are treated the same way: either each sample is copied or every other
sample is omitted. This is ok for mono, but for stereo, it is frames
that should be copied or omitted, where by "frame" I mean a portion of
the stream containing one sample for each channel. (In the SDL source,
confusingly, sometimes frames are called "samples".) So for these
rate conversions, stereo streams have to be treated differently, and
they are, in my modified version.
The other problem that might be characterized as a bug arises
when SDL_mixer is passed a multichannel chunk which does not have an
integral number of frames. Due to the way the effect_position code
loops over frames, when the chunk ends with a partial frame, memory
outside the chunk buffer will be accessed. In the case of stereo,
it���s possible that because malloc may give more memory than requested,
this potential problem never actually causes a segment fault. I don���t
know. For 6 channel chunks, I do know, and it does cause segment
faults.
If SDL_mixer is passed defective chunks and this causes a segment
fault, arguably, that���s not a bug in SDL_mixer. Still, whether or not
it counts as a bug, it���s easy to protect against, so why not? I added
code in mixer.c to discard any partial frame at the end of a chunk.
Then what about when SDL or SDL_mixer is opened for 4 or 6 chan-
nel output? What happens with the parts of the current library
designed for stereo? I don���t know whether I���ve covered all the bases,
but I���ve tried:
(1) For playing 2 channel waves, or other cases where SDL knows it has
to match up a 2 channel source with a 4 or 6 channel output, I���ve
added code in SDL_audiocvt.c to make the necessary conversions.
(2) For playing midis using timidity, I���ve converted timidity to do 4
or 6 channel output, upon request.
(3) For playing mods using mikmod, I put ad hoc code in music.c to
convert the stereo output that mikmod produces to 4 or 6 chan-
nels. Obviously it would be better to change the mikmod code to
mix down into 4 or 6 channels, but I have a hard time following
the code in mikmod, so I didn���t do that.
(4) For playing mp3s, I put ad hoc code in smpeg to copy channels in
the case when 4 or 6 channel output is needed.
(5) There seems to be no problem with .ogg files - stereo .oggs can be
up converted as .wavs are.
(6) The effect_position code in SDL_mixer is now generalized to in-
clude the cases of 4 and 6 channel streams.
I���ve done a very limited amount of compatibility testing for some
of the games using SDL I happen to have. For details, see the file
TESTS.
I���ve put into a separate archive, Surround-SDL-testfiles.tgz, a
couple of 6 channel wave files for testing and a 6 channel ogg file.
If you have the right hardware and version of Alsa, you should be able
to play the wave files with the Alsa utility aplay (and hear all
channels, except maybe lfe, for chan-id.wav, since it���s rather faint).
Don���t expect aplay to give good sound, though. There���s something
wrong with the current version of aplay.
The canyon.ogg file is to test loading of 6 channel oggs. After
patching and compiling, you can play it with playmus. (My version of
ogg123 will not play it, and I had to patch mplayer to get it to play
6 channel oggs.)
Greg Lee <greg@ling.lll.hawaii.edu>
Thus, July 1, 2004
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Sat, 21 Aug 2004 12:27:02 +0000 |
parents | 74212992fb08 |
children | 974ba6ae0fa3 |
rev | line source |
---|---|
0 | 1 |
2 /* Taken with thanks from LinuxThreads 0.6 */ | |
3 | |
4 /* This is no longer necessary with glibc-2.1, which has it's own clone() */ | |
5 #ifdef linux | |
6 /* Look to see if glibc is available, and if so, what version */ | |
7 #include <features.h> | |
8 | |
9 #if (__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 1)) | |
10 #define HAVE_CLONE | |
11 #endif /* glibc 2.1 or newer */ | |
12 #endif /* linux */ | |
13 | |
14 #if defined(linux) && !defined(SDL_USE_PTHREADS) && !defined(HAVE_CLONE) | |
15 | |
16 #if defined(__i386__) | |
17 /************************************************************************/ | |
18 /* Copyright (C) 1996, 1997 Free Software Foundation, Inc. | |
19 Contributed by Richard Henderson (rth@tamu.edu) | |
20 | |
21 The GNU C Library is free software; you can redistribute it and/or | |
22 modify it under the terms of the GNU Library General Public License as | |
23 published by the Free Software Foundation; either version 2 of the | |
24 License, or (at your option) any later version. | |
25 | |
26 The GNU C Library is distributed in the hope that it will be useful, | |
27 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
28 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
29 Library General Public License for more details. | |
30 | |
31 You should have received a copy of the GNU Library General Public | |
32 License along with the GNU C Library; see the file COPYING.LIB. If | |
33 not, write to the Free Software Foundation, Inc., 675 Mass Ave, | |
34 | |
35 #ifdef SAVE_RCSID | |
36 static char rcsid = | |
37 "@(#) $Id$"; | |
38 #endif | |
39 Cambridge, MA 02139, USA. */ | |
40 | |
41 /* clone() is even more special than fork() as it mucks with stacks | |
42 and invokes a function in the right context after its all over. */ | |
43 | |
44 #include <asm/errno.h> | |
45 #include <asm/unistd.h> | |
46 | |
47 /* int clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg); */ | |
48 | |
49 .text | |
50 .align 4 | |
51 .globl __clone | |
52 .type __clone,@function | |
53 .weak clone | |
54 clone = __clone | |
55 __clone: | |
56 /* Sanity check arguments. */ | |
57 movl $-EINVAL,%eax | |
58 movl 4(%esp),%ecx /* no NULL function pointers */ | |
59 testl %ecx,%ecx | |
60 jz syscall_error | |
61 movl 8(%esp),%ecx /* no NULL stack pointers */ | |
62 testl %ecx,%ecx | |
63 jz syscall_error | |
64 | |
65 /* Insert the argument onto the new stack. */ | |
66 subl $8,%ecx | |
67 movl 16(%esp),%eax | |
68 movl %eax,4(%ecx) | |
69 | |
70 /* Save the function pointer as the zeroth argument. */ | |
71 /* It will be popped off in the child in the ebx frobbing below. */ | |
72 movl 4(%esp),%eax | |
73 movl %eax,0(%ecx) | |
74 | |
75 /* Do the system call */ | |
76 pushl %ebx | |
77 movl 16(%esp),%ebx | |
78 movl $__NR_clone,%eax | |
79 int $0x80 | |
80 popl %ebx | |
81 | |
82 test %eax,%eax | |
83 jl syscall_error | |
84 jz thread_start | |
85 | |
86 ret | |
87 | |
88 syscall_error: | |
89 negl %eax | |
90 pushl %eax | |
91 #ifdef __PIC__ | |
92 call __errno_location@PLT | |
93 #else | |
94 call __errno_location | |
95 #endif | |
96 popl 0(%eax) | |
97 movl $-1, %eax | |
98 ret | |
99 | |
100 thread_start: | |
101 subl %ebp,%ebp /* terminate the stack frame */ | |
102 call *%ebx | |
103 pushl %eax | |
104 #ifdef __PIC__ | |
105 call _exit@PLT | |
106 #else | |
107 call _exit | |
108 #endif | |
109 /************************************************************************/ | |
110 #elif defined(sparc) | |
111 /************************************************************************/ | |
112 /* Copyright (C) 1996, 1997 Free Software Foundation, Inc. | |
113 Contributed by Miguel de Icaza (miguel@nuclecu.unam.mx) | |
114 Based on code written for the Intel by Richard | |
115 Henderson (rth@tamu.edu) | |
116 | |
117 The GNU C Library is free software; you can redistribute it and/or | |
118 modify it under the terms of the GNU Library General Public License as | |
119 published by the Free Software Foundation; either version 2 of the | |
120 License, or (at your option) any later version. | |
121 | |
122 The GNU C Library is distributed in the hope that it will be useful, | |
123 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
124 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
125 Library General Public License for more details. | |
126 | |
127 You should have received a copy of the GNU Library General Public | |
128 License along with the GNU C Library; see the file COPYING.LIB. If | |
129 not, write to the Free Software Foundation, Inc., 675 Mass Ave, | |
130 Cambridge, MA 02139, USA. */ | |
131 | |
132 /* clone() is even more special than fork() as it mucks with stacks | |
133 and invokes a function in the right context after its all over. */ | |
134 | |
135 #include <asm/errno.h> | |
136 #include <asm/unistd.h> | |
137 | |
138 /* int clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg); */ | |
139 | |
140 .text | |
141 .align 4 | |
142 .globl __clone | |
143 .type __clone,@function | |
144 .weak clone | |
145 clone = __clone | |
146 __clone: | |
147 save %sp,-96,%sp | |
148 /* sanity check arguments */ | |
149 tst %i0 | |
150 be __clone_syscall_error | |
151 tst %i1 | |
152 be __clone_syscall_error | |
153 nop | |
154 | |
155 /* Do the system call */ | |
156 mov %i1,%o1 | |
157 mov %i2,%o0 | |
158 set __NR_clone,%g1 | |
159 ta 0x10 | |
160 bcs __clone_syscall_error | |
161 tst %o1 | |
162 bne __thread_start | |
163 nop | |
164 mov %o0,%i0 | |
165 ret | |
166 restore | |
167 | |
168 __clone_syscall_error: | |
169 call __errno_location | |
170 set EINVAL,%i0 | |
171 st %i0,[%o0] | |
172 mov -1,%i0 | |
173 ret | |
174 restore | |
175 | |
176 __thread_start: | |
177 call %i0 | |
178 mov %i3,%o0 | |
179 call _exit,0 | |
180 nop | |
181 /************************************************************************/ | |
182 #else | |
183 #error "Unknown Linux architecture" | |
184 #endif | |
185 | |
186 #endif /* Linux && ! SDL_USE_PTHREADS */ |