Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-// snd_mem.c: sound caching
+
#include "quakedef.h"
+#include "snd_main.h"
#include "snd_ogg.h"
#include "snd_wav.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)
+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)
{
- 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;
+ size_t srclength, outcount;
srclength = in_length * in_format->channels;
+ outcount = (int)((double)in_length * shm->format.speed / in_format->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
+ //Con_DPrintf("ResampleSfx(%s): %d samples @ %dHz -> %d samples @ %dHz\n",
+ // sfxname, in_length, in_format->speed, outcount, shm->format.speed);
- if (fracstep == 256)
+ // Trivial case (direct transfer)
+ if (in_format->speed == shm->format.speed)
{
- // 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];
+ if (in_format->width == 1)
+ {
+ size_t i;
+
+ for (i = 0; i < srclength; i++)
+ ((signed char*)out_data)[i] = in_data[i] - 128;
+ }
+ else // if (in_format->width == 2)
+ memcpy (out_data, in_data, srclength * in_format->width);
}
+
+ // 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)
else
{
- // general case
- samplefrac = 0;
- if ((fracstep & 255) == 0) // skipping points on perfect multiple
+ const unsigned int fracstep = (unsigned int)((double)in_format->speed / shm->format.speed * (1 << FRACTIONAL_BITS));
+ size_t remain_in = srclength, total_out = 0;
+ unsigned int samplefrac;
+ 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))
{
- srcsample = 0;
- fracstep >>= 8;
- if (in_format->width == 2)
+ 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
+ // also to be able to handle very long sounds.
+ while (total_out < outcount)
+ {
+ size_t tmpcount, interpolation_limit, i, j;
+ unsigned int srcsample;
+
+ samplefrac = 0;
+
+ // If more than 1 sec of sound remains to be converted
+ if (outcount - total_out > shm->format.speed)
{
- 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++ = in[srcsample ];
- *out++ = in[srcsample+1];
- srcsample += fracstep;
- }
- }
- else
- {
- for (i=0 ; i<outcount ; i++)
- {
- *out++ = in[srcsample];
- srcsample += fracstep;
- }
- }
+ tmpcount = shm->format.speed;
+ interpolation_limit = tmpcount; // all samples can be interpolated
}
else
{
- signed char *out = out_data;
- const unsigned char *in = in_data;
- if (in_format->channels == 2)
- {
- fracstep <<= 1;
- for (i=0 ; i<outcount ; i++)
- {
- *out++ = in[srcsample ] - 128;
- *out++ = in[srcsample+1] - 128;
- srcsample += fracstep;
- }
- }
- else
- {
- for (i=0 ; i<outcount ; i++)
- {
- *out++ = in[srcsample ] - 128;
- srcsample += fracstep;
- }
- }
+ tmpcount = outcount - total_out;
+ interpolation_limit = (int)ceil((double)(((remain_in / in_format->channels) - 1) << FRACTIONAL_BITS) / fracstep);
+ if (interpolation_limit > tmpcount)
+ interpolation_limit = tmpcount;
}
- }
- else
- {
- int sample;
- int a, b;
+
+ // 16 bit samples
if (in_format->width == 2)
{
- short *out = (short*)out_data;
- const short *in = (const short*)in_data;
- if (in_format->channels == 2)
+ const short* in_ptr_short;
+
+ // Interpolated part
+ for (i = 0; i < interpolation_limit; i++)
{
- for (i=0 ; i<outcount ; i++)
+ srcsample = (samplefrac >> FRACTIONAL_BITS) * in_format->channels;
+ in_ptr_short = &((const short*)in_ptr)[srcsample];
+
+ for (j = 0; j < in_format->channels; j++)
{
- srcsample = (samplefrac >> 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;
+ int a, b;
+
+ a = *in_ptr_short;
+ b = *(in_ptr_short + in_format->channels);
+ *((short*)out_ptr) = (((b - a) * (samplefrac & FRACTIONAL_MASK)) >> FRACTIONAL_BITS) + a;
+
+ in_ptr_short++;
+ out_ptr += sizeof (short);
}
+
+ samplefrac += fracstep;
}
- else
+
+ // Non-interpolated part
+ for (/* nothing */; i < tmpcount; i++)
{
- for (i=0 ; i<outcount ; i++)
+ srcsample = (samplefrac >> FRACTIONAL_BITS) * in_format->channels;
+ in_ptr_short = &((const short*)in_ptr)[srcsample];
+
+ for (j = 0; j < in_format->channels; j++)
{
- srcsample = samplefrac >> 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;
+ *((short*)out_ptr) = *in_ptr_short;
+
+ in_ptr_short++;
+ out_ptr += sizeof (short);
}
+
+ samplefrac += fracstep;
}
}
- else
+ // 8 bit samples
+ else // if (in_format->width == 1)
{
- signed char *out = out_data;
- const unsigned char *in = in_data;
- if (in_format->channels == 2)
+ const unsigned char* in_ptr_byte;
+
+ // Convert up to 1 sec of sound
+ for (i = 0; i < interpolation_limit; i++)
{
- for (i=0 ; i<outcount ; i++)
+ srcsample = (samplefrac >> FRACTIONAL_BITS) * in_format->channels;
+ in_ptr_byte = &((const unsigned char*)in_ptr)[srcsample];
+
+ for (j = 0; j < in_format->channels; j++)
{
- srcsample = (samplefrac >> 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;
+ int a, b;
+
+ a = *in_ptr_byte - 128;
+ b = *(in_ptr_byte + in_format->channels) - 128;
+ *((signed char*)out_ptr) = (((b - a) * (samplefrac & FRACTIONAL_MASK)) >> FRACTIONAL_BITS) + a;
+
+ in_ptr_byte++;
+ out_ptr += sizeof (signed char);
}
+
+ samplefrac += fracstep;
}
- else
+
+ // Non-interpolated part
+ for (/* nothing */; i < tmpcount; i++)
{
- for (i=0 ; i<outcount ; i++)
+ srcsample = (samplefrac >> FRACTIONAL_BITS) * in_format->channels;
+ in_ptr_byte = &((const unsigned char*)in_ptr)[srcsample];
+
+ for (j = 0; j < in_format->channels; j++)
{
- srcsample = samplefrac >> 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;
+ *((signed char*)out_ptr) = *in_ptr_byte - 128;
+
+ in_ptr_byte++;
+ out_ptr += sizeof (signed char);
}
+
+ samplefrac += fracstep;
}
}
+
+ // Update the counters and the buffer position
+ remain_in -= in_format->speed * in_format->channels;
+ in_ptr += in_format->speed * in_format->channels * in_format->width;
+ total_out += tmpcount;
}
}
*/
qboolean S_LoadSound (sfx_t *s, qboolean 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 we weren't able to load it previously, no need to retry
+ if (s->flags & SFXFLAG_FILEMISSING)
+ return false;
+
+ // See if in memory
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;
}
- len = strlcpy (namebuffer, s->name, sizeof (namebuffer));
- if (len >= sizeof (namebuffer))
- return false;
+ // LordHavoc: if the sound filename does not begin with sound/, try adding it
+ if (strncasecmp(s->name, "sound/", 6))
+ {
+ len = dpsnprintf (namebuffer, sizeof(namebuffer), "sound/%s", s->name);
+ if (len < 0)
+ {
+ // name too long
+ Con_Printf("S_LoadSound: name \"%s\" is too long\n", s->name);
+ return false;
+ }
+ if (S_LoadWavFile (namebuffer, s))
+ return true;
+ if (len >= 4 && !strcasecmp (namebuffer + len - 4, ".wav"))
+ strcpy (namebuffer + len - 3, "ogg");
+ if (OGG_LoadVorbisFile (namebuffer, s))
+ return true;
+ }
- // Try to load it as a WAV file
+ // LordHavoc: then try without the added sound/ as wav and ogg
+ len = dpsnprintf (namebuffer, sizeof(namebuffer), "%s", s->name);
+ if (len < 0)
+ {
+ // name too long
+ Con_Printf("S_LoadSound: name \"%s\" is too long\n", s->name);
+ return false;
+ }
if (S_LoadWavFile (namebuffer, s))
return true;
-
- // Else, try to load it as an Ogg Vorbis file
- if (!strcasecmp (namebuffer + len - 4, ".wav"))
- {
+ if (len >= 4 && !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;
+ s->flags |= SFXFLAG_FILEMISSING;
if (complain)
- {
- if (modified_name)
- strcpy (namebuffer + len - 3, "wav");
- Con_Printf("Couldn't load %s\n", namebuffer);
- }
+ 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;
-
- 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;
- }
-}