gosu 1.4.5.pre1 → 1.4.6

data/dependencies/SDL_sound/SDL_sound_mp3.c

@@ -29,12 +29,6 @@
 #define DRMP3_COPY_MEMORY(dst, src, sz) SDL_memcpy((dst), (src), (sz))
 #define DRMP3_MOVE_MEMORY(dst, src, sz) SDL_memmove((dst), (src), (sz))
 #define DRMP3_ZERO_MEMORY(p, sz) SDL_memset((p), 0, (sz))
-#ifndef __WATCOMC__ /* #@!.!.. */
-#if SDL_VERSION_ATLEAST(2, 0, 9)
-#define exp SDL_exp
-#endif
-#define floor SDL_floor
-#endif
 
 #include "dr_mp3.h"
 
@@ -83,6 +77,7 @@ static int MP3_open(Sound_Sample *sample, const char *ext)
 {
     Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
     drmp3 *dr = (drmp3 *) SDL_calloc(1, sizeof (drmp3));
+    Uint64 frames;
 
     BAIL_IF_MACRO(!dr, ERR_OUT_OF_MEMORY, 0);
     if (drmp3_init(dr, mp3_read, mp3_seek, sample, NULL) != DRMP3_TRUE)
@@ -99,7 +94,16 @@ static int MP3_open(Sound_Sample *sample, const char *ext)
     sample->actual.rate = dr->sampleRate;
     sample->actual.format = AUDIO_F32SYS;  /* dr_mp3 only does float. */
 
-    internal->total_time = -1;  /* !!! FIXME? */
+    frames = drmp3_get_pcm_frame_count(dr);
+    if (frames == 0) /* ever possible ??? */
+        internal->total_time = -1;
+    else
+    {
+        const Uint32 rate = dr->sampleRate;
+        internal->total_time = (frames / rate) * 1000;
+        internal->total_time += ((frames % rate) * 1000) / rate;
+    } /* else */
+
     internal->decoder_private = dr;
 
     return 1;

data/dependencies/SDL_sound/SDL_sound_raw.c

@@ -1,5 +1,5 @@
 /**
- * SDL_sound; A sound processing toolkit.
+ * SDL_sound; An abstract sound format decoding API.
  *
  * Please see the file LICENSE.txt in the source's root directory.
  *

data/dependencies/SDL_sound/SDL_sound_shn.c

@@ -1,5 +1,5 @@
 /**
- * SDL_sound; A sound processing toolkit.
+ * SDL_sound; An abstract sound format decoding API.
  *
  * Please see the file LICENSE.txt in the source's root directory.
  *
@@ -174,10 +174,6 @@ static const Uint8 ulaw_outward[13][256] = {
 #define M_PI    3.14159265358979323846
 #endif
 
-#if defined(HAVE_LIBC) && defined(__WATCOMC__) /* Watcom has issues... */
-#define SDL_log log
-#endif
-
 
 static int word_get(shn_t *shn, SDL_RWops *rw, Uint32 *word)
 {

data/dependencies/SDL_sound/SDL_sound_voc.c

@@ -1,5 +1,5 @@
 /**
- * SDL_sound; A sound processing toolkit.
+ * SDL_sound; An abstract sound format decoding API.
  *
  * Please see the file LICENSE.txt in the source's root directory.
  *

data/dependencies/SDL_sound/SDL_sound_vorbis.c

@@ -1,5 +1,5 @@
 /**
- * SDL_sound; A sound processing toolkit.
+ * SDL_sound; An abstract sound format decoding API.
  *
  * Please see the file LICENSE.txt in the source's root directory.
  *
@@ -27,12 +27,12 @@
 #define STB_VORBIS_NO_CRT 1
 #define STB_VORBIS_NO_PUSHDATA_API 1
 #define STB_VORBIS_MAX_CHANNELS 6
-#define STBV_CDECL
 #define STB_VORBIS_NO_COMMENTS 1
 #define STB_FORCEINLINE SDL_FORCE_INLINE
 #if SDL_BYTEORDER == SDL_BIG_ENDIAN
 #define STB_VORBIS_BIG_ENDIAN 1
 #endif
+#define STBV_CDECL SDLCALL /* for SDL_qsort */
 
 #if !defined(__clang_analyzer__)
 #ifdef assert
@@ -52,7 +52,6 @@
 #define malloc SDL_malloc
 #define realloc SDL_realloc
 #define free SDL_free
-#ifndef __WATCOMC__ /* #@!.!.. */
 #define pow SDL_pow
 #define floor SDL_floor
 #define ldexp(v, e) SDL_scalbn((v), (e))
@@ -64,7 +63,6 @@
 #define exp SDL_exp
 #endif
 #endif
-#endif
 
 #include "stb_vorbis.h"
 

data/dependencies/SDL_sound/SDL_sound_wav.c

@@ -1,5 +1,5 @@
 /**
- * SDL_sound; A sound processing toolkit.
+ * SDL_sound; An abstract sound format decoding API.
  *
  * Please see the file LICENSE.txt in the source's root directory.
  *
@@ -70,9 +70,10 @@ static SDL_INLINE int read_uint8(SDL_RWops *rw, Uint8 *ui8)
 
 #define fmtID  0x20746D66  /* "fmt ", in ascii. */
 
-#define FMT_NORMAL 0x0001    /* Uncompressed waveform data.     */
-#define FMT_ADPCM  0x0002    /* ADPCM compressed waveform data. */
-#define FMT_IEEE_FLOAT  0x0003    /* Uncompressed IEEE floating point waveform data. */
+#define FMT_NORMAL     0x0001   /* Uncompressed waveform data.     */
+#define FMT_ADPCM      0x0002   /* ADPCM compressed waveform data. */
+#define FMT_IEEE_FLOAT 0x0003   /* Uncompressed IEEE floating point waveform data. */
+#define FMT_EXTENSIBLE 0xFFFE   /* "Extensible" tag */
 
 typedef struct
 {
@@ -92,7 +93,7 @@ typedef struct S_WAV_FMT_T
 {
     Uint32 chunkID;
     Sint32 chunkSize;
-    Sint16 wFormatTag;
+    Uint16 wFormatTag;
     Uint16 wChannels;
     Uint32 dwSamplesPerSec;
     Uint32 dwAvgBytesPerSec;
@@ -144,7 +145,7 @@ static int read_fmt_chunk(SDL_RWops *rw, fmt_t *fmt)
     BAIL_IF_MACRO(fmt->chunkSize < 16, "WAV: Invalid chunk size", 0);
     fmt->next_chunk_offset = SDL_RWtell(rw) + fmt->chunkSize;
     
-    BAIL_IF_MACRO(!read_le16s(rw, &fmt->wFormatTag), NULL, 0);
+    BAIL_IF_MACRO(!read_le16(rw, &fmt->wFormatTag), NULL, 0);
     BAIL_IF_MACRO(!read_le16(rw, &fmt->wChannels), NULL, 0);
     BAIL_IF_MACRO(!read_le32(rw, &fmt->dwSamplesPerSec), NULL, 0);
     BAIL_IF_MACRO(!read_le32(rw, &fmt->dwAvgBytesPerSec), NULL, 0);
@@ -211,7 +212,19 @@ static Uint32 read_sample_fmt_normal(Sound_Sample *sample)
     Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
     wav_t *w = (wav_t *) internal->decoder_private;
     Uint32 max = (internal->buffer_size < (Uint32) w->bytesLeft) ?
-                    internal->buffer_size : (Uint32) w->bytesLeft;
+                  internal->buffer_size : (Uint32) w->bytesLeft;
+
+    /* We need to convert 24-bit PCM to an SDL-friendly AUDIO_S32SYS ... */
+    if (w->fmt->wBitsPerSample == 24) {
+        const Uint32 num_samples = max / 3;
+
+        /* we're going to expand by 25%...3 bytes to 4. Make sure the buffer has room to expand. */
+        max = (num_samples - (num_samples / 4)) * 3;
+        if (max == 0) {
+            sample->flags |= SOUND_SAMPLEFLAG_EOF;
+            return 0;
+        }
+    }
 
     SDL_assert(max > 0);
 
@@ -234,6 +247,19 @@ static Uint32 read_sample_fmt_normal(Sound_Sample *sample)
     else if (retval < internal->buffer_size)
         sample->flags |= SOUND_SAMPLEFLAG_EAGAIN;
 
+    /* deal with 24-bit PCM. */
+    if ((retval > 0) && (w->fmt->wBitsPerSample == 24)) {
+        const Uint32 total = retval / 3;
+        const Uint8 *src = ((Uint8 *)internal->buffer + retval) - 3;
+        Uint32 *dst = (Uint32 *) (((Uint8 *)internal->buffer + (total * 4)) - 4);
+        Uint32 i;
+        for (i = 0; i < total; i++, dst--, src -= 3) {
+            const Uint32 sample = ((Uint32) src[0]) | (((Uint32) src[1]) << 8) | (((Uint32) src[2]) << 16);
+            *dst = sample << 8;  /* shift it up so the most significant bits cover the 32-bit space. */
+        }
+        retval = total * 4;
+    }
+
     return retval;
 } /* read_sample_fmt_normal */
 
@@ -590,6 +616,7 @@ static int read_fmt(SDL_RWops *rw, fmt_t *fmt)
     /* if it's in this switch statement, we support the format. */
     switch (fmt->wFormatTag)
     {
+        case FMT_EXTENSIBLE:  /* !!! FIXME: this isn't correct */
         case FMT_NORMAL:
             SNDDBG(("WAV: Appears to be uncompressed audio.\n"));
             return read_fmt_normal(rw, fmt);
@@ -603,7 +630,6 @@ static int read_fmt(SDL_RWops *rw, fmt_t *fmt)
             return read_fmt_normal(rw, fmt);  /* just normal PCM, otherwise. */
 
         /* add other types here. */
-
     } /* switch */
 
     SNDDBG(("WAV: Format 0x%X is unknown.\n",
@@ -662,19 +688,17 @@ static int WAV_open_internal(Sound_Sample *sample, const char *ext, fmt_t *fmt)
     } /* if */
     else
     {
-        if (fmt->wBitsPerSample == 4)
-            sample->actual.format = AUDIO_S16SYS;
-        else if (fmt->wBitsPerSample == 8)
-            sample->actual.format = AUDIO_U8;
-        else if (fmt->wBitsPerSample == 16)
-            sample->actual.format = AUDIO_S16LSB;
-        else if (fmt->wBitsPerSample == 32)
-            sample->actual.format = AUDIO_S32LSB;
-        else
+        switch (fmt->wBitsPerSample)
         {
-            SNDDBG(("WAV: %d bits per sample!?\n", (int) fmt->wBitsPerSample));
-            BAIL_MACRO("WAV: Unsupported sample size.", 0);
-        } /* else */
+            case 4: sample->actual.format = AUDIO_S16SYS; break;
+            case 8: sample->actual.format = AUDIO_U8; break;
+            case 16: sample->actual.format = AUDIO_S16LSB; break;
+            case 24: sample->actual.format = AUDIO_S32SYS; break;
+            case 32: sample->actual.format = AUDIO_S32LSB; break;
+            default:
+                SNDDBG(("WAV: %d bits per sample!?\n", (int) fmt->wBitsPerSample));
+                BAIL_MACRO("WAV: Unsupported sample size.", 0);
+        } /* switch */
     } /* else */
 
     BAIL_IF_MACRO(!read_fmt(rw, fmt), NULL, 0);
@@ -691,6 +715,11 @@ static int WAV_open_internal(Sound_Sample *sample, const char *ext, fmt_t *fmt)
                                sample->actual.channels );
     internal->decoder_private = (void *) w;
 
+    if (fmt->dwAvgBytesPerSec == 0) {  /* we assume data is uncompressed if this field is unset. */
+        fmt->dwAvgBytesPerSec = fmt->sample_frame_size * sample->actual.rate;
+        BAIL_IF_MACRO(fmt->dwAvgBytesPerSec == 0, "WAV: corrupt format chunk?", 0);
+    }
+
     internal->total_time = (fmt->total_bytes / fmt->dwAvgBytesPerSec) * 1000;
     internal->total_time += (fmt->total_bytes % fmt->dwAvgBytesPerSec)
                               *  1000 / fmt->dwAvgBytesPerSec;