X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=snd_mem.c;h=c620d23664392e2f530a2922f0b4545b1984ed21;hb=045b4c0a4b471714922deb7ecaed3d83d90602d0;hp=3290038ebdaef7d6396be7113bf2bfc73999b5d3;hpb=505268bb5e0fedf95c5b4af2fd8614cb6bfd28b3;p=xonotic%2Fdarkplaces.git diff --git a/snd_mem.c b/snd_mem.c index 3290038e..c620d236 100644 --- a/snd_mem.c +++ b/snd_mem.c @@ -21,7 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" -qbyte *S_Alloc (int size); +#include "ogg.h" + /* ================ @@ -38,6 +39,7 @@ void ResampleSfx (sfxcache_t *sc, qbyte *data, char *name) srclength = sc->length << sc->stereo; outcount = (double) sc->length * (double) shm->speed / (double) sc->speed; + Con_DPrintf("ResampleSfx: resampling sound %s from %dhz to %dhz (%d samples to %d samples)\n", name, sc->speed, shm->speed, sc->length, outcount); sc->length = outcount; if (sc->loopstart != -1) sc->loopstart = (double) sc->loopstart * (double) shm->speed / (double) sc->speed; @@ -48,6 +50,7 @@ void ResampleSfx (sfxcache_t *sc, qbyte *data, char *name) if (fracstep == 256) { + // fast case for direct transfer if (sc->width == 1) // 8bit for (i = 0;i < srclength;i++) ((signed char *)sc->data)[i] = ((unsigned char *)data)[i] - 128; @@ -57,8 +60,7 @@ void ResampleSfx (sfxcache_t *sc, qbyte *data, char *name) } else { -// general case - Con_DPrintf("ResampleSfx: resampling sound %s\n", name); + // general case samplefrac = 0; if ((fracstep & 255) == 0) // skipping points on perfect multiple { @@ -201,71 +203,52 @@ void ResampleSfx (sfxcache_t *sc, qbyte *data, char *name) } // LordHavoc: use this for testing if it ever becomes useful again -#if 0 - COM_WriteFile (va("sound/%s.pcm", name), sc->data, (sc->length << sc->stereo) * sc->width); -#endif + //COM_WriteFile (va("sound/%s.pcm", name), sc->data, (sc->length << sc->stereo) * sc->width); } //============================================================================= /* ============== -S_LoadSound +S_LoadWavFile ============== */ -sfxcache_t *S_LoadSound (sfx_t *s) +sfxcache_t *S_LoadWavFile (const char *filename, sfx_t *s) { - char namebuffer[256]; - qbyte *data; - wavinfo_t info; - int len; - sfxcache_t *sc; - -// see if still in memory - if (s->sfxcache) - return s->sfxcache; - -//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_LoadFile(namebuffer, false); + qbyte *data; + wavinfo_t info; + int len; + sfxcache_t *sc; + // Load the file + data = FS_LoadFile(filename, false); if (!data) - { - Con_Printf ("Couldn't load %s\n", namebuffer); return NULL; - } - info = GetWavinfo (s->name, data, com_filesize); - // LordHavoc: stereo sounds are now allowed (intended for music) + // Don't try to load it if it's not a WAV file + if (memcmp (data, "RIFF", 4) || memcmp (data + 8, "WAVE", 4)) + return NULL; + + info = GetWavinfo (s->name, data, fs_filesize); + // Stereo sounds are 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); + Con_Printf("%s has an unsupported number of channels (%i)\n",s->name, info.channels); Mem_Free(data); return NULL; } - /* - if (info.channels != 1) - { - Con_Printf ("%s is a stereo sample\n",s->name); - return NULL; - } - */ // calculate resampled length len = (int) ((double) info.samples * (double) shm->speed / (double) info.rate); len = len * info.width * info.channels; - // FIXME: add S_UnloadSounds or something? Mem_FreePool(&s->mempool); s->mempool = Mem_AllocPool(s->name); sc = s->sfxcache = Mem_Alloc(s->mempool, len + sizeof(sfxcache_t)); if (!sc) { + Con_Printf("failed to allocate memory for sound \"%s\"\n", s->name); + Mem_FreePool(&s->mempool); Mem_Free(data); return NULL; } @@ -276,13 +259,73 @@ sfxcache_t *S_LoadSound (sfx_t *s) sc->width = info.width; sc->stereo = info.channels == 2; - ResampleSfx (sc, data + info.dataofs, s->name); + ResampleSfx(sc, data + info.dataofs, s->name); Mem_Free(data); return sc; } +/* +============== +S_LoadSound +============== +*/ +sfxcache_t *S_LoadSound (sfx_t *s, int complain) +{ + char namebuffer[MAX_QPATH]; + size_t len; + sfxcache_t *sc; + qboolean modified_name = false; + + // see if still in memory + if (!shm || !shm->speed) + return NULL; + if (s->sfxcache && (s->sfxcache->speed == shm->speed)) + return s->sfxcache; + + len = snprintf (namebuffer, sizeof (namebuffer), "sound/%s", s->name); + if (len >= sizeof (namebuffer)) + return NULL; + + // Try to load it as a WAV file + sc = S_LoadWavFile (namebuffer, s); + if (sc != NULL) + return sc; + + // Else, try to load it as an Ogg Vorbis file + if (!strcasecmp (namebuffer + len - 4, ".wav")) + { + strcpy (namebuffer + len - 3, "ogg"); + modified_name = true; + } + sc = OGG_LoadVorbisFile (namebuffer, s); + if (sc != NULL) + return sc; + + // Can't load the sound! + if (!complain) + s->flags |= SFXFLAG_SILENTLYMISSING; + else + s->flags &= ~SFXFLAG_SILENTLYMISSING; + if (complain) + { + if (modified_name) + strcpy (namebuffer + len - 3, "wav"); + Con_Printf ("Couldn't load %s\n", namebuffer); + } + return NULL; +} + +void S_UnloadSound(sfx_t *s) +{ + if (s->sfxcache) + { + s->sfxcache = NULL; + Mem_FreePool(&s->mempool); + } +} + /* =============================================================================== @@ -293,11 +336,11 @@ WAV loading */ -qbyte *data_p; -qbyte *iff_end; -qbyte *last_chunk; -qbyte *iff_data; -int iff_chunk_len; +qbyte *data_p; +qbyte *iff_end; +qbyte *last_chunk; +qbyte *iff_data; +int iff_chunk_len; short GetLittleShort(void) @@ -331,7 +374,7 @@ void FindNextChunk(char *name) data_p = NULL; return; } - + data_p += 4; iff_chunk_len = GetLittleLong(); if (iff_chunk_len < 0) @@ -339,8 +382,6 @@ void FindNextChunk(char *name) 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)) @@ -357,8 +398,8 @@ void FindChunk(char *name) void DumpChunks(void) { - char str[5]; - + char str[5]; + str[4] = 0; data_p=iff_data; do @@ -378,10 +419,10 @@ GetWavinfo */ wavinfo_t GetWavinfo (char *name, qbyte *wav, int wavlength) { - wavinfo_t info; - int i; - int format; - int samples; + wavinfo_t info; + int i; + int format; + int samples; memset (&info, 0, sizeof(info)); @@ -391,7 +432,7 @@ wavinfo_t GetWavinfo (char *name, qbyte *wav, int wavlength) iff_data = wav; iff_end = wav + wavlength; -// find "RIFF" chunk + // find "RIFF" chunk FindChunk("RIFF"); if (!(data_p && !strncmp(data_p+8, "WAVE", 4))) { @@ -399,9 +440,9 @@ wavinfo_t GetWavinfo (char *name, qbyte *wav, int wavlength) return info; } -// get "fmt " chunk + // get "fmt " chunk iff_data = data_p + 12; -// DumpChunks (); + //DumpChunks (); FindChunk("fmt "); if (!data_p) @@ -422,15 +463,14 @@ wavinfo_t GetWavinfo (char *name, qbyte *wav, int wavlength) data_p += 4+2; info.width = GetLittleShort() / 8; -// get cue chunk + // 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 + // if the next chunk is a LIST chunk, look for a cue length marker FindNextChunk ("LIST"); if (data_p) { @@ -439,14 +479,13 @@ wavinfo_t GetWavinfo (char *name, qbyte *wav, int wavlength) 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 + // find data chunk FindChunk("data"); if (!data_p) { @@ -455,7 +494,7 @@ wavinfo_t GetWavinfo (char *name, qbyte *wav, int wavlength) } data_p += 4; - samples = GetLittleLong () / info.width; + samples = GetLittleLong () / info.width / info.channels; if (info.samples) {