Skip to content

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

Fixed off-by-one in audio converters, when growing a data type's size. 

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403418
parent b96a3090
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 66 deletions
src/audio/SDL_audiotypecvt.c
View file @ f62d6c17
...@@ -65,8 +65,8 @@ SDL_Convert_U8_to_U16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) ...@@ -65,8 +65,8 @@ SDL_Convert_U8_to_U16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
fprintf(stderr, "Converting AUDIO_U8 to AUDIO_U16LSB.\n"); fprintf(stderr, "Converting AUDIO_U8 to AUDIO_U16LSB.\n");
#endif #endif
src = (const Uint8 *) (cvt->buf + cvt->len_cvt); src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1;
dst = (Uint16 *) (cvt->buf + cvt->len_cvt * 2); dst = ((Uint16 *) (cvt->buf + cvt->len_cvt * 2)) - 1;
for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) { for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) {
const Uint16 val = (((Uint16) *src) << 8); const Uint16 val = (((Uint16) *src) << 8);
*dst = SDL_SwapLE16(val); *dst = SDL_SwapLE16(val);
...@@ -89,8 +89,8 @@ SDL_Convert_U8_to_S16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) ...@@ -89,8 +89,8 @@ SDL_Convert_U8_to_S16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
fprintf(stderr, "Converting AUDIO_U8 to AUDIO_S16LSB.\n"); fprintf(stderr, "Converting AUDIO_U8 to AUDIO_S16LSB.\n");
#endif #endif
src = (const Uint8 *) (cvt->buf + cvt->len_cvt); src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1;
dst = (Sint16 *) (cvt->buf + cvt->len_cvt * 2); dst = ((Sint16 *) (cvt->buf + cvt->len_cvt * 2)) - 1;
for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) { for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) {
const Sint16 val = (((Sint16) ((*src) ^ 0x80)) << 8); const Sint16 val = (((Sint16) ((*src) ^ 0x80)) << 8);
*dst = ((Sint16) SDL_SwapLE16(val)); *dst = ((Sint16) SDL_SwapLE16(val));
...@@ -113,8 +113,8 @@ SDL_Convert_U8_to_U16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) ...@@ -113,8 +113,8 @@ SDL_Convert_U8_to_U16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
fprintf(stderr, "Converting AUDIO_U8 to AUDIO_U16MSB.\n"); fprintf(stderr, "Converting AUDIO_U8 to AUDIO_U16MSB.\n");
#endif #endif
src = (const Uint8 *) (cvt->buf + cvt->len_cvt); src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1;
dst = (Uint16 *) (cvt->buf + cvt->len_cvt * 2); dst = ((Uint16 *) (cvt->buf + cvt->len_cvt * 2)) - 1;
for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) { for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) {
const Uint16 val = (((Uint16) *src) << 8); const Uint16 val = (((Uint16) *src) << 8);
*dst = SDL_SwapBE16(val); *dst = SDL_SwapBE16(val);
...@@ -137,8 +137,8 @@ SDL_Convert_U8_to_S16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) ...@@ -137,8 +137,8 @@ SDL_Convert_U8_to_S16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
fprintf(stderr, "Converting AUDIO_U8 to AUDIO_S16MSB.\n"); fprintf(stderr, "Converting AUDIO_U8 to AUDIO_S16MSB.\n");
#endif #endif
src = (const Uint8 *) (cvt->buf + cvt->len_cvt); src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1;
dst = (Sint16 *) (cvt->buf + cvt->len_cvt * 2); dst = ((Sint16 *) (cvt->buf + cvt->len_cvt * 2)) - 1;
for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) { for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) {
const Sint16 val = (((Sint16) ((*src) ^ 0x80)) << 8); const Sint16 val = (((Sint16) ((*src) ^ 0x80)) << 8);
*dst = ((Sint16) SDL_SwapBE16(val)); *dst = ((Sint16) SDL_SwapBE16(val));
...@@ -161,8 +161,8 @@ SDL_Convert_U8_to_S32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) ...@@ -161,8 +161,8 @@ SDL_Convert_U8_to_S32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
fprintf(stderr, "Converting AUDIO_U8 to AUDIO_S32LSB.\n"); fprintf(stderr, "Converting AUDIO_U8 to AUDIO_S32LSB.\n");
#endif #endif
src = (const Uint8 *) (cvt->buf + cvt->len_cvt); src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1;
dst = (Sint32 *) (cvt->buf + cvt->len_cvt * 4); dst = ((Sint32 *) (cvt->buf + cvt->len_cvt * 4)) - 1;
for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) { for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) {
const Sint32 val = (((Sint32) ((*src) ^ 0x80)) << 24); const Sint32 val = (((Sint32) ((*src) ^ 0x80)) << 24);
*dst = ((Sint32) SDL_SwapLE32(val)); *dst = ((Sint32) SDL_SwapLE32(val));
...@@ -185,8 +185,8 @@ SDL_Convert_U8_to_S32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) ...@@ -185,8 +185,8 @@ SDL_Convert_U8_to_S32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
fprintf(stderr, "Converting AUDIO_U8 to AUDIO_S32MSB.\n"); fprintf(stderr, "Converting AUDIO_U8 to AUDIO_S32MSB.\n");
#endif #endif
src = (const Uint8 *) (cvt->buf + cvt->len_cvt); src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1;
dst = (Sint32 *) (cvt->buf + cvt->len_cvt * 4); dst = ((Sint32 *) (cvt->buf + cvt->len_cvt * 4)) - 1;
for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) { for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) {
const Sint32 val = (((Sint32) ((*src) ^ 0x80)) << 24); const Sint32 val = (((Sint32) ((*src) ^ 0x80)) << 24);
*dst = ((Sint32) SDL_SwapBE32(val)); *dst = ((Sint32) SDL_SwapBE32(val));
...@@ -209,8 +209,8 @@ SDL_Convert_U8_to_F32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) ...@@ -209,8 +209,8 @@ SDL_Convert_U8_to_F32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
fprintf(stderr, "Converting AUDIO_U8 to AUDIO_F32LSB.\n"); fprintf(stderr, "Converting AUDIO_U8 to AUDIO_F32LSB.\n");
#endif #endif
src = (const Uint8 *) (cvt->buf + cvt->len_cvt); src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1;
dst = (float *) (cvt->buf + cvt->len_cvt * 4); dst = ((float *) (cvt->buf + cvt->len_cvt * 4)) - 1;
for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) { for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) {
const float val = ((((float) *src) * DIVBY127) - 1.0f); const float val = ((((float) *src) * DIVBY127) - 1.0f);
*dst = SDL_SwapFloatLE(val); *dst = SDL_SwapFloatLE(val);
...@@ -233,8 +233,8 @@ SDL_Convert_U8_to_F32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) ...@@ -233,8 +233,8 @@ SDL_Convert_U8_to_F32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
fprintf(stderr, "Converting AUDIO_U8 to AUDIO_F32MSB.\n"); fprintf(stderr, "Converting AUDIO_U8 to AUDIO_F32MSB.\n");
#endif #endif
src = (const Uint8 *) (cvt->buf + cvt->len_cvt); src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1;
dst = (float *) (cvt->buf + cvt->len_cvt * 4); dst = ((float *) (cvt->buf + cvt->len_cvt * 4)) - 1;
for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) { for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) {
const float val = ((((float) *src) * DIVBY127) - 1.0f); const float val = ((((float) *src) * DIVBY127) - 1.0f);
*dst = SDL_SwapFloatBE(val); *dst = SDL_SwapFloatBE(val);
...@@ -280,8 +280,8 @@ SDL_Convert_S8_to_U16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) ...@@ -280,8 +280,8 @@ SDL_Convert_S8_to_U16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
fprintf(stderr, "Converting AUDIO_S8 to AUDIO_U16LSB.\n"); fprintf(stderr, "Converting AUDIO_S8 to AUDIO_U16LSB.\n");
#endif #endif
src = (const Uint8 *) (cvt->buf + cvt->len_cvt); src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1;
dst = (Uint16 *) (cvt->buf + cvt->len_cvt * 2); dst = ((Uint16 *) (cvt->buf + cvt->len_cvt * 2)) - 1;
for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) { for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) {
const Uint16 val = (((Uint16) ((((Sint8) *src)) ^ 0x80)) << 8); const Uint16 val = (((Uint16) ((((Sint8) *src)) ^ 0x80)) << 8);
*dst = SDL_SwapLE16(val); *dst = SDL_SwapLE16(val);
...@@ -304,8 +304,8 @@ SDL_Convert_S8_to_S16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) ...@@ -304,8 +304,8 @@ SDL_Convert_S8_to_S16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
fprintf(stderr, "Converting AUDIO_S8 to AUDIO_S16LSB.\n"); fprintf(stderr, "Converting AUDIO_S8 to AUDIO_S16LSB.\n");
#endif #endif
src = (const Uint8 *) (cvt->buf + cvt->len_cvt); src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1;
dst = (Sint16 *) (cvt->buf + cvt->len_cvt * 2); dst = ((Sint16 *) (cvt->buf + cvt->len_cvt * 2)) - 1;
for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) { for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) {
const Sint16 val = (((Sint16) ((Sint8) *src)) << 8); const Sint16 val = (((Sint16) ((Sint8) *src)) << 8);
*dst = ((Sint16) SDL_SwapLE16(val)); *dst = ((Sint16) SDL_SwapLE16(val));
...@@ -328,8 +328,8 @@ SDL_Convert_S8_to_U16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) ...@@ -328,8 +328,8 @@ SDL_Convert_S8_to_U16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
fprintf(stderr, "Converting AUDIO_S8 to AUDIO_U16MSB.\n"); fprintf(stderr, "Converting AUDIO_S8 to AUDIO_U16MSB.\n");
#endif #endif
src = (const Uint8 *) (cvt->buf + cvt->len_cvt); src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1;
dst = (Uint16 *) (cvt->buf + cvt->len_cvt * 2); dst = ((Uint16 *) (cvt->buf + cvt->len_cvt * 2)) - 1;
for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) { for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) {
const Uint16 val = (((Uint16) ((((Sint8) *src)) ^ 0x80)) << 8); const Uint16 val = (((Uint16) ((((Sint8) *src)) ^ 0x80)) << 8);
*dst = SDL_SwapBE16(val); *dst = SDL_SwapBE16(val);
...@@ -352,8 +352,8 @@ SDL_Convert_S8_to_S16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) ...@@ -352,8 +352,8 @@ SDL_Convert_S8_to_S16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
fprintf(stderr, "Converting AUDIO_S8 to AUDIO_S16MSB.\n"); fprintf(stderr, "Converting AUDIO_S8 to AUDIO_S16MSB.\n");
#endif #endif
src = (const Uint8 *) (cvt->buf + cvt->len_cvt); src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1;
dst = (Sint16 *) (cvt->buf + cvt->len_cvt * 2); dst = ((Sint16 *) (cvt->buf + cvt->len_cvt * 2)) - 1;
for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) { for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) {
const Sint16 val = (((Sint16) ((Sint8) *src)) << 8); const Sint16 val = (((Sint16) ((Sint8) *src)) << 8);
*dst = ((Sint16) SDL_SwapBE16(val)); *dst = ((Sint16) SDL_SwapBE16(val));
...@@ -376,8 +376,8 @@ SDL_Convert_S8_to_S32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) ...@@ -376,8 +376,8 @@ SDL_Convert_S8_to_S32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
fprintf(stderr, "Converting AUDIO_S8 to AUDIO_S32LSB.\n"); fprintf(stderr, "Converting AUDIO_S8 to AUDIO_S32LSB.\n");
#endif #endif
src = (const Uint8 *) (cvt->buf + cvt->len_cvt); src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1;
dst = (Sint32 *) (cvt->buf + cvt->len_cvt * 4); dst = ((Sint32 *) (cvt->buf + cvt->len_cvt * 4)) - 1;
for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) { for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) {
const Sint32 val = (((Sint32) ((Sint8) *src)) << 24); const Sint32 val = (((Sint32) ((Sint8) *src)) << 24);
*dst = ((Sint32) SDL_SwapLE32(val)); *dst = ((Sint32) SDL_SwapLE32(val));
...@@ -400,8 +400,8 @@ SDL_Convert_S8_to_S32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) ...@@ -400,8 +400,8 @@ SDL_Convert_S8_to_S32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
fprintf(stderr, "Converting AUDIO_S8 to AUDIO_S32MSB.\n"); fprintf(stderr, "Converting AUDIO_S8 to AUDIO_S32MSB.\n");
#endif #endif
src = (const Uint8 *) (cvt->buf + cvt->len_cvt); src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1;
dst = (Sint32 *) (cvt->buf + cvt->len_cvt * 4); dst = ((Sint32 *) (cvt->buf + cvt->len_cvt * 4)) - 1;
for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) { for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) {
const Sint32 val = (((Sint32) ((Sint8) *src)) << 24); const Sint32 val = (((Sint32) ((Sint8) *src)) << 24);
*dst = ((Sint32) SDL_SwapBE32(val)); *dst = ((Sint32) SDL_SwapBE32(val));
...@@ -424,8 +424,8 @@ SDL_Convert_S8_to_F32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) ...@@ -424,8 +424,8 @@ SDL_Convert_S8_to_F32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
fprintf(stderr, "Converting AUDIO_S8 to AUDIO_F32LSB.\n"); fprintf(stderr, "Converting AUDIO_S8 to AUDIO_F32LSB.\n");
#endif #endif
src = (const Uint8 *) (cvt->buf + cvt->len_cvt); src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1;
dst = (float *) (cvt->buf + cvt->len_cvt * 4); dst = ((float *) (cvt->buf + cvt->len_cvt * 4)) - 1;
for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) { for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) {
const float val = (((float) ((Sint8) *src)) * DIVBY127); const float val = (((float) ((Sint8) *src)) * DIVBY127);
*dst = SDL_SwapFloatLE(val); *dst = SDL_SwapFloatLE(val);
...@@ -448,8 +448,8 @@ SDL_Convert_S8_to_F32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) ...@@ -448,8 +448,8 @@ SDL_Convert_S8_to_F32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
fprintf(stderr, "Converting AUDIO_S8 to AUDIO_F32MSB.\n"); fprintf(stderr, "Converting AUDIO_S8 to AUDIO_F32MSB.\n");
#endif #endif
src = (const Uint8 *) (cvt->buf + cvt->len_cvt); src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1;
dst = (float *) (cvt->buf + cvt->len_cvt * 4); dst = ((float *) (cvt->buf + cvt->len_cvt * 4)) - 1;
for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) { for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) {
const float val = (((float) ((Sint8) *src)) * DIVBY127); const float val = (((float) ((Sint8) *src)) * DIVBY127);
*dst = SDL_SwapFloatBE(val); *dst = SDL_SwapFloatBE(val);
...@@ -589,8 +589,8 @@ SDL_Convert_U16LSB_to_S32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) ...@@ -589,8 +589,8 @@ SDL_Convert_U16LSB_to_S32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
fprintf(stderr, "Converting AUDIO_U16LSB to AUDIO_S32LSB.\n"); fprintf(stderr, "Converting AUDIO_U16LSB to AUDIO_S32LSB.\n");
#endif #endif
src = (const Uint16 *) (cvt->buf + cvt->len_cvt); src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
dst = (Sint32 *) (cvt->buf + cvt->len_cvt * 2); dst = ((Sint32 *) (cvt->buf + cvt->len_cvt * 2)) - 1;
for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) { for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) {
const Sint32 val = (((Sint32) ((SDL_SwapLE16(*src)) ^ 0x8000)) << 16); const Sint32 val = (((Sint32) ((SDL_SwapLE16(*src)) ^ 0x8000)) << 16);
*dst = ((Sint32) SDL_SwapLE32(val)); *dst = ((Sint32) SDL_SwapLE32(val));
...@@ -613,8 +613,8 @@ SDL_Convert_U16LSB_to_S32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) ...@@ -613,8 +613,8 @@ SDL_Convert_U16LSB_to_S32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
fprintf(stderr, "Converting AUDIO_U16LSB to AUDIO_S32MSB.\n"); fprintf(stderr, "Converting AUDIO_U16LSB to AUDIO_S32MSB.\n");
#endif #endif
src = (const Uint16 *) (cvt->buf + cvt->len_cvt); src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
dst = (Sint32 *) (cvt->buf + cvt->len_cvt * 2); dst = ((Sint32 *) (cvt->buf + cvt->len_cvt * 2)) - 1;
for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) { for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) {
const Sint32 val = (((Sint32) ((SDL_SwapLE16(*src)) ^ 0x8000)) << 16); const Sint32 val = (((Sint32) ((SDL_SwapLE16(*src)) ^ 0x8000)) << 16);
*dst = ((Sint32) SDL_SwapBE32(val)); *dst = ((Sint32) SDL_SwapBE32(val));
...@@ -637,8 +637,8 @@ SDL_Convert_U16LSB_to_F32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) ...@@ -637,8 +637,8 @@ SDL_Convert_U16LSB_to_F32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
fprintf(stderr, "Converting AUDIO_U16LSB to AUDIO_F32LSB.\n"); fprintf(stderr, "Converting AUDIO_U16LSB to AUDIO_F32LSB.\n");
#endif #endif
src = (const Uint16 *) (cvt->buf + cvt->len_cvt); src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
dst = (float *) (cvt->buf + cvt->len_cvt * 2); dst = ((float *) (cvt->buf + cvt->len_cvt * 2)) - 1;
for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) { for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) {
const float val = ((((float) SDL_SwapLE16(*src)) * DIVBY32767) - 1.0f); const float val = ((((float) SDL_SwapLE16(*src)) * DIVBY32767) - 1.0f);
*dst = SDL_SwapFloatLE(val); *dst = SDL_SwapFloatLE(val);
...@@ -661,8 +661,8 @@ SDL_Convert_U16LSB_to_F32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) ...@@ -661,8 +661,8 @@ SDL_Convert_U16LSB_to_F32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
fprintf(stderr, "Converting AUDIO_U16LSB to AUDIO_F32MSB.\n"); fprintf(stderr, "Converting AUDIO_U16LSB to AUDIO_F32MSB.\n");
#endif #endif
src = (const Uint16 *) (cvt->buf + cvt->len_cvt); src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
dst = (float *) (cvt->buf + cvt->len_cvt * 2); dst = ((float *) (cvt->buf + cvt->len_cvt * 2)) - 1;
for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) { for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) {
const float val = ((((float) SDL_SwapLE16(*src)) * DIVBY32767) - 1.0f); const float val = ((((float) SDL_SwapLE16(*src)) * DIVBY32767) - 1.0f);
*dst = SDL_SwapFloatBE(val); *dst = SDL_SwapFloatBE(val);
...@@ -802,8 +802,8 @@ SDL_Convert_S16LSB_to_S32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) ...@@ -802,8 +802,8 @@ SDL_Convert_S16LSB_to_S32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
fprintf(stderr, "Converting AUDIO_S16LSB to AUDIO_S32LSB.\n"); fprintf(stderr, "Converting AUDIO_S16LSB to AUDIO_S32LSB.\n");
#endif #endif
src = (const Uint16 *) (cvt->buf + cvt->len_cvt); src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
dst = (Sint32 *) (cvt->buf + cvt->len_cvt * 2); dst = ((Sint32 *) (cvt->buf + cvt->len_cvt * 2)) - 1;
for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) { for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) {
const Sint32 val = (((Sint32) ((Sint16) SDL_SwapLE16(*src))) << 16); const Sint32 val = (((Sint32) ((Sint16) SDL_SwapLE16(*src))) << 16);
*dst = ((Sint32) SDL_SwapLE32(val)); *dst = ((Sint32) SDL_SwapLE32(val));
...@@ -826,8 +826,8 @@ SDL_Convert_S16LSB_to_S32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) ...@@ -826,8 +826,8 @@ SDL_Convert_S16LSB_to_S32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
fprintf(stderr, "Converting AUDIO_S16LSB to AUDIO_S32MSB.\n"); fprintf(stderr, "Converting AUDIO_S16LSB to AUDIO_S32MSB.\n");
#endif #endif
src = (const Uint16 *) (cvt->buf + cvt->len_cvt); src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
dst = (Sint32 *) (cvt->buf + cvt->len_cvt * 2); dst = ((Sint32 *) (cvt->buf + cvt->len_cvt * 2)) - 1;
for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) { for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) {
const Sint32 val = (((Sint32) ((Sint16) SDL_SwapLE16(*src))) << 16); const Sint32 val = (((Sint32) ((Sint16) SDL_SwapLE16(*src))) << 16);
*dst = ((Sint32) SDL_SwapBE32(val)); *dst = ((Sint32) SDL_SwapBE32(val));
...@@ -850,8 +850,8 @@ SDL_Convert_S16LSB_to_F32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) ...@@ -850,8 +850,8 @@ SDL_Convert_S16LSB_to_F32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
fprintf(stderr, "Converting AUDIO_S16LSB to AUDIO_F32LSB.\n"); fprintf(stderr, "Converting AUDIO_S16LSB to AUDIO_F32LSB.\n");
#endif #endif
src = (const Uint16 *) (cvt->buf + cvt->len_cvt); src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
dst = (float *) (cvt->buf + cvt->len_cvt * 2); dst = ((float *) (cvt->buf + cvt->len_cvt * 2)) - 1;
for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) { for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) {
const float val = (((float) ((Sint16) SDL_SwapLE16(*src))) * DIVBY32767); const float val = (((float) ((Sint16) SDL_SwapLE16(*src))) * DIVBY32767);
*dst = SDL_SwapFloatLE(val); *dst = SDL_SwapFloatLE(val);
...@@ -874,8 +874,8 @@ SDL_Convert_S16LSB_to_F32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) ...@@ -874,8 +874,8 @@ SDL_Convert_S16LSB_to_F32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
fprintf(stderr, "Converting AUDIO_S16LSB to AUDIO_F32MSB.\n"); fprintf(stderr, "Converting AUDIO_S16LSB to AUDIO_F32MSB.\n");
#endif #endif
src = (const Uint16 *) (cvt->buf + cvt->len_cvt); src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
dst = (float *) (cvt->buf + cvt->len_cvt * 2); dst = ((float *) (cvt->buf + cvt->len_cvt * 2)) - 1;
for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) { for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) {
const float val = (((float) ((Sint16) SDL_SwapLE16(*src))) * DIVBY32767); const float val = (((float) ((Sint16) SDL_SwapLE16(*src))) * DIVBY32767);
*dst = SDL_SwapFloatBE(val); *dst = SDL_SwapFloatBE(val);
...@@ -1015,8 +1015,8 @@ SDL_Convert_U16MSB_to_S32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) ...@@ -1015,8 +1015,8 @@ SDL_Convert_U16MSB_to_S32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
fprintf(stderr, "Converting AUDIO_U16MSB to AUDIO_S32LSB.\n"); fprintf(stderr, "Converting AUDIO_U16MSB to AUDIO_S32LSB.\n");
#endif #endif
src = (const Uint16 *) (cvt->buf + cvt->len_cvt); src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
dst = (Sint32 *) (cvt->buf + cvt->len_cvt * 2); dst = ((Sint32 *) (cvt->buf + cvt->len_cvt * 2)) - 1;
for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) { for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) {
const Sint32 val = (((Sint32) ((SDL_SwapBE16(*src)) ^ 0x8000)) << 16); const Sint32 val = (((Sint32) ((SDL_SwapBE16(*src)) ^ 0x8000)) << 16);
*dst = ((Sint32) SDL_SwapLE32(val)); *dst = ((Sint32) SDL_SwapLE32(val));
...@@ -1039,8 +1039,8 @@ SDL_Convert_U16MSB_to_S32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) ...@@ -1039,8 +1039,8 @@ SDL_Convert_U16MSB_to_S32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
fprintf(stderr, "Converting AUDIO_U16MSB to AUDIO_S32MSB.\n"); fprintf(stderr, "Converting AUDIO_U16MSB to AUDIO_S32MSB.\n");
#endif #endif
src = (const Uint16 *) (cvt->buf + cvt->len_cvt); src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
dst = (Sint32 *) (cvt->buf + cvt->len_cvt * 2); dst = ((Sint32 *) (cvt->buf + cvt->len_cvt * 2)) - 1;
for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) { for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) {
const Sint32 val = (((Sint32) ((SDL_SwapBE16(*src)) ^ 0x8000)) << 16); const Sint32 val = (((Sint32) ((SDL_SwapBE16(*src)) ^ 0x8000)) << 16);
*dst = ((Sint32) SDL_SwapBE32(val)); *dst = ((Sint32) SDL_SwapBE32(val));
...@@ -1063,8 +1063,8 @@ SDL_Convert_U16MSB_to_F32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) ...@@ -1063,8 +1063,8 @@ SDL_Convert_U16MSB_to_F32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
fprintf(stderr, "Converting AUDIO_U16MSB to AUDIO_F32LSB.\n"); fprintf(stderr, "Converting AUDIO_U16MSB to AUDIO_F32LSB.\n");
#endif #endif
src = (const Uint16 *) (cvt->buf + cvt->len_cvt); src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
dst = (float *) (cvt->buf + cvt->len_cvt * 2); dst = ((float *) (cvt->buf + cvt->len_cvt * 2)) - 1;
for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) { for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) {
const float val = ((((float) SDL_SwapBE16(*src)) * DIVBY32767) - 1.0f); const float val = ((((float) SDL_SwapBE16(*src)) * DIVBY32767) - 1.0f);
*dst = SDL_SwapFloatLE(val); *dst = SDL_SwapFloatLE(val);
...@@ -1087,8 +1087,8 @@ SDL_Convert_U16MSB_to_F32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) ...@@ -1087,8 +1087,8 @@ SDL_Convert_U16MSB_to_F32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
fprintf(stderr, "Converting AUDIO_U16MSB to AUDIO_F32MSB.\n"); fprintf(stderr, "Converting AUDIO_U16MSB to AUDIO_F32MSB.\n");
#endif #endif
src = (const Uint16 *) (cvt->buf + cvt->len_cvt); src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
dst = (float *) (cvt->buf + cvt->len_cvt * 2); dst = ((float *) (cvt->buf + cvt->len_cvt * 2)) - 1;
for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) { for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) {
const float val = ((((float) SDL_SwapBE16(*src)) * DIVBY32767) - 1.0f); const float val = ((((float) SDL_SwapBE16(*src)) * DIVBY32767) - 1.0f);
*dst = SDL_SwapFloatBE(val); *dst = SDL_SwapFloatBE(val);
...@@ -1228,8 +1228,8 @@ SDL_Convert_S16MSB_to_S32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) ...@@ -1228,8 +1228,8 @@ SDL_Convert_S16MSB_to_S32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
fprintf(stderr, "Converting AUDIO_S16MSB to AUDIO_S32LSB.\n"); fprintf(stderr, "Converting AUDIO_S16MSB to AUDIO_S32LSB.\n");
#endif #endif
src = (const Uint16 *) (cvt->buf + cvt->len_cvt); src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
dst = (Sint32 *) (cvt->buf + cvt->len_cvt * 2); dst = ((Sint32 *) (cvt->buf + cvt->len_cvt * 2)) - 1;
for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) { for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) {
const Sint32 val = (((Sint32) ((Sint16) SDL_SwapBE16(*src))) << 16); const Sint32 val = (((Sint32) ((Sint16) SDL_SwapBE16(*src))) << 16);
*dst = ((Sint32) SDL_SwapLE32(val)); *dst = ((Sint32) SDL_SwapLE32(val));
...@@ -1252,8 +1252,8 @@ SDL_Convert_S16MSB_to_S32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) ...@@ -1252,8 +1252,8 @@ SDL_Convert_S16MSB_to_S32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
fprintf(stderr, "Converting AUDIO_S16MSB to AUDIO_S32MSB.\n"); fprintf(stderr, "Converting AUDIO_S16MSB to AUDIO_S32MSB.\n");
#endif #endif
src = (const Uint16 *) (cvt->buf + cvt->len_cvt); src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
dst = (Sint32 *) (cvt->buf + cvt->len_cvt * 2); dst = ((Sint32 *) (cvt->buf + cvt->len_cvt * 2)) - 1;
for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) { for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) {
const Sint32 val = (((Sint32) ((Sint16) SDL_SwapBE16(*src))) << 16); const Sint32 val = (((Sint32) ((Sint16) SDL_SwapBE16(*src))) << 16);
*dst = ((Sint32) SDL_SwapBE32(val)); *dst = ((Sint32) SDL_SwapBE32(val));
...@@ -1276,8 +1276,8 @@ SDL_Convert_S16MSB_to_F32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) ...@@ -1276,8 +1276,8 @@ SDL_Convert_S16MSB_to_F32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
fprintf(stderr, "Converting AUDIO_S16MSB to AUDIO_F32LSB.\n"); fprintf(stderr, "Converting AUDIO_S16MSB to AUDIO_F32LSB.\n");
#endif #endif
src = (const Uint16 *) (cvt->buf + cvt->len_cvt); src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
dst = (float *) (cvt->buf + cvt->len_cvt * 2); dst = ((float *) (cvt->buf + cvt->len_cvt * 2)) - 1;
for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) { for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) {
const float val = (((float) ((Sint16) SDL_SwapBE16(*src))) * DIVBY32767); const float val = (((float) ((Sint16) SDL_SwapBE16(*src))) * DIVBY32767);
*dst = SDL_SwapFloatLE(val); *dst = SDL_SwapFloatLE(val);
...@@ -1300,8 +1300,8 @@ SDL_Convert_S16MSB_to_F32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format) ...@@ -1300,8 +1300,8 @@ SDL_Convert_S16MSB_to_F32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
fprintf(stderr, "Converting AUDIO_S16MSB to AUDIO_F32MSB.\n"); fprintf(stderr, "Converting AUDIO_S16MSB to AUDIO_F32MSB.\n");
#endif #endif
src = (const Uint16 *) (cvt->buf + cvt->len_cvt); src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
dst = (float *) (cvt->buf + cvt->len_cvt * 2); dst = ((float *) (cvt->buf + cvt->len_cvt * 2)) - 1;
for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) { for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) {
const float val = (((float) ((Sint16) SDL_SwapBE16(*src))) * DIVBY32767); const float val = (((float) ((Sint16) SDL_SwapBE16(*src))) * DIVBY32767);
*dst = SDL_SwapFloatBE(val); *dst = SDL_SwapFloatBE(val);
......
src/audio/sdlgenaudiocvt.pl
View file @ f62d6c17
...@@ -188,8 +188,8 @@ EOF ...@@ -188,8 +188,8 @@ EOF
if ($fsize < $tsize) { if ($fsize < $tsize) {
my $mult = $tsize / $fsize; my $mult = $tsize / $fsize;
print <<EOF; print <<EOF;
src = (const $srctype *) (cvt->buf + cvt->len_cvt); src = ((const $srctype *) (cvt->buf + cvt->len_cvt)) - 1;
dst = ($tctype *) (cvt->buf + cvt->len_cvt * $mult); dst = (($tctype *) (cvt->buf + cvt->len_cvt * $mult)) - 1;
for (i = cvt->len_cvt / sizeof ($srctype); i; --i, --src, --dst) { for (i = cvt->len_cvt / sizeof ($srctype); i; --i, --src, --dst) {
EOF EOF
} else { } else {
......
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