smoke trails no longer rise (but you could hardly tell anyway, due to their short...

[xonotic/darkplaces.git] / snd_mem.c

diff --git a/snd_mem.c b/snd_mem.c
index 5ddef73217335bb7548cdf80c78ecdf2b58498a8..278d2eb4f78b79e097fb58e76b73fa21d908dd08 100644 (file)
--- a/snd_mem.c
+++ b/snd_mem.c
@@ -30,13 +30,13 @@ byte *S_Alloc (int size);
 ResampleSfx
 ================
 */
-void ResampleSfx (sfx_t *sfx, int inrate, int inwidth, byte *data)
+void ResampleSfx (sfx_t *sfx, int inrate, byte *data)
 {
        int             outcount;
        int             srcsample;
        float   stepscale;
        int             i;
-       int             sample, samplefrac, fracstep;
+       int             samplefrac, fracstep;
        sfxcache_t      *sc;
        
        sc = Cache_Check (&sfx->cache);
@@ -51,15 +51,15 @@ void ResampleSfx (sfx_t *sfx, int inrate, int inwidth, byte *data)
                sc->loopstart = sc->loopstart / stepscale;
 
        sc->speed = shm->speed;
-       if (loadas8bit.value)
-               sc->width = 1;
-       else
-               sc->width = inwidth;
+//     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)
+       if (stepscale == 1/* && inwidth == 1*/ && sc->width == 1)
        {
 // fast special case
                // LordHavoc: I do not serve the readability gods...
@@ -88,54 +88,124 @@ void ResampleSfx (sfx_t *sfx, int inrate, int inwidth, byte *data)
                }
                */
        }
+       else if (stepscale == 1/* && inwidth == 2*/ && sc->width == 2) // LordHavoc: quick case for 16bit
+       {
+               if (sc->stereo) // LordHavoc: stereo sound support
+                       for (i=0 ; i<outcount*2 ;i++)
+                               ((short *)sc->data)[i] = LittleShort (((short *)data)[i]);
+               else
+                       for (i=0 ; i<outcount ;i++)
+                               ((short *)sc->data)[i] = LittleShort (((short *)data)[i]);
+       }
        else
        {
 // general case
                Con_DPrintf("ResampleSfx: resampling sound %s\n", sfx->name);
                samplefrac = 0;
                fracstep = stepscale*256;
-               if (sc->stereo) // LordHavoc: stereo sound support
+               if ((fracstep & 255) == 0) // skipping points on perfect multiple
                {
-                       for (i=0 ; i<outcount ; i+=2)
+                       srcsample = 0;
+                       fracstep >>= 8;
+                       if (sc->width == 2)
                        {
-                               srcsample = samplefrac >> 8;
-                               samplefrac += fracstep;
-                               srcsample <<= 1;
-                               // left
-                               if (inwidth == 2)
-                                       sample = LittleShort ( ((short *)data)[srcsample] );
-                               else
-                                       sample = (int)( (unsigned char)(data[srcsample]) - 128) << 8;
-                               if (sc->width == 2)
-                                       ((short *)sc->data)[i] = sample;
+                               short *out = (void *)sc->data, *in = (void *)data;
+                               if (sc->stereo) // LordHavoc: stereo sound support
+                               {
+                                       fracstep <<= 1;
+                                       for (i=0 ; i<outcount ;)
+                                       {
+                                               *out++ = (short) LittleShort (in[srcsample  ]);
+                                               *out++ = (short) LittleShort (in[srcsample+1]);
+                                               srcsample += fracstep;
+                                       }
+                               }
                                else
-                                       ((signed char *)sc->data)[i] = sample >> 8;
-                               // right
-                               srcsample++;
-                               if (inwidth == 2)
-                                       sample = LittleShort ( ((short *)data)[srcsample] );
-                               else
-                                       sample = (int)( (unsigned char)(data[srcsample]) - 128) << 8;
-                               if (sc->width == 2)
-                                       ((short *)sc->data)[i+1] = sample;
+                               {
+                                       for (i=0 ; i<outcount ; i++)
+                                       {
+                                               *out++ = (short) LittleShort (in[srcsample  ]);
+                                               srcsample += fracstep;
+                                       }
+                               }
+                       }
+                       else
+                       {
+                               signed char *out = (void *)sc->data, *in = (void *)data;
+                               if (sc->stereo) // LordHavoc: stereo sound support
+                               {
+                                       fracstep <<= 1;
+                                       for (i=0 ; i<outcount ;)
+                                       {
+                                               *out++ = (signed char) in[srcsample  ] - 128;
+                                               *out++ = (signed char) in[srcsample+1] - 128;
+                                               srcsample += fracstep;
+                                       }
+                               }
                                else
-                                       ((signed char *)sc->data)[i+1] = sample >> 8;
+                               {
+                                       for (i=0 ; i<outcount ; i++)
+                                       {
+                                               *out++ = (signed char) in[srcsample  ] - 128;
+                                               srcsample += fracstep;
+                                       }
+                               }
                        }
                }
                else
                {
-                       for (i=0 ; i<outcount ; i++)
+                       int sample;
+                       if (sc->width == 2)
                        {
-                               srcsample = samplefrac >> 8;
-                               samplefrac += fracstep;
-                               if (inwidth == 2)
-                                       sample = LittleShort ( ((short *)data)[srcsample] );
+                               short *out = (void *)sc->data, *in = (void *)data;
+                               if (sc->stereo) // LordHavoc: stereo sound support
+                               {
+                                       for (i=0 ; i<outcount ;)
+                                       {
+                                               srcsample = (samplefrac >> 7) & ~1;
+                                               samplefrac += fracstep;
+                                               sample = (LittleShort (in[srcsample  ]) * (256 - (samplefrac & 255)) + LittleShort (in[srcsample+2]) * (samplefrac & 255)) >> 8;
+                                               *out++ = (short) sample;
+                                               sample = (LittleShort (in[srcsample+1]) * (256 - (samplefrac & 255)) + LittleShort (in[srcsample+3]) * (samplefrac & 255)) >> 8;
+                                               *out++ = (short) sample;
+                                       }
+                               }
                                else
-                                       sample = (int)( (unsigned char)(data[srcsample]) - 128) << 8;
-                               if (sc->width == 2)
-                                       ((short *)sc->data)[i] = sample;
+                               {
+                                       for (i=0 ; i<outcount ; i++)
+                                       {
+                                               srcsample = samplefrac >> 8;
+                                               samplefrac += fracstep;
+                                               sample = (LittleShort (in[srcsample  ]) * (256 - (samplefrac & 255)) + LittleShort (in[srcsample+1]) * (samplefrac & 255)) >> 8;
+                                               *out++ = (short) sample;
+                                       }
+                               }
+                       }
+                       else
+                       {
+                               signed char *out = (void *)sc->data, *in = (void *)data;
+                               if (sc->stereo) // LordHavoc: stereo sound support
+                               {
+                                       for (i=0 ; i<outcount ;)
+                                       {
+                                               srcsample = (samplefrac >> 7) & ~1;
+                                               samplefrac += fracstep;
+                                               sample = ((((unsigned char) in[srcsample  ] - 128) * (256 - (samplefrac & 255))) + (((unsigned char) in[srcsample+2] - 128) * (samplefrac & 255))) >> 8;
+                                               *out++ = (signed char) sample;
+                                               sample = ((((unsigned char) in[srcsample+1] - 128) * (256 - (samplefrac & 255))) + (((unsigned char) in[srcsample+3] - 128) * (samplefrac & 255))) >> 8;
+                                               *out++ = (signed char) sample;
+                                       }
+                               }
                                else
-                                       ((signed char *)sc->data)[i] = sample >> 8;
+                               {
+                                       for (i=0 ; i<outcount ; i++)
+                                       {
+                                               srcsample = samplefrac >> 8;
+                                               samplefrac += fracstep;
+                                               sample = ((((unsigned char) in[srcsample  ] - 128) * (256 - (samplefrac & 255))) + (((unsigned char) in[srcsample+1] - 128) * (samplefrac & 255))) >> 8;
+                                               *out++ = (signed char) sample;
+                                       }
+                               }
                        }
                }
        }
@@ -208,7 +278,7 @@ sfxcache_t *S_LoadSound (sfx_t *s)
        sc->width = info.width;
        sc->stereo = info.channels == 2;
 
-       ResampleSfx (s, sc->speed, sc->width, data + info.dataofs);
+       ResampleSfx (s, sc->speed, data + info.dataofs);
 
        return sc;
 }
@@ -391,7 +461,7 @@ wavinfo_t GetWavinfo (char *name, byte *wav, int wavlength)
        if (info.samples)
        {
                if (samples < info.samples)
-                       Sys_Error ("Sound %s has a bad loop length", name);
+                       Host_Error ("Sound %s has a bad loop length", name);
        }
        else
                info.samples = samples;