bfsoundlib: Treat 8-bit WAV files as unsigned

Author: mefistotelis

bfsoundlib/src/ailwav.c

@@ -45,6 +45,14 @@ typedef struct {
     int16_t samples_per_block;
 } WAVE_FMT;
 
+enum WAVE_FORMAT_TAGS {
+    WAVE_FORMAT_PCM = 0x0001,
+    WAVE_FORMAT_IEEE_FLOAT = 0x0003,
+    WAVE_FORMAT_ALAW = 0x0006,
+    WAVE_FORMAT_MULAW = 0x0007,
+    WAVE_FORMAT_EXTENSIBLE = 0xFFFE,
+};
+
 /** .WAV file data chunk */
 typedef struct {
     char DATA_string[4];
@@ -73,7 +81,10 @@ void AIL_process_WAV_image(const uint8_t *image, SNDSAMPLE *s)
         f = (WAVE_FMT*)((int8_t*)f + f->chunk_size + 8 + (f->chunk_size & 1));
     }
 
+    assert(f->format_tag == WAVE_FORMAT_PCM);
+
     // Configure sample type and rate based on FMT chunk
+    // 8-bit PCM is always unsigned, 16-bit is always signed
     if ((f->channels == 1) && (f->bits_per_sample == 8))
     {
         AIL_set_sample_type(s, DIG_F_MONO_8, 0);

bfsoundlib/src/drv_oal.c

@@ -343,12 +343,18 @@ get_pcm_format(SNDSAMPLE *s)
     switch (s->format)
     {
     case DIG_F_MONO_8:
+        // OpenAL expects 8-bit formats to be unsigned
+        assert((s->flags & DIG_PCM_SIGN) == 0);
         return AL_FORMAT_MONO8;
     case DIG_F_MONO_16:
+        // OpenAL expects 16-bit formats to be signed
+        assert((s->flags & DIG_PCM_SIGN) != 0);
         return AL_FORMAT_MONO16;
     case DIG_F_STEREO_8:
+        assert((s->flags & DIG_PCM_SIGN) == 0);
         return AL_FORMAT_STEREO8;
     case DIG_F_STEREO_16:
+        assert((s->flags & DIG_PCM_SIGN) != 0);
         return AL_FORMAT_STEREO16;
     case DIG_F_MULTICHANNEL_8:
     case DIG_F_MULTICHANNEL_16:
@@ -403,9 +409,7 @@ queue_dig_sample_buffers(DIG_DRIVER *digdrv, SNDSAMPLE *s)
         if (len > SOUND_MAX_BUFSIZE)
             len = SOUND_MAX_BUFSIZE;
 
-        assert ((s->flags & DIG_PCM_SIGN) != 0);
-
-        buf = pop_free_buffer ();
+        buf = pop_free_buffer();
         alBufferData(buf, get_pcm_format(s), data, len, s->playback_rate);
         if (!check_al("alBufferData"))
             goto err;