X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=snd_mem.c;h=519ef0e27924a3049b533a8c6ee33ed64208161e;hp=278d2eb4f78b79e097fb58e76b73fa21d908dd08;hb=0dfd3a30839fefb7c1d817618354350f4efd1131;hpb=c4bf2d61a57ede112eccf87553ba694a995df6ec diff --git a/snd_mem.c b/snd_mem.c index 278d2eb4..519ef0e2 100644 --- 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. @@ -17,200 +17,66 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// snd_mem.c: sound caching -#include "quakedef.h" -int cache_full_cycle; +#include "darkplaces.h" -byte *S_Alloc (int size); +#include "snd_main.h" +#include "snd_ogg.h" +#include "snd_wav.h" +#ifdef USEXMP +#include "snd_xmp.h" +#endif +#include "sound.h" + +void SCR_PushLoadingScreen (const char *, float); +void SCR_PopLoadingScreen (qbool); /* -================ -ResampleSfx -================ +==================== +Snd_CreateRingBuffer + +If "buffer" is NULL, the function allocates one buffer of "sampleframes" sample frames itself +(if "sampleframes" is 0, the function chooses the size). +==================== */ -void ResampleSfx (sfx_t *sfx, int inrate, byte *data) +snd_ringbuffer_t *Snd_CreateRingBuffer (const snd_format_t* format, unsigned int sampleframes, void* buffer) { - int outcount; - int srcsample; - float stepscale; - int i; - int samplefrac, fracstep; - sfxcache_t *sc; - - sc = Cache_Check (&sfx->cache); - if (!sc) - return; - - stepscale = (float)inrate / shm->speed; // this is usually 0.5, 1, or 2 + snd_ringbuffer_t *ringbuffer; - outcount = sc->length / stepscale; - sc->length = outcount; - if (sc->loopstart != -1) - sc->loopstart = sc->loopstart / stepscale; - - sc->speed = shm->speed; -// if (loadas8bit.value) -// sc->width = 1; -// else -// sc->width = inwidth; -// sc->stereo = 0; + // If the caller provides a buffer, it must give us its size + if (sampleframes == 0 && buffer != NULL) + return NULL; -// resample / decimate to the current source rate + ringbuffer = (snd_ringbuffer_t*)Mem_Alloc(snd_mempool, sizeof (*ringbuffer)); + memset(ringbuffer, 0, sizeof(*ringbuffer)); + memcpy(&ringbuffer->format, format, sizeof(ringbuffer->format)); - if (stepscale == 1/* && inwidth == 1*/ && sc->width == 1) - { -// 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 ; idata)[i] = (int)( (unsigned char)(data[i]) - 128); - } - */ - } - else if (stepscale == 1/* && inwidth == 2*/ && sc->width == 2) // LordHavoc: quick case for 16bit + // If we haven't been given a buffer + if (buffer == NULL) { - if (sc->stereo) // LordHavoc: stereo sound support - for (i=0 ; idata)[i] = LittleShort (((short *)data)[i]); + unsigned int maxframes; + size_t memsize; + + if (sampleframes == 0) + maxframes = (format->speed + 1) / 2; // Make the sound buffer large enough for containing 0.5 sec of sound else - for (i=0 ; idata)[i] = LittleShort (((short *)data)[i]); + maxframes = sampleframes; + + memsize = maxframes * format->width * format->channels; + ringbuffer->ring = (unsigned char *) Mem_Alloc(snd_mempool, memsize); + ringbuffer->maxframes = maxframes; } else { -// general case - Con_DPrintf("ResampleSfx: resampling sound %s\n", sfx->name); - samplefrac = 0; - fracstep = stepscale*256; - if ((fracstep & 255) == 0) // skipping points on perfect multiple - { - srcsample = 0; - fracstep >>= 8; - if (sc->width == 2) - { - short *out = (void *)sc->data, *in = (void *)data; - if (sc->stereo) // LordHavoc: stereo sound support - { - fracstep <<= 1; - for (i=0 ; idata, *in = (void *)data; - if (sc->stereo) // LordHavoc: stereo sound support - { - fracstep <<= 1; - for (i=0 ; iwidth == 2) - { - short *out = (void *)sc->data, *in = (void *)data; - if (sc->stereo) // LordHavoc: stereo sound support - { - for (i=0 ; i> 7) & ~1; - samplefrac += fracstep; - sample = (LittleShort (in[srcsample ]) * (256 - (samplefrac & 255)) + LittleShort (in[srcsample+2]) * (samplefrac & 255)) >> 8; - *out++ = (short) sample; - sample = (LittleShort (in[srcsample+1]) * (256 - (samplefrac & 255)) + LittleShort (in[srcsample+3]) * (samplefrac & 255)) >> 8; - *out++ = (short) sample; - } - } - else - { - for (i=0 ; i> 8; - samplefrac += fracstep; - sample = (LittleShort (in[srcsample ]) * (256 - (samplefrac & 255)) + LittleShort (in[srcsample+1]) * (samplefrac & 255)) >> 8; - *out++ = (short) sample; - } - } - } - else - { - signed char *out = (void *)sc->data, *in = (void *)data; - if (sc->stereo) // LordHavoc: stereo sound support - { - for (i=0 ; i> 7) & ~1; - samplefrac += fracstep; - sample = ((((unsigned char) in[srcsample ] - 128) * (256 - (samplefrac & 255))) + (((unsigned char) in[srcsample+2] - 128) * (samplefrac & 255))) >> 8; - *out++ = (signed char) sample; - sample = ((((unsigned char) in[srcsample+1] - 128) * (256 - (samplefrac & 255))) + (((unsigned char) in[srcsample+3] - 128) * (samplefrac & 255))) >> 8; - *out++ = (signed char) sample; - } - } - else - { - for (i=0 ; i> 8; - samplefrac += fracstep; - sample = ((((unsigned char) in[srcsample ] - 128) * (256 - (samplefrac & 255))) + (((unsigned char) in[srcsample+1] - 128) * (samplefrac & 255))) >> 8; - *out++ = (signed char) sample; - } - } - } - } + ringbuffer->ring = (unsigned char *) buffer; + ringbuffer->maxframes = sampleframes; } + + return ringbuffer; } + //============================================================================= /* @@ -218,256 +84,91 @@ void ResampleSfx (sfx_t *sfx, int inrate, byte *data) S_LoadSound ============== */ -sfxcache_t *S_LoadSound (sfx_t *s) +qbool S_LoadSound (sfx_t *sfx, qbool 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) - { - 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) - 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, data + info.dataofs); - - return sc; -} - - + char namebuffer[MAX_QPATH + 16]; + size_t len; -/* -=============================================================================== - -WAV loading - -=============================================================================== -*/ + // See if already loaded + if (sfx->fetcher != NULL) + return true; + // If we weren't able to load it previously, no need to retry + // Note: S_PrecacheSound clears this flag to cause a retry + if (sfx->flags & SFXFLAG_FILEMISSING) + return false; -byte *data_p; -byte *iff_end; -byte *last_chunk; -byte *iff_data; -int iff_chunk_len; + // No sound? + if (snd_renderbuffer == NULL) + return false; + // Initialize volume peak to 0; if ReplayGain is supported, the loader will change this away + sfx->volume_peak = 0.0; -short GetLittleShort(void) -{ - short val = 0; - val = *data_p; - val = val + (*(data_p+1)<<8); - data_p += 2; - return val; -} + if (developer_loading.integer) + Con_Printf("loading sound %s\n", sfx->name); -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; -} + SCR_PushLoadingScreen(sfx->name, 1); -void FindNextChunk(char *name) -{ - while (1) + // LadyHavoc: if the sound filename does not begin with sound/, try adding it + if (strncasecmp(sfx->name, "sound/", 6)) { - data_p=last_chunk; - - if (data_p >= iff_end) - { // didn't find the chunk - data_p = NULL; - return; + dpsnprintf (namebuffer, sizeof(namebuffer), "sound/%s", sfx->name); + len = strlen(namebuffer); + if (len >= 4 && !strcasecmp (namebuffer + len - 4, ".wav")) + { + if (S_LoadWavFile (namebuffer, sfx)) + goto loaded; + memcpy (namebuffer + len - 3, "ogg", 4); } - - data_p += 4; - iff_chunk_len = GetLittleLong(); - if (iff_chunk_len < 0) + if (len >= 4 && !strcasecmp (namebuffer + len - 4, ".ogg")) { - data_p = NULL; - return; + if (OGG_LoadVorbisFile (namebuffer, sfx)) + goto loaded; } -// 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; - } -} - -void FindChunk(char *name) -{ - last_chunk = iff_data; - FindNextChunk (name); -} - - -void DumpChunks(void) -{ - char str[5]; - - str[4] = 0; - data_p=iff_data; - do - { - 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); -} - -/* -============ -GetWavinfo -============ -*/ -wavinfo_t GetWavinfo (char *name, byte *wav, int wavlength) -{ - 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))) - { - Con_Printf("Missing RIFF/WAVE chunks\n"); - return info; +#ifdef USEXMP + else if (len >= 1) + { + if (XMP_LoadModFile (namebuffer, sfx)) + goto loaded; + } +#endif } -// get "fmt " chunk - iff_data = data_p + 12; -// DumpChunks (); - - FindChunk("fmt "); - if (!data_p) - { - Con_Printf("Missing fmt chunk\n"); - return info; - } - data_p += 8; - format = GetLittleShort(); - if (format != 1) + // LadyHavoc: then try without the added sound/ as wav and ogg + dpsnprintf (namebuffer, sizeof(namebuffer), "%s", sfx->name); + len = strlen(namebuffer); + // request foo.wav: tries foo.wav, then foo.ogg + // request foo.ogg: tries foo.ogg only + // request foo.mod: tries foo.mod only + if (len >= 4 && !strcasecmp (namebuffer + len - 4, ".wav")) { - Con_Printf("Microsoft PCM format only\n"); - return info; + if (S_LoadWavFile (namebuffer, sfx)) + goto loaded; + memcpy (namebuffer + len - 3, "ogg", 4); } - - info.channels = GetLittleShort(); - info.rate = GetLittleLong(); - data_p += 4+2; - info.width = GetLittleShort() / 8; - -// get cue chunk - FindChunk("cue "); - if (data_p) + if (len >= 4 && !strcasecmp (namebuffer + len - 4, ".ogg")) { - 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); - } - } + if (OGG_LoadVorbisFile (namebuffer, sfx)) + goto loaded; } - else - info.loopstart = -1; - -// find data chunk - FindChunk("data"); - if (!data_p) +#ifdef USEXMP + else if (len >= 1) { - Con_Printf("Missing data chunk\n"); - return info; + if (XMP_LoadModFile (namebuffer, sfx)) + goto loaded; } +#endif - data_p += 4; - samples = GetLittleLong () / info.width; + // Can't load the sound! + sfx->flags |= SFXFLAG_FILEMISSING; + if (complain) + Con_Printf(CON_ERROR "Failed to load sound \"%s\"\n", sfx->name); - if (info.samples) - { - if (samples < info.samples) - Host_Error ("Sound %s has a bad loop length", name); - } - else - info.samples = samples; + SCR_PopLoadingScreen(false); + return false; - info.dataofs = data_p - wav; - - return info; +loaded: + SCR_PopLoadingScreen(false); + return true; } -