X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=snd_mem.c;h=519ef0e27924a3049b533a8c6ee33ed64208161e;hp=d924d66e1e517fd4be374902563d8704eb5afeb5;hb=6986e09fa77045fa21edaf84f6d849140f927d1b;hpb=ad40941adf0fe050fcc609b588cc05266bf26b84 diff --git a/snd_mem.c b/snd_mem.c index d924d66e..519ef0e2 100644 --- a/snd_mem.c +++ b/snd_mem.c @@ -17,549 +17,158 @@ 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" -#include "snd_ogg.h" - - -/* -================ -ResampleSfx -================ -*/ -size_t ResampleSfx (const qbyte *in_data, size_t in_length, const snd_format_t* in_format, qbyte *out_data, const char* sfxname) -{ - int samplefrac, fracstep; - size_t i, srcsample, srclength, outcount; - - // this is usually 0.5 (128), 1 (256), or 2 (512) - fracstep = ((double) in_format->speed / (double) shm->format.speed) * 256.0; - - srclength = in_length * in_format->channels; - - 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 +#include "darkplaces.h" - if (fracstep == 256) - { - // 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 - samplefrac = 0; - if ((fracstep & 255) == 0) // skipping points on perfect multiple - { - srcsample = 0; - fracstep >>= 8; - if (in_format->width == 2) - { - short *out = (short*)out_data; - const short *in = (const short*)in_data; - if (in_format->channels == 2) // LordHavoc: stereo sound support - { - fracstep <<= 1; - for (i=0 ; ichannels == 2) - { - fracstep <<= 1; - for (i=0 ; iwidth == 2) - { - short *out = (short*)out_data; - const short *in = (const short*)in_data; - if (in_format->channels == 2) - { - for (i=0 ; i> 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 - { - for (i=0 ; i> 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 - { - signed char *out = out_data; - const unsigned char *in = in_data; - if (in_format->channels == 2) - { - for (i=0 ; i> 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 - { - for (i=0 ; i> 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; -} - -//============================================================================= +#include "snd_main.h" +#include "snd_ogg.h" +#include "snd_wav.h" +#ifdef USEXMP +#include "snd_xmp.h" +#endif +#include "sound.h" -wavinfo_t GetWavinfo (char *name, qbyte *wav, int wavlength); +void SCR_PushLoadingScreen (const char *, float); +void SCR_PopLoadingScreen (qbool); /* ==================== -WAV_FetchSound +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). ==================== */ -static const sfxbuffer_t* WAV_FetchSound (channel_t* ch, unsigned int start, unsigned int nbsamples) +snd_ringbuffer_t *Snd_CreateRingBuffer (const snd_format_t* format, unsigned int sampleframes, void* buffer) { - return ch->sfx->fetcher_data; -} + snd_ringbuffer_t *ringbuffer; + // If the caller provides a buffer, it must give us its size + if (sampleframes == 0 && buffer != NULL) + return NULL; -snd_fetcher_t wav_fetcher = { WAV_FetchSound, NULL }; + ringbuffer = (snd_ringbuffer_t*)Mem_Alloc(snd_mempool, sizeof (*ringbuffer)); + memset(ringbuffer, 0, sizeof(*ringbuffer)); + memcpy(&ringbuffer->format, format, sizeof(ringbuffer->format)); - -/* -============== -S_LoadWavFile -============== -*/ -qboolean S_LoadWavFile (const char *filename, sfx_t *s) -{ - qbyte *data; - wavinfo_t info; - int len; - sfxbuffer_t* sb; - - Mem_FreePool (&s->mempool); - s->mempool = Mem_AllocPool(s->name); - - // Load the file - data = FS_LoadFile(filename, s->mempool, false); - if (!data) + // If we haven't been given a buffer + if (buffer == NULL) { - Mem_FreePool (&s->mempool); - return false; - } - - // Don't try to load it if it's not a WAV file - if (memcmp (data, "RIFF", 4) || memcmp (data + 8, "WAVE", 4)) - { - Mem_FreePool (&s->mempool); - return false; - } - - Con_DPrintf ("Loading WAV file \"%s\"\n", filename); - - 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); - Mem_FreePool (&s->mempool); - return false; - } + unsigned int maxframes; + size_t memsize; - // calculate resampled length - len = (int) ((double) info.samples * (double) shm->format.speed / (double) info.rate); - len = len * info.width * info.channels; + if (sampleframes == 0) + maxframes = (format->speed + 1) / 2; // Make the sound buffer large enough for containing 0.5 sec of sound + else + maxframes = sampleframes; - sb = Mem_Alloc (s->mempool, len + sizeof (*sb) - sizeof (sb->data)); - if (sb == NULL) - { - Con_Printf("failed to allocate memory for sound \"%s\"\n", s->name); - Mem_FreePool(&s->mempool); - return false; + memsize = maxframes * format->width * format->channels; + ringbuffer->ring = (unsigned char *) Mem_Alloc(snd_mempool, memsize); + ringbuffer->maxframes = maxframes; } - - s->fetcher = &wav_fetcher; - s->fetcher_data = sb; - s->format.speed = info.rate; - s->format.width = info.width; - s->format.channels = info.channels; - if (info.loopstart < 0) - s->loopstart = -1; else - s->loopstart = (double) s->loopstart * (double) shm->format.speed / (double) s->format.speed; - -#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]); + ringbuffer->ring = (unsigned char *) buffer; + ringbuffer->maxframes = sampleframes; } -#endif - - sb->length = ResampleSfx (data + info.dataofs, info.samples, &s->format, sb->data, s->name); - s->format.speed = shm->format.speed; - s->total_length = sb->length; - sb->offset = 0; - Mem_Free (data); - return true; + return ringbuffer; } +//============================================================================= + /* ============== S_LoadSound ============== */ -qboolean S_LoadSound (sfx_t *s, int complain) +qbool S_LoadSound (sfx_t *sfx, qbool complain) { - char namebuffer[MAX_QPATH]; + char namebuffer[MAX_QPATH + 16]; size_t len; - qboolean modified_name = false; - // see if still in memory - if (!shm || !shm->format.speed) - return false; - if (s->fetcher != NULL) - { - if (s->format.speed != shm->format.speed) - Sys_Error ("S_LoadSound: sound %s hasn't been resampled (%uHz instead of %uHz)", s->name); + // See if already loaded + if (sfx->fetcher != NULL) return true; - } - len = snprintf (namebuffer, sizeof (namebuffer), "sound/%s", s->name); - if (len >= sizeof (namebuffer)) + // 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; - // Try to load it as a WAV file - if (S_LoadWavFile (namebuffer, s)) - return true; - - // Else, try to load it as an Ogg Vorbis file - if (!strcasecmp (namebuffer + len - 4, ".wav")) - { - strcpy (namebuffer + len - 3, "ogg"); - modified_name = true; - } - if (OGG_LoadVorbisFile (namebuffer, s)) - return true; - - // 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 false; -} - -void S_UnloadSound(sfx_t *s) -{ - if (s->fetcher != NULL) - { - unsigned int i; - - s->fetcher = NULL; - s->fetcher_data = NULL; - Mem_FreePool(&s->mempool); - - // 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; - } -} - - -/* -=============================================================================== - -WAV loading - -=============================================================================== -*/ - - -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; + // No sound? + if (snd_renderbuffer == NULL) + return false; - val = BuffLittleShort (data_p); - data_p += 2; + // Initialize volume peak to 0; if ReplayGain is supported, the loader will change this away + sfx->volume_peak = 0.0; - return val; -} - -int GetLittleLong(void) -{ - int val = 0; + if (developer_loading.integer) + Con_Printf("loading sound %s\n", sfx->name); - val = BuffLittleLong (data_p); - data_p += 4; + SCR_PushLoadingScreen(sfx->name, 1); - return val; -} - -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; } - 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, qbyte *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_Print("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_Print("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_Print("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(); - - // 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; - } - } + 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_Print("Missing data chunk\n"); - return info; + if (XMP_LoadModFile (namebuffer, sfx)) + goto loaded; } +#endif - data_p += 4; - samples = GetLittleLong () / info.width / info.channels; - - if (info.samples) - { - if (samples < info.samples) - Host_Error ("Sound %s has a bad loop length", name); - } - else - info.samples = samples; + // Can't load the sound! + sfx->flags |= SFXFLAG_FILEMISSING; + if (complain) + Con_Printf(CON_ERROR "Failed to load sound \"%s\"\n", sfx->name); - info.dataofs = data_p - wav; + SCR_PopLoadingScreen(false); + return false; - return info; +loaded: + SCR_PopLoadingScreen(false); + return true; } -