#include "quakedef.h"
-qbyte *S_Alloc (int size);
+#include "snd_ogg.h"
+
/*
================
ResampleSfx
================
*/
-void ResampleSfx (sfxcache_t *sc, qbyte *data, char *name)
+size_t ResampleSfx (const qbyte *in_data, size_t in_length, const snd_format_t* in_format, qbyte *out_data, const char* sfxname)
{
- int i, outcount, srcsample, srclength, samplefrac, fracstep;
+ int samplefrac, fracstep;
+ size_t i, srcsample, srclength, outcount;
// this is usually 0.5 (128), 1 (256), or 2 (512)
- fracstep = ((double) sc->speed / (double) shm->speed) * 256.0;
-
- srclength = sc->length << sc->stereo;
+ fracstep = ((double) in_format->speed / (double) shm->format.speed) * 256.0;
- outcount = (double) sc->length * (double) shm->speed / (double) sc->speed;
- sc->length = outcount;
- if (sc->loopstart != -1)
- sc->loopstart = (double) sc->loopstart * (double) shm->speed / (double) sc->speed;
+ srclength = in_length * in_format->channels;
- sc->speed = shm->speed;
+ 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 (fracstep == 256)
{
- if (sc->width == 1) // 8bit
+ // fast case for direct transfer
+ if (in_format->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
+ ((signed char *)out_data)[i] = ((unsigned char *)in_data)[i] - 128;
+ else //if (sb->width == 2) // 16bit
for (i = 0;i < srclength;i++)
- ((short *)sc->data)[i] = LittleShort (((short *)data)[i]);
+ ((short *)out_data)[i] = ((short *)in_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
{
srcsample = 0;
fracstep >>= 8;
- if (sc->width == 2)
+ if (in_format->width == 2)
{
- short *out = (void *)sc->data, *in = (void *)data;
- if (sc->stereo) // LordHavoc: stereo sound support
+ 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 ; i<outcount ; i++)
{
- *out++ = LittleShort (in[srcsample ]);
- *out++ = LittleShort (in[srcsample+1]);
+ *out++ = in[srcsample ];
+ *out++ = in[srcsample+1];
srcsample += fracstep;
}
}
{
for (i=0 ; i<outcount ; i++)
{
- *out++ = LittleShort (in[srcsample ]);
+ *out++ = in[srcsample];
srcsample += fracstep;
}
}
}
else
{
- signed char *out = (void *)sc->data;
- unsigned char *in = (void *)data;
- if (sc->stereo) // LordHavoc: stereo sound support
+ signed char *out = out_data;
+ const unsigned char *in = in_data;
+ if (in_format->channels == 2)
{
fracstep <<= 1;
for (i=0 ; i<outcount ; i++)
{
int sample;
int a, b;
- if (sc->width == 2)
+ if (in_format->width == 2)
{
- short *out = (void *)sc->data, *in = (void *)data;
- if (sc->stereo) // LordHavoc: stereo sound support
+ short *out = (short*)out_data;
+ const short *in = (const short*)in_data;
+ if (in_format->channels == 2)
{
for (i=0 ; i<outcount ; i++)
{
}
else
{
- signed char *out = (void *)sc->data;
- unsigned char *in = (void *)data;
- if (sc->stereo) // LordHavoc: stereo sound support
+ signed char *out = out_data;
+ const unsigned char *in = in_data;
+ if (in_format->channels == 2)
{
for (i=0 ; i<outcount ; i++)
{
}
}
- // 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
+ return outcount;
}
//=============================================================================
+wavinfo_t GetWavinfo (char *name, qbyte *wav, int wavlength);
+
/*
-==============
-S_LoadSound
-==============
+====================
+WAV_FetchSound
+====================
*/
-sfxcache_t *S_LoadSound (sfx_t *s)
+static const sfxbuffer_t* WAV_FetchSound (channel_t* ch, unsigned int start, unsigned int nbsamples)
{
- char namebuffer[256];
- qbyte *data;
- wavinfo_t info;
- int len;
- sfxcache_t *sc;
+ return ch->sfx->fetcher_data;
+}
-// 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);
+snd_fetcher_t wav_fetcher = { WAV_FetchSound, NULL };
-// Con_Printf ("loading %s\n",namebuffer);
- data = COM_LoadFile(namebuffer, false);
+/*
+==============
+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)
{
- Con_Printf ("Couldn't load %s\n", namebuffer);
- return NULL;
+ Mem_FreePool (&s->mempool);
+ return false;
}
- info = GetWavinfo (s->name, data, com_filesize);
- // LordHavoc: stereo sounds are now allowed (intended for music)
- if (info.channels < 1 || info.channels > 2)
+ // Don't try to load it if it's not a WAV file
+ if (memcmp (data, "RIFF", 4) || memcmp (data + 8, "WAVE", 4))
{
- Con_Printf ("%s has an unsupported number of channels (%i)\n",s->name, info.channels);
- Mem_Free(data);
- return NULL;
+ Mem_FreePool (&s->mempool);
+ return false;
}
- /*
- if (info.channels != 1)
+
+ 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 is a stereo sample\n",s->name);
- return NULL;
+ Con_Printf("%s has an unsupported number of channels (%i)\n",s->name, info.channels);
+ Mem_FreePool (&s->mempool);
+ return false;
}
- */
// calculate resampled length
- len = (int) ((double) info.samples * (double) shm->speed / (double) info.rate);
+ len = (int) ((double) info.samples * (double) shm->format.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)
+ 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);
- Mem_Free(data);
- return NULL;
+ return false;
+ }
+
+ 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]);
+ }
+#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;
+}
+
+
+/*
+==============
+S_LoadSound
+==============
+*/
+qboolean S_LoadSound (sfx_t *s, int complain)
+{
+ 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)
+ {
+ 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;
}
- sc->length = info.samples;
- sc->loopstart = info.loopstart;
- sc->speed = info.rate;
- sc->width = info.width;
- sc->stereo = info.channels == 2;
+ len = snprintf (namebuffer, sizeof (namebuffer), "sound/%s", s->name);
+ if (len >= sizeof (namebuffer))
+ return false;
- ResampleSfx (sc, data + info.dataofs, s->name);
+ // Try to load it as a WAV file
+ if (S_LoadWavFile (namebuffer, s))
+ return true;
- Mem_Free(data);
- 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;
+ }
+ 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;
+ }
+}
/*
*/
-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;
}
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))
void DumpChunks(void)
{
- char str[5];
-
+ 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);
+ 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);
}
*/
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));
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;
}
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)
{
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)
{
- Con_Printf("Missing data chunk\n");
+ Con_Print("Missing data chunk\n");
return info;
}
projects / xonotic / darkplaces.git / blobdiff