yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-22 20:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

snd_mem.c aufgeräumt

Browse source
This commit is contained in:
Yamagi Burmeister 2009-03-03 11:12:26 +00:00
parent 1c161a9930
commit 5c221e74c0
1 changed files with 28 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
src/client/snd_mem.c
View file

@ -37,7 +37,8 @@ void ResampleSfx (sfx_t *sfx, int inrate, int inwidth, byte *data)
int srcsample; int srcsample;
float stepscale; float stepscale;
int i; int i;
int sample, samplefrac, fracstep; int sample;
unsigned int samplefrac, fracstep;
sfxcache_t *sc; sfxcache_t *sc;
sc = sfx->cache; sc = sfx->cache;
@ -46,10 +47,10 @@ void ResampleSfx (sfx_t *sfx, int inrate, int inwidth, byte *data)
stepscale = (float)inrate / dma.speed; // this is usually 0.5, 1, or 2 stepscale = (float)inrate / dma.speed; // this is usually 0.5, 1, or 2
outcount = sc->length / stepscale; outcount = (int)(sc->length / stepscale);
sc->length = outcount; sc->length = outcount;
if (sc->loopstart != -1) if (sc->loopstart != -1)
sc->loopstart = sc->loopstart / stepscale; sc->loopstart = (int)(sc->loopstart / stepscale);
sc->speed = dma.speed; sc->speed = dma.speed;
if (s_loadas8bit->value) if (s_loadas8bit->value)
@ -58,20 +59,20 @@ void ResampleSfx (sfx_t *sfx, int inrate, int inwidth, byte *data)
sc->width = inwidth; sc->width = inwidth;
sc->stereo = 0; sc->stereo = 0;
// resample / decimate to the current source rate // resample / decimate to the current source rate
if (stepscale == 1 && inwidth == 1 && sc->width == 1) if (stepscale == 1 && inwidth == 1 && sc->width == 1)
{ {
// fast special case // fast special case
for (i=0 ; i<outcount ; i++) for (i=0 ; i<outcount ; i++)
((signed char *)sc->data)[i] ((signed char *)sc->data)[i]
= (int)( (unsigned char)(data[i]) - 128); = (int)( (unsigned char)(data[i]) - 128);
} }
else else
{ {
// general case // general case
samplefrac = 0; samplefrac = 0;
fracstep = stepscale*256; fracstep = (int)(stepscale*256);
for (i=0 ; i<outcount ; i++) for (i=0 ; i<outcount ; i++)
{ {
srcsample = samplefrac >> 8; srcsample = samplefrac >> 8;
@ -109,13 +110,12 @@ sfxcache_t *S_LoadSound (sfx_t *s)
if (s->name[0] == '*') if (s->name[0] == '*')
return NULL; return NULL;
// see if still in memory // see if still in memory
sc = s->cache; sc = s->cache;
if (sc) if (sc)
return sc; return sc;
//Com_Printf ("S_LoadSound: %x\n", (int)stackbuf); // load it in
// load it in
if (s->truename) if (s->truename)
name = s->truename; name = s->truename;
else else
@ -126,12 +126,11 @@ sfxcache_t *S_LoadSound (sfx_t *s)
else else
Com_sprintf (namebuffer, sizeof(namebuffer), "sound/%s", name); Com_sprintf (namebuffer, sizeof(namebuffer), "sound/%s", name);
// Com_Printf ("loading %s\n",namebuffer);
size = FS_LoadFile (namebuffer, (void **)&data); size = FS_LoadFile (namebuffer, (void **)&data);
if (!data) if (!data)
{ {
s->cache = NULL;
Com_DPrintf ("Couldn't load %s\n", namebuffer); Com_DPrintf ("Couldn't load %s\n", namebuffer);
return NULL; return NULL;
} }
@ -145,7 +144,14 @@ sfxcache_t *S_LoadSound (sfx_t *s)
} }
stepscale = (float)info.rate / dma.speed; stepscale = (float)info.rate / dma.speed;
len = info.samples / stepscale; len = (int)(info.samples / stepscale);
if (info.samples == 0 || len == 0)
{
Com_Printf ("WARNING: Zero length sound encountered: %s\n", s->name);
FS_FreeFile (data);
return NULL;
}
len = len * info.width * info.channels; len = len * info.width * info.channels;
@ -169,8 +175,6 @@ sfxcache_t *S_LoadSound (sfx_t *s)
return sc; return sc;
} }
/* /*
=============================================================================== ===============================================================================
@ -179,7 +183,6 @@ WAV loading
=============================================================================== ===============================================================================
*/ */
byte *data_p; byte *data_p;
byte *iff_end; byte *iff_end;
byte *last_chunk; byte *last_chunk;
@ -226,11 +229,9 @@ void FindNextChunk(char *name)
data_p = NULL; data_p = NULL;
return; 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; data_p -= 8;
last_chunk = data_p + 8 + ( (iff_chunk_len + 1) & ~1 ); last_chunk = data_p + 8 + ( (iff_chunk_len + 1) & ~1 );
if (!strncmp((char *)data_p, name, 4)) if (!strncmp((const char *)data_p, name, 4))
return; return;
} }
} }
@ -241,7 +242,6 @@ void FindChunk(char *name)
FindNextChunk (name); FindNextChunk (name);
} }
void DumpChunks(void) void DumpChunks(void)
{ {
char str[5]; char str[5];
@ -253,7 +253,7 @@ void DumpChunks(void)
memcpy (str, data_p, 4); memcpy (str, data_p, 4);
data_p += 4; data_p += 4;
iff_chunk_len = GetLittleLong(); iff_chunk_len = GetLittleLong();
Com_Printf ("0x%x : %s (%d)\n", (int)(data_p - 4), str, iff_chunk_len); Com_Printf ("0x%x : %s (%d)\n", data_p - 4, str, iff_chunk_len);
data_p += (iff_chunk_len + 1) & ~1; data_p += (iff_chunk_len + 1) & ~1;
} while (data_p < iff_end); } while (data_p < iff_end);
} }
@ -278,17 +278,16 @@ wavinfo_t GetWavinfo (char *name, byte *wav, int wavlength)
iff_data = wav; iff_data = wav;
iff_end = wav + wavlength; iff_end = wav + wavlength;
// find "RIFF" chunk // find "RIFF" chunk
FindChunk("RIFF"); FindChunk("RIFF");
if (!(data_p && !strncmp((char *)data_p+8, "WAVE", 4))) if (!(data_p && !strncmp((const char *)data_p+8, "WAVE", 4)))
{ {
Com_Printf("Missing RIFF/WAVE chunks\n"); Com_Printf("Missing RIFF/WAVE chunks\n");
return info; return info;
} }
// get "fmt " chunk // get "fmt " chunk
iff_data = data_p + 12; iff_data = data_p + 12;
// DumpChunks ();
FindChunk("fmt "); FindChunk("fmt ");
if (!data_p) if (!data_p)
@ -309,31 +308,29 @@ wavinfo_t GetWavinfo (char *name, byte *wav, int wavlength)
data_p += 4+2; data_p += 4+2;
info.width = GetLittleShort() / 8; info.width = GetLittleShort() / 8;
// get cue chunk // get cue chunk
FindChunk("cue "); FindChunk("cue ");
if (data_p) if (data_p)
{ {
data_p += 32; data_p += 32;
info.loopstart = GetLittleLong(); info.loopstart = GetLittleLong();
// Com_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"); FindNextChunk ("LIST");
if (data_p) if (data_p)
{ {
if (!strncmp ((char *)data_p + 28, "mark", 4)) if (!strncmp ((const char *)data_p + 28, "mark", 4))
{ // this is not a proper parse, but it works with cooledit... { // this is not a proper parse, but it works with cooledit...
data_p += 24; data_p += 24;
i = GetLittleLong (); // samples in loop i = GetLittleLong (); // samples in loop
info.samples = info.loopstart + i; info.samples = info.loopstart + i;
// Com_Printf("looped length: %i\n", i);
} }
} }
} }
else else
info.loopstart = -1; info.loopstart = -1;
// find data chunk // find data chunk
FindChunk("data"); FindChunk("data");
if (!data_p) if (!data_p)
{ {