X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=snd_mem.c;h=d0671eb8740fb88ef143148178beb8500933442f;hp=4e2a94ec26d91c0511d6da07e4739387bd5efcfb;hb=1e1dbc1c5b89ae4ab8cdd9b32dc6413c67f5dd84;hpb=ea7c24e1fb41f3b1df984ac0eed6881c9fde16f5;ds=sidebyside diff --git a/snd_mem.c b/snd_mem.c index 4e2a94ec..d0671eb8 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 "snd_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,17 +50,17 @@ 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; else //if (sc->width == 2) // 16bit for (i = 0;i < srclength;i++) - ((short *)sc->data)[i] = LittleShort (((short *)data)[i]); + ((short *)sc->data)[i] = ((short *)data)[i]; } else { -// general case - Con_DPrintf("ResampleSfx: resampling sound %s\n", name); + // general case samplefrac = 0; if ((fracstep & 255) == 0) // skipping points on perfect multiple { @@ -72,8 +74,8 @@ void ResampleSfx (sfxcache_t *sc, qbyte *data, char *name) fracstep <<= 1; for (i=0 ; idata, (sc->length << sc->stereo) * sc->width); + //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; - -// load it in - strcpy(namebuffer, "sound/"); - strcat(namebuffer, s->name); - - data = COM_LoadFile(namebuffer, false); + qbyte *data; + wavinfo_t info; + int len; + sfxcache_t *sc; + // Load the file + data = FS_LoadFile(filename, tempmempool, 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; } @@ -248,12 +242,12 @@ sfxcache_t *S_LoadSound (sfx_t *s) 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; @@ -265,13 +259,88 @@ sfxcache_t *S_LoadSound (sfx_t *s) sc->width = info.width; sc->stereo = info.channels == 2; - ResampleSfx (sc, data + info.dataofs, s->name); +#if BYTE_ORDER != LITTLE_ENDIAN + // We must convert the WAV data from little endian + // to the machine endianess before resampling it + if (info.width == 2) + { + int i; + short* ptr; + + len = info.samples * info.channels; + ptr = (short*)(data + info.dataofs); + for (i = 0; i < len; i++) + ptr[i] = LittleShort (ptr[i]); + } +#endif + + 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); + } +} + /* =============================================================================== @@ -282,30 +351,30 @@ WAV loading */ -qbyte *data_p; -qbyte *iff_end; -qbyte *last_chunk; -qbyte *iff_data; -int iff_chunk_len; +static qbyte *data_p; +static qbyte *iff_end; +static qbyte *last_chunk; +static qbyte *iff_data; +static int iff_chunk_len; short GetLittleShort(void) { - short val = 0; - val = *data_p; - val = val + (*(data_p+1)<<8); + short val; + + val = BuffLittleShort (data_p); data_p += 2; + return val; } 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); + + val = BuffLittleLong (data_p); data_p += 4; + return val; } @@ -344,8 +413,8 @@ void FindChunk(char *name) void DumpChunks(void) { - char str[5]; - + char str[5]; + str[4] = 0; data_p=iff_data; do @@ -353,7 +422,7 @@ void DumpChunks(void) 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); + 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); } @@ -365,10 +434,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)); @@ -378,29 +447,29 @@ 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))) { - Con_Printf("Missing RIFF/WAVE chunks\n"); + Con_Print("Missing RIFF/WAVE chunks\n"); return info; } -// get "fmt " chunk + // get "fmt " chunk iff_data = data_p + 12; -// DumpChunks (); + //DumpChunks (); FindChunk("fmt "); if (!data_p) { - Con_Printf("Missing fmt chunk\n"); + Con_Print("Missing fmt chunk\n"); return info; } data_p += 8; format = GetLittleShort(); if (format != 1) { - Con_Printf("Microsoft PCM format only\n"); + Con_Print("Microsoft PCM format only\n"); return info; } @@ -409,14 +478,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(); - // 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) { @@ -431,11 +500,11 @@ wavinfo_t GetWavinfo (char *name, qbyte *wav, int wavlength) else info.loopstart = -1; -// find data chunk + // find data chunk FindChunk("data"); if (!data_p) { - Con_Printf("Missing data chunk\n"); + Con_Print("Missing data chunk\n"); return info; }