]> git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - snd_mem.c
Modified the sound code so it can handle sounds outside of a "sound" subdirectory.
[xonotic/darkplaces.git] / snd_mem.c
index ca7fb36b03fa627349d4ccfabf2a252a7477c08e..2cb01bee3adae3d371761c105cad2975153f9c53 100644 (file)
--- a/snd_mem.c
+++ b/snd_mem.c
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -21,126 +21,188 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
-int                    cache_full_cycle;
+#include "snd_ogg.h"
+#include "snd_wav.h"
 
-byte *S_Alloc (int size);
 
 /*
 ================
 ResampleSfx
 ================
 */
-void ResampleSfx (sfx_t *sfx, int inrate, int inwidth, byte *data)
+size_t ResampleSfx (const qbyte *in_data, size_t in_length, const snd_format_t* in_format, qbyte *out_data, const char* sfxname)
 {
-       int             outcount;
-       int             srcsample;
-       float   stepscale;
-       int             i;
-       int             samplefrac, fracstep;
-       sfxcache_t      *sc;
-       
-       sc = Cache_Check (&sfx->cache);
-       if (!sc)
-               return;
+       int samplefrac, fracstep;
+       size_t i, srcsample, srclength, outcount;
 
-       stepscale = (float)inrate / shm->speed; // this is usually 0.5, 1, or 2
+       // this is usually 0.5 (128), 1 (256), or 2 (512)
+       fracstep = ((double) in_format->speed / (double) shm->format.speed) * 256.0;
 
-       outcount = sc->length / stepscale;
-       sc->length = outcount;
-       if (sc->loopstart != -1)
-               sc->loopstart = sc->loopstart / stepscale;
+       srclength = in_length * in_format->channels;
 
-       sc->speed = shm->speed;
-       if (loadas8bit.value)
-               sc->width = 1;
-       else
-               sc->width = inwidth;
-//     sc->stereo = 0;
+       outcount = (double) in_length * (double) shm->format.speed / (double) in_format->speed;
+       Con_DPrintf("ResampleSfx: resampling sound \"%s\" from %dHz to %dHz (%d samples to %d samples)\n",
+                               sfxname, in_format->speed, shm->format.speed, in_length, outcount);
 
 // resample / decimate to the current source rate
 
-       if (stepscale == 1 && inwidth == 1 && sc->width == 1)
+       if (fracstep == 256)
        {
-// fast special case
-               // LordHavoc: I do not serve the readability gods...
-               int *indata, *outdata;
-               int count4, count1;
-               count1 = outcount << sc->stereo;
-               count4 = count1 >> 2;
-               indata = (void *)data;
-               outdata = (void *)sc->data;
-               while (count4--)
-                       *outdata++ = *indata++ ^ 0x80808080;
-               if (count1 & 2)
-                       ((short*)outdata)[0] = ((short*)indata)[0] ^ 0x8080;
-               if (count1 & 1)
-                       ((char*)outdata)[2] = ((char*)indata)[2] ^ 0x80;
-               /*
-               if (sc->stereo) // LordHavoc: stereo sound support
-               {
-                       for (i=0 ; i<(outcount<<1) ; i++)
-                               ((signed char *)sc->data)[i] = (int)( (unsigned char)(data[i]) - 128);
-               }
-               else
-               {
-                       for (i=0 ; i<outcount ; i++)
-                               ((signed char *)sc->data)[i] = (int)( (unsigned char)(data[i]) - 128);
-               }
-               */
+               // fast case for direct transfer
+               if (in_format->width == 1) // 8bit
+                       for (i = 0;i < srclength;i++)
+                               ((signed char *)out_data)[i] = ((unsigned char *)in_data)[i] - 128;
+               else //if (sb->width == 2) // 16bit
+                       for (i = 0;i < srclength;i++)
+                               ((short *)out_data)[i] = ((short *)in_data)[i];
        }
        else
        {
-// general case
-               Con_DPrintf("ResampleSfx: resampling sound %s\n", sfx->name);
+               // general case
                samplefrac = 0;
-               fracstep = stepscale*256;
-               if (sc->stereo) // LordHavoc: stereo sound support
+               if ((fracstep & 255) == 0) // skipping points on perfect multiple
                {
-                       if (sc->width == 2)
+                       srcsample = 0;
+                       fracstep >>= 8;
+                       if (in_format->width == 2)
                        {
-                               for (i=0 ; i<outcount*2 ;)
+                               short *out = (short*)out_data;
+                               const short *in = (const short*)in_data;
+                               if (in_format->channels == 2) // LordHavoc: stereo sound support
                                {
-                                       srcsample = samplefrac >> 8;
-                                       samplefrac += fracstep;
-                                       srcsample <<= 1;
-                                       ((short *)sc->data)[i++] = LittleShort ( ((short *)data)[srcsample++] ); // left
-                                       ((short *)sc->data)[i++] = LittleShort ( ((short *)data)[srcsample  ] ); // right
+                                       fracstep <<= 1;
+                                       for (i=0 ; i<outcount ; i++)
+                                       {
+                                               *out++ = in[srcsample  ];
+                                               *out++ = in[srcsample+1];
+                                               srcsample += fracstep;
+                                       }
+                               }
+                               else
+                               {
+                                       for (i=0 ; i<outcount ; i++)
+                                       {
+                                               *out++ = in[srcsample];
+                                               srcsample += fracstep;
+                                       }
                                }
                        }
                        else
                        {
-                               for (i=0 ; i<outcount*2 ;)
+                               signed char *out = out_data;
+                               const unsigned char *in = in_data;
+                               if (in_format->channels == 2)
                                {
-                                       srcsample = samplefrac >> 8;
-                                       samplefrac += fracstep;
-                                       srcsample <<= 1;
-                                       ((signed char *)sc->data)[i++] = ((int)( (unsigned char)(data[srcsample++]) - 128) << 8) >> 8; // left
-                                       ((signed char *)sc->data)[i++] = ((int)( (unsigned char)(data[srcsample  ]) - 128) << 8) >> 8; // right
+                                       fracstep <<= 1;
+                                       for (i=0 ; i<outcount ; i++)
+                                       {
+                                               *out++ = in[srcsample  ] - 128;
+                                               *out++ = in[srcsample+1] - 128;
+                                               srcsample += fracstep;
+                                       }
+                               }
+                               else
+                               {
+                                       for (i=0 ; i<outcount ; i++)
+                                       {
+                                               *out++ = in[srcsample  ] - 128;
+                                               srcsample += fracstep;
+                                       }
                                }
                        }
                }
                else
                {
-                       if (sc->width == 2)
+                       int sample;
+                       int a, b;
+                       if (in_format->width == 2)
                        {
-                               for (i=0 ; i<outcount ; i++)
+                               short *out = (short*)out_data;
+                               const short *in = (const short*)in_data;
+                               if (in_format->channels == 2)
+                               {
+                                       for (i=0 ; i<outcount ; i++)
+                                       {
+                                               srcsample = (samplefrac >> 8) << 1;
+                                               a = in[srcsample  ];
+                                               if (srcsample+2 >= srclength)
+                                                       b = 0;
+                                               else
+                                                       b = in[srcsample+2];
+                                               sample = (((b - a) * (samplefrac & 255)) >> 8) + a;
+                                               *out++ = (short) sample;
+                                               a = in[srcsample+1];
+                                               if (srcsample+2 >= srclength)
+                                                       b = 0;
+                                               else
+                                                       b = in[srcsample+3];
+                                               sample = (((b - a) * (samplefrac & 255)) >> 8) + a;
+                                               *out++ = (short) sample;
+                                               samplefrac += fracstep;
+                                       }
+                               }
+                               else
                                {
-                                       srcsample = samplefrac >> 8;
-                                       samplefrac += fracstep;
-                                       ((short *)sc->data)[i] = LittleShort ( ((short *)data)[srcsample] );
+                                       for (i=0 ; i<outcount ; i++)
+                                       {
+                                               srcsample = samplefrac >> 8;
+                                               a = in[srcsample  ];
+                                               if (srcsample+1 >= srclength)
+                                                       b = 0;
+                                               else
+                                                       b = in[srcsample+1];
+                                               sample = (((b - a) * (samplefrac & 255)) >> 8) + a;
+                                               *out++ = (short) sample;
+                                               samplefrac += fracstep;
+                                       }
                                }
                        }
                        else
                        {
-                               for (i=0 ; i<outcount ; i++)
+                               signed char *out = out_data;
+                               const unsigned char *in = in_data;
+                               if (in_format->channels == 2)
+                               {
+                                       for (i=0 ; i<outcount ; i++)
+                                       {
+                                               srcsample = (samplefrac >> 8) << 1;
+                                               a = (int) in[srcsample  ] - 128;
+                                               if (srcsample+2 >= srclength)
+                                                       b = 0;
+                                               else
+                                                       b = (int) in[srcsample+2] - 128;
+                                               sample = (((b - a) * (samplefrac & 255)) >> 8) + a;
+                                               *out++ = (signed char) sample;
+                                               a = (int) in[srcsample+1] - 128;
+                                               if (srcsample+2 >= srclength)
+                                                       b = 0;
+                                               else
+                                                       b = (int) in[srcsample+3] - 128;
+                                               sample = (((b - a) * (samplefrac & 255)) >> 8) + a;
+                                               *out++ = (signed char) sample;
+                                               samplefrac += fracstep;
+                                       }
+                               }
+                               else
                                {
-                                       srcsample = samplefrac >> 8;
-                                       samplefrac += fracstep;
-                                       ((signed char *)sc->data)[i] = ((int)( (unsigned char)(data[srcsample]) - 128) << 8) >> 8;
+                                       for (i=0 ; i<outcount ; i++)
+                                       {
+                                               srcsample = samplefrac >> 8;
+                                               a = (int) in[srcsample  ] - 128;
+                                               if (srcsample+1 >= srclength)
+                                                       b = 0;
+                                               else
+                                                       b = (int) in[srcsample+1] - 128;
+                                               sample = (((b - a) * (samplefrac & 255)) >> 8) + a;
+                                               *out++ = (signed char) sample;
+                                               samplefrac += fracstep;
+                                       }
                                }
                        }
                }
        }
+
+       return outcount;
 }
 
 //=============================================================================
@@ -150,256 +212,67 @@ void ResampleSfx (sfx_t *sfx, int inrate, int inwidth, byte *data)
 S_LoadSound
 ==============
 */
-sfxcache_t *S_LoadSound (sfx_t *s)
+qboolean S_LoadSound (sfx_t *s, qboolean complain)
 {
-    char       namebuffer[256];
-       byte    *data;
-       wavinfo_t       info;
-       int             len;
-       float   stepscale;
-       sfxcache_t      *sc;
-       byte    stackbuf[1*1024];               // avoid dirtying the cache heap
-
-// see if still in memory
-       sc = Cache_Check (&s->cache);
-       if (sc)
-               return sc;
-
-//Con_Printf ("S_LoadSound: %x\n", (int)stackbuf);
-// load it in
-       strcpy(namebuffer, "sound/");
-       strcat(namebuffer, s->name);
-
-//     Con_Printf ("loading %s\n",namebuffer);
-
-       data = COM_LoadStackFile(namebuffer, stackbuf, sizeof(stackbuf), false);
-
-       if (!data)
+       char namebuffer[MAX_QPATH];
+       size_t len;
+       qboolean modified_name = false;
+
+       // see if still in memory
+       if (!shm || !shm->format.speed)
+               return false;
+       if (s->fetcher != NULL)
        {
-               Con_Printf ("Couldn't load %s\n", namebuffer);
-               return NULL;
+               if (s->format.speed != shm->format.speed)
+                       Sys_Error ("S_LoadSound: sound %s hasn't been resampled (%uHz instead of %uHz)", s->name);
+               return true;
        }
 
-       info = GetWavinfo (s->name, data, com_filesize);
-       // LordHavoc: stereo sounds are now allowed (intended for music)
-       if (info.channels < 1 || info.channels > 2)
-       {
-               Con_Printf ("%s has an unsupported number of channels (%i)\n",s->name, info.channels);
-               return NULL;
-       }
-       /*
-       if (info.channels != 1)
-       {
-               Con_Printf ("%s is a stereo sample\n",s->name);
-               return NULL;
-       }
-       */
-
-       stepscale = (float)info.rate / shm->speed;      
-       len = info.samples / stepscale;
-
-       len = len * info.width * info.channels;
-
-       sc = Cache_Alloc ( &s->cache, len + sizeof(sfxcache_t), s->name);
-       if (!sc)
-               return NULL;
-       
-       sc->length = info.samples;
-       sc->loopstart = info.loopstart;
-       sc->speed = info.rate;
-       sc->width = info.width;
-       sc->stereo = info.channels == 2;
-
-       ResampleSfx (s, sc->speed, sc->width, data + info.dataofs);
-
-       return sc;
-}
-
-
-
-/*
-===============================================================================
-
-WAV loading
-
-===============================================================================
-*/
-
-
-byte   *data_p;
-byte   *iff_end;
-byte   *last_chunk;
-byte   *iff_data;
-int    iff_chunk_len;
-
-
-short GetLittleShort(void)
-{
-       short val = 0;
-       val = *data_p;
-       val = val + (*(data_p+1)<<8);
-       data_p += 2;
-       return val;
-}
+       len = strlcpy (namebuffer, s->name, sizeof (namebuffer));
+       if (len >= sizeof (namebuffer))
+               return false;
 
-int GetLittleLong(void)
-{
-       int val = 0;
-       val = *data_p;
-       val = val + (*(data_p+1)<<8);
-       val = val + (*(data_p+2)<<16);
-       val = val + (*(data_p+3)<<24);
-       data_p += 4;
-       return val;
-}
+       // Try to load it as a WAV file
+       if (S_LoadWavFile (namebuffer, s))
+               return true;
 
-void FindNextChunk(char *name)
-{
-       while (1)
+       // Else, try to load it as an Ogg Vorbis file
+       if (!strcasecmp (namebuffer + len - 4, ".wav"))
        {
-               data_p=last_chunk;
-
-               if (data_p >= iff_end)
-               {       // didn't find the chunk
-                       data_p = NULL;
-                       return;
-               }
-               
-               data_p += 4;
-               iff_chunk_len = GetLittleLong();
-               if (iff_chunk_len < 0)
-               {
-                       data_p = NULL;
-                       return;
-               }
-//             if (iff_chunk_len > 1024*1024)
-//                     Sys_Error ("FindNextChunk: %i length is past the 1 meg sanity limit", iff_chunk_len);
-               data_p -= 8;
-               last_chunk = data_p + 8 + ( (iff_chunk_len + 1) & ~1 );
-               if (!strncmp(data_p, name, 4))
-                       return;
+               strcpy (namebuffer + len - 3, "ogg");
+               modified_name = true;
        }
-}
-
-void FindChunk(char *name)
-{
-       last_chunk = iff_data;
-       FindNextChunk (name);
-}
+       if (OGG_LoadVorbisFile (namebuffer, s))
+               return true;
 
-
-void DumpChunks(void)
-{
-       char    str[5];
-       
-       str[4] = 0;
-       data_p=iff_data;
-       do
+       // Can't load the sound!
+       if (!complain)
+               s->flags |= SFXFLAG_SILENTLYMISSING;
+       else
+               s->flags &= ~SFXFLAG_SILENTLYMISSING;
+       if (complain)
        {
-               memcpy (str, data_p, 4);
-               data_p += 4;
-               iff_chunk_len = GetLittleLong();
-               Con_Printf ("0x%x : %s (%d)\n", (int)(data_p - 4), str, iff_chunk_len);
-               data_p += (iff_chunk_len + 1) & ~1;
-       } while (data_p < iff_end);
+               if (modified_name)
+                       strcpy (namebuffer + len - 3, "wav");
+               Con_Printf("Couldn't load %s\n", namebuffer);
+       }
+       return false;
 }
 
-/*
-============
-GetWavinfo
-============
-*/
-wavinfo_t GetWavinfo (char *name, byte *wav, int wavlength)
+void S_UnloadSound(sfx_t *s)
 {
-       wavinfo_t       info;
-       int     i;
-       int     format;
-       int             samples;
-
-       memset (&info, 0, sizeof(info));
-
-       if (!wav)
-               return info;
-               
-       iff_data = wav;
-       iff_end = wav + wavlength;
-
-// find "RIFF" chunk
-       FindChunk("RIFF");
-       if (!(data_p && !strncmp(data_p+8, "WAVE", 4)))
+       if (s->fetcher != NULL)
        {
-               Con_Printf("Missing RIFF/WAVE chunks\n");
-               return info;
-       }
+               unsigned int i;
 
-// get "fmt " chunk
-       iff_data = data_p + 12;
-// DumpChunks ();
+               s->fetcher = NULL;
+               s->fetcher_data = NULL;
+               Mem_FreePool(&s->mempool);
 
-       FindChunk("fmt ");
-       if (!data_p)
-       {
-               Con_Printf("Missing fmt chunk\n");
-               return info;
+               // At this point, some per-channel data pointers may point to freed zones.
+               // Practically, it shouldn't be a problem; but it's wrong, so we fix that
+               for (i = 0; i < total_channels ; i++)
+                       if (channels[i].sfx == s)
+                               channels[i].fetcher_data = NULL;
        }
-       data_p += 8;
-       format = GetLittleShort();
-       if (format != 1)
-       {
-               Con_Printf("Microsoft PCM format only\n");
-               return info;
-       }
-
-       info.channels = GetLittleShort();
-       info.rate = GetLittleLong();
-       data_p += 4+2;
-       info.width = GetLittleShort() / 8;
-
-// get cue chunk
-       FindChunk("cue ");
-       if (data_p)
-       {
-               data_p += 32;
-               info.loopstart = GetLittleLong();
-//             Con_Printf("loopstart=%d\n", sfx->loopstart);
-
-       // if the next chunk is a LIST chunk, look for a cue length marker
-               FindNextChunk ("LIST");
-               if (data_p)
-               {
-                       if (!strncmp (data_p + 28, "mark", 4))
-                       {       // this is not a proper parse, but it works with cooledit...
-                               data_p += 24;
-                               i = GetLittleLong ();   // samples in loop
-                               info.samples = info.loopstart + i;
-//                             Con_Printf("looped length: %i\n", i);
-                       }
-               }
-       }
-       else
-               info.loopstart = -1;
-
-// find data chunk
-       FindChunk("data");
-       if (!data_p)
-       {
-               Con_Printf("Missing data chunk\n");
-               return info;
-       }
-
-       data_p += 4;
-       samples = GetLittleLong () / info.width;
-
-       if (info.samples)
-       {
-               if (samples < info.samples)
-                       Host_Error ("Sound %s has a bad loop length", name);
-       }
-       else
-               info.samples = samples;
-
-       info.dataofs = data_p - wav;
-       
-       return info;
 }
-