Mercurial > sdl-ios-xcode
annotate src/audio/SDL_wave.h @ 1544:ab1e4c41ab71
Fixed bug #33
Mike Frysinger wrote:
> with libsdl-1.2.9, some games (like bomberclone) started
> segfaulting in Gentoo
[...snip...]
> the last change in the last hunk:
[...snip...]
> if i change the statement to read:
> (table[which].blit_features & GetBlitFeatures()) == GetBlitFeatures()
> bomberclone no longer segfaults on my box
Alex Volkov wrote:
> The test "(table[which].blit_features & GetBlitFeatures()) ==
> table[which].blit_features)" is correct, and the previous
> "(table[which].cpu_mmx == SDL_HasMMX())" was actually broken.
I think there is potentially a slightly different cause of the above problem.
During the introduction of the Altivec code, the blit_table struct field
'alpha' got changed from a straightforward enum to a bitmask, which makes
perfect sense by itself. However, now the table driven blitter selection code
in SDL_CalculateBlitN() can choose the wrong blitters when searching for a
NO_ALPHA blitter because of the following code:
int a_need = 0;
...
(a_need & table[which].alpha) == a_need &&
When searching through the normal_blit_2[] table, a SET_ALPHA blitter (like
Blit_RGB565_ARGB8888) can now be selected instead of a NO_ALPHA one, causing
alpha channel bits to appear in a non-alpha destination surface. I suppose this
could theoretically be an indirect cause of the segfault mentioned above.
I *think* this can be fixed by changing to
int a_need = NO_ALPHA;
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Wed, 15 Mar 2006 15:47:49 +0000 |
parents | d910939febfa |
children | 14717b52abc0 |
rev | line source |
---|---|
0 | 1 /* |
2 SDL - Simple DirectMedia Layer | |
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
3 Copyright (C) 1997-2006 Sam Lantinga |
0 | 4 |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
5 This library is SDL_free software; you can redistribute it and/or |
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
6 modify it under the terms of the GNU Lesser General Public |
0 | 7 License as published by the Free Software Foundation; either |
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
8 version 2.1 of the License, or (at your option) any later version. |
0 | 9 |
10 This library is distributed in the hope that it will be useful, | |
11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
13 Lesser General Public License for more details. |
0 | 14 |
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
15 You should have received a copy of the GNU Lesser General Public |
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
16 License along with this library; if not, write to the Free Software |
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
0 | 18 |
19 Sam Lantinga | |
252
e8157fcb3114
Updated the source with the correct e-mail address
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
20 slouken@libsdl.org |
0 | 21 */ |
1402
d910939febfa
Use consistent identifiers for the various platforms we support.
Sam Lantinga <slouken@libsdl.org>
parents:
1336
diff
changeset
|
22 #include "SDL_config.h" |
0 | 23 |
24 /* WAVE files are little-endian */ | |
25 | |
26 /*******************************************/ | |
27 /* Define values for Microsoft WAVE format */ | |
28 /*******************************************/ | |
29 #define RIFF 0x46464952 /* "RIFF" */ | |
30 #define WAVE 0x45564157 /* "WAVE" */ | |
31 #define FACT 0x74636166 /* "fact" */ | |
32 #define LIST 0x5453494c /* "LIST" */ | |
33 #define FMT 0x20746D66 /* "fmt " */ | |
34 #define DATA 0x61746164 /* "data" */ | |
35 #define PCM_CODE 0x0001 | |
36 #define MS_ADPCM_CODE 0x0002 | |
37 #define IMA_ADPCM_CODE 0x0011 | |
38 #define WAVE_MONO 1 | |
39 #define WAVE_STEREO 2 | |
40 | |
41 /* Normally, these three chunks come consecutively in a WAVE file */ | |
42 typedef struct WaveFMT { | |
43 /* Not saved in the chunk we read: | |
44 Uint32 FMTchunk; | |
45 Uint32 fmtlen; | |
46 */ | |
47 Uint16 encoding; | |
48 Uint16 channels; /* 1 = mono, 2 = stereo */ | |
49 Uint32 frequency; /* One of 11025, 22050, or 44100 Hz */ | |
50 Uint32 byterate; /* Average bytes per second */ | |
51 Uint16 blockalign; /* Bytes per sample block */ | |
52 Uint16 bitspersample; /* One of 8, 12, 16, or 4 for ADPCM */ | |
53 } WaveFMT; | |
54 | |
55 /* The general chunk found in the WAVE file */ | |
56 typedef struct Chunk { | |
57 Uint32 magic; | |
58 Uint32 length; | |
722
90dfd3f5782c
*** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
59 Uint8 *data; |
0 | 60 } Chunk; |
61 |