ResampleSfx
================
*/
-size_t ResampleSfx (const qbyte *in_data, size_t in_length, const snd_format_t* in_format, qbyte *out_data, const char* sfxname)
+size_t ResampleSfx (const unsigned char *in_data, size_t in_length, const snd_format_t* in_format, unsigned char *out_data, const char* sfxname)
{
size_t srclength, outcount, i;
// General case (linear interpolation with a fixed-point fractional
// step, 18-bit integer part and 14-bit fractional part)
// Can handle up to 2^18 (262144) samples per second (> 96KHz stereo)
- #define FRACTIONAL_BITS 14
- #define FRACTIONAL_MASK ((1 << FRACTIONAL_BITS) - 1)
- #define INTEGER_BITS (sizeof(samplefrac)*8 - FRACTIONAL_BITS)
+# define FRACTIONAL_BITS 14
+# define FRACTIONAL_MASK ((1 << FRACTIONAL_BITS) - 1)
+# define INTEGER_BITS (sizeof(samplefrac)*8 - FRACTIONAL_BITS)
else
{
const unsigned int fracstep = (double)in_format->speed / shm->format.speed * (1 << FRACTIONAL_BITS);
size_t remain_in = srclength, total_out = 0;
unsigned int samplefrac;
- const qbyte *in_ptr = in_data;
- qbyte *out_ptr = out_data;
+ const unsigned char *in_ptr = in_data;
+ unsigned char *out_ptr = out_data;
// Check that we can handle one second of that sound
if (in_format->speed * in_format->channels > (1 << INTEGER_BITS))
- Sys_Error ("ResampleSfx: sound quality too high for resampling (%uHz, %u channel(s))",
+ {
+ Con_Printf ("ResampleSfx: sound quality too high for resampling (%uHz, %u channel(s))\n",
in_format->speed, in_format->channels);
+ return 0;
+ }
// We work 1 sec at a time to make sure we don't accumulate any
// significant error when adding "fracstep" over several seconds, and
// No more value to interpolate with?
if (srcsample + in_format->channels < remain_in)
{
- a = ((const qbyte*)in_ptr)[srcsample] - 128;
- b = ((const qbyte*)in_ptr)[srcsample + in_format->channels] - 128;
+ a = ((const unsigned char*)in_ptr)[srcsample] - 128;
+ b = ((const unsigned char*)in_ptr)[srcsample + in_format->channels] - 128;
*((signed char*)out_ptr) = (((b - a) * (samplefrac & FRACTIONAL_MASK)) >> FRACTIONAL_BITS) + a;
}
else
- *((signed char*)out_ptr) = ((const qbyte*)in_ptr)[srcsample] - 128;
+ *((signed char*)out_ptr) = ((const unsigned char*)in_ptr)[srcsample] - 128;
out_ptr += sizeof (signed char);
}
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);
+ Con_Printf ("S_LoadSound: sound %s hasn't been resampled (%uHz instead of %uHz)\n", s->name);
return true;
}
Con_Printf("S_LoadSound: Couldn't load \"%s\"\n", s->name);
return false;
}
-
-void S_UnloadSound (sfx_t *s)
-{
- if (s->fetcher != NULL)
- {
- unsigned int i;
-
- // Stop all channels that use this sound
- for (i = 0; i < total_channels ; i++)
- if (channels[i].sfx == s)
- S_StopChannel (i);
-
- s->fetcher = NULL;
- s->fetcher_data = NULL;
- Mem_FreePool(&s->mempool);
- }
-}