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.
ResampleSfx
================
*/
-void ResampleSfx (sfx_t *sfx, int inrate, qbyte *data, char *name)
+void ResampleSfx (sfxcache_t *sc, qbyte *data, char *name)
{
- int outcount;
- int srcsample, srclength;
- float stepscale;
- int i;
- int samplefrac, fracstep;
- sfxcache_t *sc;
-
- sc = sfx->sfxcache;
- if (!sc)
- return;
+ int i, outcount, srcsample, srclength, samplefrac, fracstep;
- stepscale = (float)inrate / shm->speed; // this is usually 0.5, 1, or 2
+ // 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;
- outcount = sc->length / stepscale;
+ outcount = (double) sc->length * (double) shm->speed / (double) sc->speed;
sc->length = outcount;
if (sc->loopstart != -1)
- sc->loopstart = sc->loopstart / stepscale;
+ sc->loopstart = (double) sc->loopstart * (double) shm->speed / (double) sc->speed;
sc->speed = shm->speed;
-// if (loadas8bit.value)
-// sc->width = 1;
-// else
-// sc->width = inwidth;
-// sc->stereo = 0;
// resample / decimate to the current source rate
- 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
- outcount *= 2;
- for (i=0 ; i<outcount ; i++)
- ((signed char *)sc->data)[i] = ((unsigned char *)data)[i] - 128;
- }
- else if (stepscale == 1/* && inwidth == 2*/ && sc->width == 2) // LordHavoc: quick case for 16bit
+ if (fracstep == 256)
{
- if (sc->stereo) // LordHavoc: stereo sound support
- outcount *= 2;
- for (i=0 ; i<outcount ;i++)
- ((short *)sc->data)[i] = LittleShort (((short *)data)[i]);
+ // 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]);
}
else
{
-// general case
- Con_DPrintf("ResampleSfx: resampling sound %s\n", sfx->name);
+ // general case
+ Con_DPrintf("ResampleSfx: resampling sound %s\n", name);
samplefrac = 0;
- fracstep = stepscale*256;
if ((fracstep & 255) == 0) // skipping points on perfect multiple
{
srcsample = 0;
}
// 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
+ //COM_WriteFile (va("sound/%s.pcm", name), sc->data, (sc->length << sc->stereo) * sc->width);
}
//=============================================================================
S_LoadSound
==============
*/
-sfxcache_t *S_LoadSound (sfx_t *s)
+sfxcache_t *S_LoadSound (sfx_t *s, int complain)
{
- char namebuffer[256];
- qbyte *data;
- wavinfo_t info;
- int len;
- float stepscale;
- sfxcache_t *sc;
-
-// see if still in memory
+ char namebuffer[256];
+ qbyte *data;
+ wavinfo_t info;
+ int len;
+ sfxcache_t *sc;
+
+ // see if still in memory
if (s->sfxcache)
return s->sfxcache;
-//Con_Printf ("S_LoadSound: %x\n", (int)stackbuf);
-// load it in
+ // load it in
strcpy(namebuffer, "sound/");
strcat(namebuffer, s->name);
-// Con_Printf ("loading %s\n",namebuffer);
-
- data = COM_LoadFile(namebuffer, false);
+ data = FS_LoadFile(namebuffer, false);
if (!data)
{
- Con_Printf ("Couldn't load %s\n", namebuffer);
+ s->silentlymissing = !complain;
+ if (complain)
+ Con_Printf ("Couldn't load %s\n", namebuffer);
return NULL;
}
- info = GetWavinfo (s->name, data, com_filesize);
+ info = GetWavinfo (s->name, data, fs_filesize);
// LordHavoc: stereo sounds are now allowed (intended for music)
if (info.channels < 1 || info.channels > 2)
{
Mem_Free(data);
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;
+ // calculate resampled length
+ len = (int) ((double) info.samples * (double) shm->speed / (double) info.rate);
len = len * info.width * info.channels;
// FIXME: add S_UnloadSounds or something?
sc = s->sfxcache = Mem_Alloc(s->mempool, len + sizeof(sfxcache_t));
if (!sc)
{
+ Mem_FreePool(&s->mempool);
Mem_Free(data);
return NULL;
}
sc->width = info.width;
sc->stereo = info.channels == 2;
- ResampleSfx (s, sc->speed, data + info.dataofs, s->name);
+ ResampleSfx (sc, data + info.dataofs, s->name);
Mem_Free(data);
return sc;
*/
-qbyte *data_p;
-qbyte *iff_end;
-qbyte *last_chunk;
-qbyte *iff_data;
-int iff_chunk_len;
+qbyte *data_p;
+qbyte *iff_end;
+qbyte *last_chunk;
+qbyte *iff_data;
+int iff_chunk_len;
short GetLittleShort(void)
data_p = NULL;
return;
}
-
+
data_p += 4;
iff_chunk_len = GetLittleLong();
if (iff_chunk_len < 0)
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
*/
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));
if (!wav)
return 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)))
{
return info;
}
-// get "fmt " chunk
+ // get "fmt " chunk
iff_data = data_p + 12;
-// DumpChunks ();
+ //DumpChunks ();
FindChunk("fmt ");
if (!data_p)
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)
{
}
data_p += 4;
- samples = GetLittleLong () / info.width;
+ samples = GetLittleLong () / info.width / info.channels;
if (info.samples)
{
info.samples = samples;
info.dataofs = data_p - wav;
-
+
return info;
}
projects / xonotic / darkplaces.git / blobdiff