Skip to content

L
libSDL
Commit 4ada9445 authored by Ryan C. Gordon's avatar Ryan C. Gordon
Browse files
Options

Replaced unions with calls to SDL_SwapFloat... 

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402061
parent b046008c
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 87 deletions
src/audio/SDL_audiocvt.c
View file @ 4ada9445
...@@ -187,35 +187,25 @@ SDL_ConvertMono(SDL_AudioCVT * cvt, SDL_AudioFormat format) ...@@ -187,35 +187,25 @@ SDL_ConvertMono(SDL_AudioCVT * cvt, SDL_AudioFormat format)
case AUDIO_F32: case AUDIO_F32:
{ {
/* !!! FIXME: this convert union is nasty. */ const float *src = (const float *) cvt->buf;
union float *dst = (float *) cvt->buf;
{
float f;
Uint32 ui32;
} f2i;
const Uint32 *src = (const Uint32 *) cvt->buf;
Uint32 *dst = (Uint32 *) cvt->buf;
if (SDL_AUDIO_ISBIGENDIAN(format)) { if (SDL_AUDIO_ISBIGENDIAN(format)) {
for (i = cvt->len_cvt / 8; i; --i, src += 2) { for (i = cvt->len_cvt / 8; i; --i, src += 2) {
float src1, src2; float src1, src2;
f2i.ui32 = SDL_SwapBE32(src[0]); src1 = SDL_SwapFloatBE(src[0]);
src1 = f2i.f; src2 = SDL_SwapFloatBE(src[1]);
f2i.ui32 = SDL_SwapBE32(src[1]);
src2 = f2i.f;
const double added = ((double) src1) + ((double) src2); const double added = ((double) src1) + ((double) src2);
f2i.f = (float) (added * 0.5); src1 = (float) (added * 0.5);
*(dst++) = SDL_SwapBE32(f2i.ui32); *(dst++) = SDL_SwapFloatBE(src1);
} }
} else { } else {
for (i = cvt->len_cvt / 8; i; --i, src += 2) { for (i = cvt->len_cvt / 8; i; --i, src += 2) {
float src1, src2; float src1, src2;
f2i.ui32 = SDL_SwapLE32(src[0]); src1 = SDL_SwapFloatLE(src[0]);
src1 = f2i.f; src2 = SDL_SwapFloatLE(src[1]);
f2i.ui32 = SDL_SwapLE32(src[1]);
src2 = f2i.f;
const double added = ((double) src1) + ((double) src2); const double added = ((double) src1) + ((double) src2);
f2i.f = (float) (added * 0.5); src1 = (float) (added * 0.5);
*(dst++) = SDL_SwapLE32(f2i.ui32); *(dst++) = SDL_SwapFloatLE(src1);
} }
} }
} }
...@@ -577,54 +567,35 @@ SDL_ConvertSurround(SDL_AudioCVT * cvt, SDL_AudioFormat format) ...@@ -577,54 +567,35 @@ SDL_ConvertSurround(SDL_AudioCVT * cvt, SDL_AudioFormat format)
case AUDIO_F32: case AUDIO_F32:
{ {
union
{
float f;
Uint32 ui32;
} f2i; /* !!! FIXME: lame. */
float lf, rf, ce; float lf, rf, ce;
const Uint32 *src = (const Uint32 *) cvt->buf + cvt->len_cvt; const float *src = (const float *) cvt->buf + cvt->len_cvt;
Uint32 *dst = (Uint32 *) cvt->buf + cvt->len_cvt * 3; float *dst = (float *) cvt->buf + cvt->len_cvt * 3;
if (SDL_AUDIO_ISBIGENDIAN(format)) { if (SDL_AUDIO_ISBIGENDIAN(format)) {
for (i = cvt->len_cvt / 8; i; --i) { for (i = cvt->len_cvt / 8; i; --i) {
dst -= 6; dst -= 6;
src -= 2; src -= 2;
f2i.ui32 = SDL_SwapBE32(src[0]); lf = SDL_SwapFloatBE(src[0]);
lf = f2i.f; rf = SDL_SwapFloatBE(src[1]);
f2i.ui32 = SDL_SwapBE32(src[1]);
rf = f2i.f;
ce = (lf * 0.5f) + (rf * 0.5f); ce = (lf * 0.5f) + (rf * 0.5f);
dst[0] = src[0]; dst[0] = src[0];
dst[1] = src[1]; dst[1] = src[1];
f2i.f = (lf - ce); dst[2] = SDL_SwapFloatBE(lf - ce);
dst[2] = SDL_SwapBE32(f2i.ui32); dst[3] = SDL_SwapFloatBE(rf - ce);
f2i.f = (rf - ce); dst[4] = dst[5] = SDL_SwapFloatBE(ce);
dst[3] = SDL_SwapBE32(f2i.ui32);
f2i.f = ce;
f2i.ui32 = SDL_SwapBE32(f2i.ui32);
dst[4] = f2i.ui32;
dst[5] = f2i.ui32;
} }
} else { } else {
for (i = cvt->len_cvt / 8; i; --i) { for (i = cvt->len_cvt / 8; i; --i) {
dst -= 6; dst -= 6;
src -= 2; src -= 2;
f2i.ui32 = SDL_SwapLE32(src[0]); lf = SDL_SwapFloatLE(src[0]);
lf = f2i.f; rf = SDL_SwapFloatLE(src[1]);
f2i.ui32 = SDL_SwapLE32(src[1]);
rf = f2i.f;
ce = (lf * 0.5f) + (rf * 0.5f); ce = (lf * 0.5f) + (rf * 0.5f);
dst[0] = src[0]; dst[0] = src[0];
dst[1] = src[1]; dst[1] = src[1];
f2i.f = (lf - ce); dst[2] = SDL_SwapFloatLE(lf - ce);
dst[2] = SDL_SwapLE32(f2i.ui32); dst[3] = SDL_SwapFloatLE(rf - ce);
f2i.f = (rf - ce); dst[4] = dst[5] = SDL_SwapFloatLE(ce);
dst[3] = SDL_SwapLE32(f2i.ui32);
f2i.f = ce;
f2i.ui32 = SDL_SwapLE32(f2i.ui32);
dst[4] = f2i.ui32;
dst[5] = f2i.ui32;
} }
} }
} }
......
src/audio/SDL_mixer.c
View file @ 4ada9445
...@@ -321,32 +321,19 @@ SDL_MixAudioFormat(Uint8 * dst, const Uint8 * src, SDL_AudioFormat format, ...@@ -321,32 +321,19 @@ SDL_MixAudioFormat(Uint8 * dst, const Uint8 * src, SDL_AudioFormat format,
const double max_audioval = 3.40282347e+38F; const double max_audioval = 3.40282347e+38F;
const double min_audioval = -3.40282347e+38F; const double min_audioval = -3.40282347e+38F;
/* !!! FIXME: this is a little nasty. */
union
{
float f;
Uint32 ui32;
} cvt;
len /= 4; len /= 4;
while (len--) { while (len--) {
cvt.f = *(src32++); src1 = ((SDL_SwapFloatLE(*src32) * fvolume) * fmaxvolume);
cvt.ui32 = SDL_SwapLE32(cvt.ui32); src2 = SDL_SwapFloatLE(*dst32);
src1 = ((cvt.f * fvolume) * fmaxvolume); src32++;
cvt.f = *dst32;
cvt.ui32 = SDL_SwapLE32(cvt.ui32);
src2 = cvt.f;
dst_sample = src1 + src2; dst_sample = ((double) src1) + ((double) src2);
if (dst_sample > max_audioval) { if (dst_sample > max_audioval) {
dst_sample = max_audioval; dst_sample = max_audioval;
} else if (dst_sample < min_audioval) { } else if (dst_sample < min_audioval) {
dst_sample = min_audioval; dst_sample = min_audioval;
} }
cvt.f = ((float) dst_sample); *(dst32++) = SDL_SwapFloatLE((float) dst_sample);
cvt.ui32 = SDL_SwapLE32(cvt.ui32);
*(dst32++) = cvt.f;
} }
} }
break; break;
...@@ -363,32 +350,19 @@ SDL_MixAudioFormat(Uint8 * dst, const Uint8 * src, SDL_AudioFormat format, ...@@ -363,32 +350,19 @@ SDL_MixAudioFormat(Uint8 * dst, const Uint8 * src, SDL_AudioFormat format,
const double max_audioval = 3.40282347e+38F; const double max_audioval = 3.40282347e+38F;
const double min_audioval = -3.40282347e+38F; const double min_audioval = -3.40282347e+38F;
/* !!! FIXME: this is a little nasty. */
union
{
float f;
Uint32 ui32;
} cvt;
len /= 4; len /= 4;
while (len--) { while (len--) {
cvt.f = *(src32++); src1 = ((SDL_SwapFloatBE(*src32) * fvolume) * fmaxvolume);
cvt.ui32 = SDL_SwapBE32(cvt.ui32); src2 = SDL_SwapFloatBE(*dst32);
src1 = ((cvt.f * fvolume) * fmaxvolume); src32++;
cvt.f = *dst32;
cvt.ui32 = SDL_SwapBE32(cvt.ui32);
src2 = cvt.f;
dst_sample = src1 + src2; dst_sample = ((double) src1) + ((double) src2);
if (dst_sample > max_audioval) { if (dst_sample > max_audioval) {
dst_sample = max_audioval; dst_sample = max_audioval;
} else if (dst_sample < min_audioval) { } else if (dst_sample < min_audioval) {
dst_sample = min_audioval; dst_sample = min_audioval;
} }
cvt.f = ((float) dst_sample); *(dst32++) = SDL_SwapFloatBE((float) dst_sample);
cvt.ui32 = SDL_SwapBE32(cvt.ui32);
*(dst32++) = cvt.f;
} }
} }
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment