Commit 905e2e22efedb09df07b83adcb3813fa2785d0e8
2022-01-08T12:15:53
cleanup of SDL_MixAudioFormat
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
diff --git a/src/audio/SDL_mixer.c b/src/audio/SDL_mixer.c
index 23adec0..1b55dea 100644
--- a/src/audio/SDL_mixer.c
+++ b/src/audio/SDL_mixer.c
@@ -115,8 +115,8 @@ SDL_MixAudioFormat(Uint8 * dst, const Uint8 * src, SDL_AudioFormat format,
Sint8 *dst8, *src8;
Sint8 src_sample;
int dst_sample;
- const int max_audioval = ((1 << (8 - 1)) - 1);
- const int min_audioval = -(1 << (8 - 1));
+ const int max_audioval = SDL_MAX_SINT8;
+ const int min_audioval = SDL_MIN_SINT8;
src8 = (Sint8 *) src;
dst8 = (Sint8 *) dst;
@@ -125,12 +125,11 @@ SDL_MixAudioFormat(Uint8 * dst, const Uint8 * src, SDL_AudioFormat format,
ADJUST_VOLUME(src_sample, volume);
dst_sample = *dst8 + src_sample;
if (dst_sample > max_audioval) {
- *dst8 = max_audioval;
+ dst_sample = max_audioval;
} else if (dst_sample < min_audioval) {
- *dst8 = min_audioval;
- } else {
- *dst8 = dst_sample;
+ dst_sample = min_audioval;
}
+ *dst8 = dst_sample;
++dst8;
++src8;
}
@@ -141,14 +140,14 @@ SDL_MixAudioFormat(Uint8 * dst, const Uint8 * src, SDL_AudioFormat format,
{
Sint16 src1, src2;
int dst_sample;
- const int max_audioval = ((1 << (16 - 1)) - 1);
- const int min_audioval = -(1 << (16 - 1));
+ const int max_audioval = SDL_MAX_SINT16;
+ const int min_audioval = SDL_MIN_SINT16;
len /= 2;
while (len--) {
- src1 = ((src[1]) << 8 | src[0]);
+ src1 = SDL_SwapLE16(*(Sint16 *)src);
ADJUST_VOLUME(src1, volume);
- src2 = ((dst[1]) << 8 | dst[0]);
+ src2 = SDL_SwapLE16(*(Sint16 *)dst);
src += 2;
dst_sample = src1 + src2;
if (dst_sample > max_audioval) {
@@ -156,9 +155,7 @@ SDL_MixAudioFormat(Uint8 * dst, const Uint8 * src, SDL_AudioFormat format,
} else if (dst_sample < min_audioval) {
dst_sample = min_audioval;
}
- dst[0] = dst_sample & 0xFF;
- dst_sample >>= 8;
- dst[1] = dst_sample & 0xFF;
+ *(Sint16 *)dst = SDL_SwapLE16(dst_sample);
dst += 2;
}
}
@@ -168,14 +165,14 @@ SDL_MixAudioFormat(Uint8 * dst, const Uint8 * src, SDL_AudioFormat format,
{
Sint16 src1, src2;
int dst_sample;
- const int max_audioval = ((1 << (16 - 1)) - 1);
- const int min_audioval = -(1 << (16 - 1));
+ const int max_audioval = SDL_MAX_SINT16;
+ const int min_audioval = SDL_MIN_SINT16;
len /= 2;
while (len--) {
- src1 = ((src[0]) << 8 | src[1]);
+ src1 = SDL_SwapBE16(*(Sint16 *)src);
ADJUST_VOLUME(src1, volume);
- src2 = ((dst[0]) << 8 | dst[1]);
+ src2 = SDL_SwapBE16(*(Sint16 *)dst);
src += 2;
dst_sample = src1 + src2;
if (dst_sample > max_audioval) {
@@ -183,9 +180,7 @@ SDL_MixAudioFormat(Uint8 * dst, const Uint8 * src, SDL_AudioFormat format,
} else if (dst_sample < min_audioval) {
dst_sample = min_audioval;
}
- dst[1] = dst_sample & 0xFF;
- dst_sample >>= 8;
- dst[0] = dst_sample & 0xFF;
+ *(Sint16 *)dst = SDL_SwapBE16(dst_sample);
dst += 2;
}
}
@@ -195,21 +190,19 @@ SDL_MixAudioFormat(Uint8 * dst, const Uint8 * src, SDL_AudioFormat format,
{
Uint16 src1, src2;
int dst_sample;
- const int max_audioval = 0xFFFF;
+ const int max_audioval = SDL_MAX_UINT16;
len /= 2;
while (len--) {
- src1 = ((src[1]) << 8 | src[0]);
+ src1 = SDL_SwapLE16(*(Uint16 *)src);
ADJUST_VOLUME(src1, volume);
- src2 = ((dst[1]) << 8 | dst[0]);
+ src2 = SDL_SwapLE16(*(Uint16 *)dst);
src += 2;
dst_sample = src1 + src2;
if (dst_sample > max_audioval) {
dst_sample = max_audioval;
}
- dst[0] = dst_sample & 0xFF;
- dst_sample >>= 8;
- dst[1] = dst_sample & 0xFF;
+ *(Uint16 *)dst = SDL_SwapLE16(dst_sample);
dst += 2;
}
}
@@ -219,21 +212,19 @@ SDL_MixAudioFormat(Uint8 * dst, const Uint8 * src, SDL_AudioFormat format,
{
Uint16 src1, src2;
int dst_sample;
- const int max_audioval = 0xFFFF;
+ const int max_audioval = SDL_MAX_UINT16;
len /= 2;
while (len--) {
- src1 = ((src[0]) << 8 | src[1]);
+ src1 = SDL_SwapBE16(*(Uint16 *)src);
ADJUST_VOLUME(src1, volume);
- src2 = ((dst[0]) << 8 | dst[1]);
+ src2 = SDL_SwapBE16(*(Uint16 *)dst);
src += 2;
dst_sample = src1 + src2;
if (dst_sample > max_audioval) {
dst_sample = max_audioval;
}
- dst[1] = dst_sample & 0xFF;
- dst_sample >>= 8;
- dst[0] = dst_sample & 0xFF;
+ *(Uint16 *)dst = SDL_SwapBE16(dst_sample);
dst += 2;
}
}
@@ -245,8 +236,8 @@ SDL_MixAudioFormat(Uint8 * dst, const Uint8 * src, SDL_AudioFormat format,
Uint32 *dst32 = (Uint32 *) dst;
Sint64 src1, src2;
Sint64 dst_sample;
- const Sint64 max_audioval = ((((Sint64) 1) << (32 - 1)) - 1);
- const Sint64 min_audioval = -(((Sint64) 1) << (32 - 1));
+ const Sint64 max_audioval = SDL_MAX_SINT32;
+ const Sint64 min_audioval = SDL_MIN_SINT32;
len /= 4;
while (len--) {
@@ -271,8 +262,8 @@ SDL_MixAudioFormat(Uint8 * dst, const Uint8 * src, SDL_AudioFormat format,
Uint32 *dst32 = (Uint32 *) dst;
Sint64 src1, src2;
Sint64 dst_sample;
- const Sint64 max_audioval = ((((Sint64) 1) << (32 - 1)) - 1);
- const Sint64 min_audioval = -(((Sint64) 1) << (32 - 1));
+ const Sint64 max_audioval = SDL_MAX_SINT32;
+ const Sint64 min_audioval = SDL_MIN_SINT32;
len /= 4;
while (len--) {