X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=snd_mix.c;h=10da40047ec05355f7ccf85eff87d7b1a115344f;hp=f6cd8e889aec496fe909e440e0479da639978379;hb=2075ae43356d724bae305ce8fd36ea570718b14a;hpb=49efc53510842f29eccbc160e1aa56c17e575468;ds=sidebyside diff --git a/snd_mix.c b/snd_mix.c index f6cd8e88..10da4004 100644 --- a/snd_mix.c +++ b/snd_mix.c @@ -17,240 +17,237 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// snd_mix.c -- portable code to mix sounds for snd_dma.c #include "quakedef.h" +#include "snd_main.h" -typedef struct +extern cvar_t snd_softclip; + +static portable_sampleframe_t paintbuffer[PAINTBUFFER_SIZE]; +static portable_sampleframe_t paintbuffer_unswapped[PAINTBUFFER_SIZE]; + +extern speakerlayout_t snd_speakerlayout; // for querying the listeners + +#ifdef CONFIG_VIDEO_CAPTURE +static void S_CaptureAVISound(const portable_sampleframe_t *paintbuffer, size_t length) { - int left; - int right; -} portable_samplepair_t; + size_t i; + unsigned int j; -// LordHavoc: was 512, expanded to 2048 -#define PAINTBUFFER_SIZE 2048 -portable_samplepair_t paintbuffer[PAINTBUFFER_SIZE]; -int snd_scaletable[32][256]; + if (!cls.capturevideo.active) + return; -/* -// LordHavoc: disabled this because it desyncs with the video too easily -extern cvar_t cl_avidemo; -static FILE *cl_avidemo_soundfile = NULL; -void S_CaptureAVISound(portable_samplepair_t *buf, int length) + // undo whatever swapping the channel layout (swapstereo, ALSA) did + for(j = 0; j < snd_speakerlayout.channels; ++j) + { + unsigned int j0 = snd_speakerlayout.listeners[j].channel_unswapped; + for(i = 0; i < length; ++i) + paintbuffer_unswapped[i].sample[j0] = paintbuffer[i].sample[j]; + } + + SCR_CaptureVideo_SoundFrame(paintbuffer_unswapped, length); +} +#endif + +extern cvar_t snd_softclip; + +static void S_SoftClipPaintBuffer(portable_sampleframe_t *painted_ptr, int nbframes, int width, int nchannels) { - int i, n; - qbyte out[PAINTBUFFER_SIZE * 4]; - char filename[MAX_OSPATH]; + int i; - if (cl_avidemo.value >= 0.1f) + if((snd_softclip.integer == 1 && width <= 2) || snd_softclip.integer > 1) { - if (cl_avidemo_soundfile == NULL) + portable_sampleframe_t *p = painted_ptr; + +#if 0 +/* Soft clipping, the sound of a dream, thanks to Jon Wattes + post to Musicdsp.org */ +#define SOFTCLIP(x) (x) = sin(bound(-M_PI/2, (x), M_PI/2)) * 0.25 +#endif + + // let's do a simple limiter instead, seems to sound better + static float maxvol = 0; + maxvol = max(1.0f, maxvol * (1.0f - nbframes / (0.4f * snd_renderbuffer->format.speed))); +#define SOFTCLIP(x) if(fabs(x)>maxvol) maxvol=fabs(x); (x) /= maxvol; + + if (nchannels == 8) // 7.1 surround { - cl_avidemo_soundfile = FS_Open ("dpavi.wav", "wb", false); - memset(out, 0, 44); - fwrite(out, 1, 44, cl_avidemo_soundfile); - // header will be filled out when file is closed + for (i = 0;i < nbframes;i++, p++) + { + SOFTCLIP(p->sample[0]); + SOFTCLIP(p->sample[1]); + SOFTCLIP(p->sample[2]); + SOFTCLIP(p->sample[3]); + SOFTCLIP(p->sample[4]); + SOFTCLIP(p->sample[5]); + SOFTCLIP(p->sample[6]); + SOFTCLIP(p->sample[7]); + } } - fseek(cl_avidemo_soundfile, 0, SEEK_END); - // write the sound buffer as little endian 16bit interleaved stereo - for(i = 0;i < length;i++) + else if (nchannels == 6) // 5.1 surround { - n = buf[i].left >> 2; // quiet enough to prevent clipping most of the time - n = bound(-32768, n, 32767); - out[i*4+0] = n & 0xFF; - out[i*4+1] = (n >> 8) & 0xFF; - n = buf[i].right >> 2; // quiet enough to prevent clipping most of the time - n = bound(-32768, n, 32767); - out[i*4+2] = n & 0xFF; - out[i*4+3] = (n >> 8) & 0xFF; + for (i = 0; i < nbframes; i++, p++) + { + SOFTCLIP(p->sample[0]); + SOFTCLIP(p->sample[1]); + SOFTCLIP(p->sample[2]); + SOFTCLIP(p->sample[3]); + SOFTCLIP(p->sample[4]); + SOFTCLIP(p->sample[5]); + } } - if (fwrite(out, 4, length, cl_avidemo_soundfile) < length) + else if (nchannels == 4) // 4.0 surround { - Cvar_SetValueQuick(&cl_avidemo, 0); - Con_Print("avi saving sound failed, out of disk space? stopping avi demo capture.\n"); + for (i = 0; i < nbframes; i++, p++) + { + SOFTCLIP(p->sample[0]); + SOFTCLIP(p->sample[1]); + SOFTCLIP(p->sample[2]); + SOFTCLIP(p->sample[3]); + } } - } - else if (cl_avidemo_soundfile) - { - // file has not been closed yet, close it - fseek(cl_avidemo_soundfile, 0, SEEK_END); - i = ftell(cl_avidemo_soundfile); - - //"RIFF", (int) unknown (chunk size), "WAVE", - //"fmt ", (int) 16 (chunk size), (short) format 1 (uncompressed PCM), (short) 2 channels, (int) unknown rate, (int) unknown bytes per second, (short) 4 bytes per sample (channels * bytes per channel), (short) 16 bits per channel - //"data", (int) unknown (chunk size) - memcpy(out, "RIFF****WAVEfmt \x10\x00\x00\x00\x01\x00\x02\x00********\x04\x00\x10\x00data****", 44); - // the length of the whole RIFF chunk - n = i - 8; - out[4] = (n) & 0xFF; - out[5] = (n >> 8) & 0xFF; - out[6] = (n >> 16) & 0xFF; - out[7] = (n >> 24) & 0xFF; - // rate - n = shm->speed; - out[24] = (n) & 0xFF; - out[25] = (n >> 8) & 0xFF; - out[26] = (n >> 16) & 0xFF; - out[27] = (n >> 24) & 0xFF; - // bytes per second (rate * channels * bytes per channel) - n = shm->speed * 4; - out[28] = (n) & 0xFF; - out[29] = (n >> 8) & 0xFF; - out[30] = (n >> 16) & 0xFF; - out[31] = (n >> 24) & 0xFF; - // the length of the data chunk - n = i - 44; - out[40] = (n) & 0xFF; - out[41] = (n >> 8) & 0xFF; - out[42] = (n >> 16) & 0xFF; - out[43] = (n >> 24) & 0xFF; - - fseek(cl_avidemo_soundfile, 0, SEEK_SET); - fwrite(out, 1, 44, cl_avidemo_soundfile); - fclose(cl_avidemo_soundfile); - cl_avidemo_soundfile = NULL; + else if (nchannels == 2) // 2.0 stereo + { + for (i = 0; i < nbframes; i++, p++) + { + SOFTCLIP(p->sample[0]); + SOFTCLIP(p->sample[1]); + } + } + else if (nchannels == 1) // 1.0 mono + { + for (i = 0; i < nbframes; i++, p++) + { + SOFTCLIP(p->sample[0]); + } + } +#undef SOFTCLIP } } -*/ -void S_TransferPaintBuffer(int endtime) +static void S_ConvertPaintBuffer(portable_sampleframe_t *painted_ptr, void *rb_ptr, int nbframes, int width, int nchannels) { - void *pbuf; - if ((pbuf = S_LockBuffer())) + int i, val; + + // FIXME: add 24bit and 32bit float formats + // FIXME: optimize with SSE intrinsics? + if (width == 2) // 16bit { - int i; - int *snd_p; - int snd_vol; - int lpaintedtime; - int snd_linear_count; - int val; - snd_p = (int *) paintbuffer; - snd_vol = volume.value*256; - lpaintedtime = paintedtime; - if (shm->format.width == 2) + short *snd_out = (short*)rb_ptr; + if (nchannels == 8) // 7.1 surround { - // 16bit - short *snd_out; - if (shm->format.channels == 2) + for (i = 0;i < nbframes;i++, painted_ptr++) { - // 16bit 2 channels (stereo) - while (lpaintedtime < endtime) - { - // handle recirculating buffer issues - i = lpaintedtime & ((shm->samples >> 1) - 1); - snd_out = (short *) pbuf + (i << 1); - snd_linear_count = (shm->samples >> 1) - i; - if (snd_linear_count > endtime - lpaintedtime) - snd_linear_count = endtime - lpaintedtime; - snd_linear_count <<= 1; - if (snd_swapstereo.value) - { - for (i = 0;i < snd_linear_count;i += 2) - { - val = (snd_p[i + 1] * snd_vol) >> 8; - snd_out[i ] = bound(-32768, val, 32767); - val = (snd_p[i ] * snd_vol) >> 8; - snd_out[i + 1] = bound(-32768, val, 32767); - } - } - else - { - for (i = 0;i < snd_linear_count;i += 2) - { - val = (snd_p[i ] * snd_vol) >> 8; - snd_out[i ] = bound(-32768, val, 32767); - val = (snd_p[i + 1] * snd_vol) >> 8; - snd_out[i + 1] = bound(-32768, val, 32767); - } - } - snd_p += snd_linear_count; - lpaintedtime += (snd_linear_count >> 1); - } + val = (int)(painted_ptr->sample[0] * 32768.0f);*snd_out++ = bound(-32768, val, 32767); + val = (int)(painted_ptr->sample[1] * 32768.0f);*snd_out++ = bound(-32768, val, 32767); + val = (int)(painted_ptr->sample[2] * 32768.0f);*snd_out++ = bound(-32768, val, 32767); + val = (int)(painted_ptr->sample[3] * 32768.0f);*snd_out++ = bound(-32768, val, 32767); + val = (int)(painted_ptr->sample[4] * 32768.0f);*snd_out++ = bound(-32768, val, 32767); + val = (int)(painted_ptr->sample[5] * 32768.0f);*snd_out++ = bound(-32768, val, 32767); + val = (int)(painted_ptr->sample[6] * 32768.0f);*snd_out++ = bound(-32768, val, 32767); + val = (int)(painted_ptr->sample[7] * 32768.0f);*snd_out++ = bound(-32768, val, 32767); } - else + } + else if (nchannels == 6) // 5.1 surround + { + for (i = 0; i < nbframes; i++, painted_ptr++) { - // 16bit 1 channel (mono) - while (lpaintedtime < endtime) - { - // handle recirculating buffer issues - i = lpaintedtime & (shm->samples - 1); - snd_out = (short *) pbuf + i; - snd_linear_count = shm->samples - i; - if (snd_linear_count > endtime - lpaintedtime) - snd_linear_count = endtime - lpaintedtime; - for (i = 0;i < snd_linear_count;i++) - { - val = ((snd_p[i * 2 + 0] + snd_p[i * 2 + 1]) * snd_vol) >> 9; - snd_out[i] = bound(-32768, val, 32767); - } - snd_p += snd_linear_count << 1; - lpaintedtime += snd_linear_count; - } + val = (int)(painted_ptr->sample[0] * 32768.0f);*snd_out++ = bound(-32768, val, 32767); + val = (int)(painted_ptr->sample[1] * 32768.0f);*snd_out++ = bound(-32768, val, 32767); + val = (int)(painted_ptr->sample[2] * 32768.0f);*snd_out++ = bound(-32768, val, 32767); + val = (int)(painted_ptr->sample[3] * 32768.0f);*snd_out++ = bound(-32768, val, 32767); + val = (int)(painted_ptr->sample[4] * 32768.0f);*snd_out++ = bound(-32768, val, 32767); + val = (int)(painted_ptr->sample[5] * 32768.0f);*snd_out++ = bound(-32768, val, 32767); } } - else + else if (nchannels == 4) // 4.0 surround { - // 8bit - unsigned char *snd_out; - if (shm->format.channels == 2) + for (i = 0; i < nbframes; i++, painted_ptr++) { - // 8bit 2 channels (stereo) - while (lpaintedtime < endtime) - { - // handle recirculating buffer issues - i = lpaintedtime & ((shm->samples >> 1) - 1); - snd_out = (unsigned char *) pbuf + (i << 1); - snd_linear_count = (shm->samples >> 1) - i; - if (snd_linear_count > endtime - lpaintedtime) - snd_linear_count = endtime - lpaintedtime; - snd_linear_count <<= 1; - if (snd_swapstereo.value) - { - for (i = 0;i < snd_linear_count;i += 2) - { - val = ((snd_p[i + 1] * snd_vol) >> 16) + 128; - snd_out[i ] = bound(0, val, 255); - val = ((snd_p[i ] * snd_vol) >> 16) + 128; - snd_out[i + 1] = bound(0, val, 255); - } - } - else - { - for (i = 0;i < snd_linear_count;i += 2) - { - val = ((snd_p[i ] * snd_vol) >> 16) + 128; - snd_out[i ] = bound(0, val, 255); - val = ((snd_p[i + 1] * snd_vol) >> 16) + 128; - snd_out[i + 1] = bound(0, val, 255); - } - } - snd_p += snd_linear_count; - lpaintedtime += (snd_linear_count >> 1); - } + val = (int)(painted_ptr->sample[0] * 32768.0f);*snd_out++ = bound(-32768, val, 32767); + val = (int)(painted_ptr->sample[1] * 32768.0f);*snd_out++ = bound(-32768, val, 32767); + val = (int)(painted_ptr->sample[2] * 32768.0f);*snd_out++ = bound(-32768, val, 32767); + val = (int)(painted_ptr->sample[3] * 32768.0f);*snd_out++ = bound(-32768, val, 32767); } - else + } + else if (nchannels == 2) // 2.0 stereo + { + for (i = 0; i < nbframes; i++, painted_ptr++) { - // 8bit 1 channel (mono) - while (lpaintedtime < endtime) - { - // handle recirculating buffer issues - i = lpaintedtime & (shm->samples - 1); - snd_out = (unsigned char *) pbuf + i; - snd_linear_count = shm->samples - i; - if (snd_linear_count > endtime - lpaintedtime) - snd_linear_count = endtime - lpaintedtime; - for (i = 0;i < snd_linear_count;i++) - { - val = (((snd_p[i * 2] + snd_p[i * 2 + 1]) * snd_vol) >> 17) + 128; - snd_out[i ] = bound(0, val, 255); - } - snd_p += snd_linear_count << 1; - lpaintedtime += snd_linear_count; - } + val = (int)(painted_ptr->sample[0] * 32768.0f);*snd_out++ = bound(-32768, val, 32767); + val = (int)(painted_ptr->sample[1] * 32768.0f);*snd_out++ = bound(-32768, val, 32767); + } + } + else if (nchannels == 1) // 1.0 mono + { + for (i = 0; i < nbframes; i++, painted_ptr++) + { + val = (int)((painted_ptr->sample[0] + painted_ptr->sample[1]) * 16384.0f);*snd_out++ = bound(-32768, val, 32767); } } - S_UnlockBuffer(); + // noise is really really annoying + if (cls.timedemo) + memset(rb_ptr, 0, nbframes * nchannels * width); + } + else // 8bit + { + unsigned char *snd_out = (unsigned char*)rb_ptr; + if (nchannels == 8) // 7.1 surround + { + for (i = 0; i < nbframes; i++, painted_ptr++) + { + val = (int)(painted_ptr->sample[0] * 128.0f) + 128; *snd_out++ = bound(0, val, 255); + val = (int)(painted_ptr->sample[1] * 128.0f) + 128; *snd_out++ = bound(0, val, 255); + val = (int)(painted_ptr->sample[2] * 128.0f) + 128; *snd_out++ = bound(0, val, 255); + val = (int)(painted_ptr->sample[3] * 128.0f) + 128; *snd_out++ = bound(0, val, 255); + val = (int)(painted_ptr->sample[4] * 128.0f) + 128; *snd_out++ = bound(0, val, 255); + val = (int)(painted_ptr->sample[5] * 128.0f) + 128; *snd_out++ = bound(0, val, 255); + val = (int)(painted_ptr->sample[6] * 128.0f) + 128; *snd_out++ = bound(0, val, 255); + val = (int)(painted_ptr->sample[7] * 128.0f) + 128; *snd_out++ = bound(0, val, 255); + } + } + else if (nchannels == 6) // 5.1 surround + { + for (i = 0; i < nbframes; i++, painted_ptr++) + { + val = (int)(painted_ptr->sample[0] * 128.0f) + 128; *snd_out++ = bound(0, val, 255); + val = (int)(painted_ptr->sample[1] * 128.0f) + 128; *snd_out++ = bound(0, val, 255); + val = (int)(painted_ptr->sample[2] * 128.0f) + 128; *snd_out++ = bound(0, val, 255); + val = (int)(painted_ptr->sample[3] * 128.0f) + 128; *snd_out++ = bound(0, val, 255); + val = (int)(painted_ptr->sample[4] * 128.0f) + 128; *snd_out++ = bound(0, val, 255); + val = (int)(painted_ptr->sample[5] * 128.0f) + 128; *snd_out++ = bound(0, val, 255); + } + } + else if (nchannels == 4) // 4.0 surround + { + for (i = 0; i < nbframes; i++, painted_ptr++) + { + val = (int)(painted_ptr->sample[0] * 128.0f) + 128; *snd_out++ = bound(0, val, 255); + val = (int)(painted_ptr->sample[1] * 128.0f) + 128; *snd_out++ = bound(0, val, 255); + val = (int)(painted_ptr->sample[2] * 128.0f) + 128; *snd_out++ = bound(0, val, 255); + val = (int)(painted_ptr->sample[3] * 128.0f) + 128; *snd_out++ = bound(0, val, 255); + } + } + else if (nchannels == 2) // 2.0 stereo + { + for (i = 0; i < nbframes; i++, painted_ptr++) + { + val = (int)(painted_ptr->sample[0] * 128.0f) + 128; *snd_out++ = bound(0, val, 255); + val = (int)(painted_ptr->sample[1] * 128.0f) + 128; *snd_out++ = bound(0, val, 255); + } + } + else if (nchannels == 1) // 1.0 mono + { + for (i = 0;i < nbframes;i++, painted_ptr++) + { + val = (int)((painted_ptr->sample[0] + painted_ptr->sample[1]) * 64.0f) + 128; *snd_out++ = bound(0, val, 255); + } + } + + // noise is really really annoying + if (cls.timedemo) + memset(rb_ptr, 128, nbframes * nchannels); } } @@ -263,213 +260,277 @@ CHANNEL MIXING =============================================================================== */ -qboolean SND_PaintChannelFrom8 (channel_t *ch, int endtime); -qboolean SND_PaintChannelFrom16 (channel_t *ch, int endtime); - -void S_PaintChannels(int endtime) +void S_MixToBuffer(void *stream, unsigned int bufferframes) { - unsigned int i; - int end; + int channelindex; channel_t *ch; + int totalmixframes; + unsigned char *outbytes = (unsigned char *) stream; sfx_t *sfx; - int ltime, count; - - while (paintedtime < endtime) + portable_sampleframe_t *paint; + int wantframes; + int i; + int count; + int fetched; + int fetch; + int istartframe; + int iendframe; + int ilengthframes; + int totallength; + int loopstart; + int indexfrac; + int indexfracstep; +#define S_FETCHBUFFERSIZE 4096 + float fetchsampleframes[S_FETCHBUFFERSIZE*2]; + const float *fetchsampleframe; + float vol[SND_LISTENERS]; + float lerp[2]; + float sample[3]; + double posd; + double speedd; + float maxvol; + qboolean looping; + qboolean silent; + + // mix as many times as needed to fill the requested buffer + while (bufferframes) { - // if paintbuffer is smaller than DMA buffer - end = endtime; - if (endtime - paintedtime > PAINTBUFFER_SIZE) - end = paintedtime + PAINTBUFFER_SIZE; + // limit to the size of the paint buffer + totalmixframes = min(bufferframes, PAINTBUFFER_SIZE); - // clear the paint buffer, filling it with data from rawsamples (music/video/whatever) - S_RawSamples_Dequeue(&paintbuffer->left, end - paintedtime); + // clear the paint buffer + memset(paintbuffer, 0, totalmixframes * sizeof(paintbuffer[0])); // paint in the channels. - ch = channels; - for (i=0; isfx; - if (!sfx) - continue; - if (!ch->leftvol && !ch->rightvol) + if (sfx == NULL) continue; if (!S_LoadSound (sfx, true)) continue; + if (ch->flags & CHANNELFLAG_PAUSED) + continue; + if (!sfx->total_length) + continue; - // if the sound hasn't been painted last time, update his position - if (ch->lastptime < paintedtime) + // copy the channel information to the stack for reference, otherwise the + // values might change during a mix if the spatializer is updating them + // (note: this still may get some old and some new values!) + posd = ch->position; + speedd = ch->mixspeed * sfx->format.speed / snd_renderbuffer->format.speed; + for (i = 0;i < SND_LISTENERS;i++) + vol[i] = ch->volume[i]; + + // check total volume level, because we can skip some code on silent sounds but other code must still run (position updates mainly) + maxvol = 0; + for (i = 0;i < SND_LISTENERS;i++) + if(vol[i] > maxvol) + maxvol = vol[i]; + switch(snd_renderbuffer->format.width) { - ch->pos += paintedtime - ch->lastptime; - - // If the sound should have ended by then - if ((unsigned int)ch->pos > sfx->total_length) - { - int loopstart; - - if (ch->flags & CHANNELFLAG_FORCELOOP) - loopstart = 0; - else - loopstart = -1; - if (sfx->loopstart >= 0) - loopstart = sfx->loopstart; - - // If the sound is looped - if (loopstart >= 0) - ch->pos = (ch->pos - sfx->total_length) % (sfx->total_length - loopstart) + loopstart; - else - ch->pos = sfx->total_length; - ch->end = paintedtime + sfx->total_length - ch->pos; - } + case 1: // 8bpp + silent = maxvol < (1.0f / (256.0f)); + // so silent it has zero effect + break; + case 2: // 16bpp + silent = maxvol < (1.0f / (65536.0f)); + // so silent it has zero effect + break; + default: // floating point + silent = maxvol < 1.0e-13f; + // 130 dB is difference between hearing + // threshold and a jackhammer from + // working distance. + // therefore, anyone who turns up + // volume so much they notice this + // cutoff, likely already has their + // ear-drums blown out anyway. + break; } - ltime = paintedtime; - while (ltime < end) - { - qboolean stop_paint; + // when doing prologic mixing, some channels invert one side + if (ch->prologic_invert == -1) + vol[1] *= -1.0f; - // paint up to end - if (ch->end < end) - count = ch->end - ltime; - else - count = end - ltime; + // get some sfx info in a consistent form + totallength = sfx->total_length; + loopstart = (int)sfx->loopstart < totallength ? (int)sfx->loopstart : ((ch->flags & CHANNELFLAG_FORCELOOP) ? 0 : totallength); + looping = loopstart < totallength; - if (count > 0) + // do the actual paint now (may skip work if silent) + paint = paintbuffer; + istartframe = 0; + for (wantframes = totalmixframes;wantframes > 0;posd += count * speedd, wantframes -= count) + { + // check if this is a delayed sound + if (posd < 0) { - if (sfx->format.width == 1) - stop_paint = !SND_PaintChannelFrom8(ch, count); - else - stop_paint = !SND_PaintChannelFrom16(ch, count); + // for a delayed sound we have to eat into the delay first + count = (int)floor(-posd / speedd) + 1; + count = bound(1, count, wantframes); + // let the for loop iterator apply the skip + continue; + } - if (!stop_paint) - { - ltime += count; - ch->lastptime = ltime; - } + // compute a fetch size that won't overflow our buffer + count = wantframes; + for (;;) + { + istartframe = (int)floor(posd); + iendframe = (int)floor(posd + (count-1) * speedd); + ilengthframes = count > 1 ? (iendframe - istartframe + 2) : 2; + if (ilengthframes <= S_FETCHBUFFERSIZE) + break; + // reduce count by 25% and try again + count -= count >> 2; } - else - stop_paint = false; - if (ltime >= ch->end) + // zero whole fetch buffer for safety + // (floating point noise from uninitialized memory = HORRIBLE) + // otherwise we would only need to clear the excess + if (!silent) + memset(fetchsampleframes, 0, ilengthframes*sfx->format.channels*sizeof(fetchsampleframes[0])); + + // if looping, do multiple fetches + fetched = 0; + for (;;) { - // if at end of loop, restart - if ((sfx->loopstart >= 0 || (ch->flags & CHANNELFLAG_FORCELOOP)) && !stop_paint) + fetch = min(ilengthframes - fetched, totallength - istartframe); + if (fetch > 0) + { + if (!silent) + sfx->fetcher->getsamplesfloat(ch, sfx, istartframe, fetch, fetchsampleframes + fetched*sfx->format.channels); + istartframe += fetch; + fetched += fetch; + } + if (istartframe == totallength && looping && fetched < ilengthframes) { - ch->pos = bound(0, sfx->loopstart, (int)sfx->total_length - 1); - ch->end = ltime + sfx->total_length - ch->pos; + // loop and fetch some more + posd += loopstart - totallength; + istartframe = loopstart; } - // channel just stopped else - stop_paint = true; + { + break; + } } - if (stop_paint) + // set up our fixedpoint resampling variables (float to int conversions are expensive so do not do one per sampleframe) + fetchsampleframe = fetchsampleframes; + indexfrac = (int)floor((posd - floor(posd)) * 65536.0); + indexfracstep = (int)floor(speedd * 65536.0); + if (!silent) { - if (ch->sfx->fetcher->end != NULL) - ch->sfx->fetcher->end (ch); - ch->sfx = NULL; - break; + if (sfx->format.channels == 2) + { + // music is stereo +#if SND_LISTENERS != 8 +#error the following code only supports up to 8 channels, update it +#endif + if (snd_speakerlayout.channels > 2) + { + // surround mixing + for (i = 0;i < count;i++, paint++) + { + lerp[1] = indexfrac * (1.0f / 65536.0f); + lerp[0] = 1.0f - lerp[1]; + sample[0] = fetchsampleframe[0] * lerp[0] + fetchsampleframe[2] * lerp[1]; + sample[1] = fetchsampleframe[1] * lerp[0] + fetchsampleframe[3] * lerp[1]; + sample[2] = (sample[0] + sample[1]) * 0.5f; + paint->sample[0] += sample[0] * vol[0]; + paint->sample[1] += sample[1] * vol[1]; + paint->sample[2] += sample[0] * vol[2]; + paint->sample[3] += sample[1] * vol[3]; + paint->sample[4] += sample[2] * vol[4]; + paint->sample[5] += sample[2] * vol[5]; + paint->sample[6] += sample[0] * vol[6]; + paint->sample[7] += sample[1] * vol[7]; + indexfrac += indexfracstep; + fetchsampleframe += 2 * (indexfrac >> 16); + indexfrac &= 0xFFFF; + } + } + else + { + // stereo mixing + for (i = 0;i < count;i++, paint++) + { + lerp[1] = indexfrac * (1.0f / 65536.0f); + lerp[0] = 1.0f - lerp[1]; + sample[0] = fetchsampleframe[0] * lerp[0] + fetchsampleframe[2] * lerp[1]; + sample[1] = fetchsampleframe[1] * lerp[0] + fetchsampleframe[3] * lerp[1]; + paint->sample[0] += sample[0] * vol[0]; + paint->sample[1] += sample[1] * vol[1]; + indexfrac += indexfracstep; + fetchsampleframe += 2 * (indexfrac >> 16); + indexfrac &= 0xFFFF; + } + } + } + else if (sfx->format.channels == 1) + { + // most sounds are mono +#if SND_LISTENERS != 8 +#error the following code only supports up to 8 channels, update it +#endif + if (snd_speakerlayout.channels > 2) + { + // surround mixing + for (i = 0;i < count;i++, paint++) + { + lerp[1] = indexfrac * (1.0f / 65536.0f); + lerp[0] = 1.0f - lerp[1]; + sample[0] = fetchsampleframe[0] * lerp[0] + fetchsampleframe[1] * lerp[1]; + paint->sample[0] += sample[0] * vol[0]; + paint->sample[1] += sample[0] * vol[1]; + paint->sample[2] += sample[0] * vol[2]; + paint->sample[3] += sample[0] * vol[3]; + paint->sample[4] += sample[0] * vol[4]; + paint->sample[5] += sample[0] * vol[5]; + paint->sample[6] += sample[0] * vol[6]; + paint->sample[7] += sample[0] * vol[7]; + indexfrac += indexfracstep; + fetchsampleframe += (indexfrac >> 16); + indexfrac &= 0xFFFF; + } + } + else + { + // stereo mixing + for (i = 0;i < count;i++, paint++) + { + lerp[1] = indexfrac * (1.0f / 65536.0f); + lerp[0] = 1.0f - lerp[1]; + sample[0] = fetchsampleframe[0] * lerp[0] + fetchsampleframe[1] * lerp[1]; + paint->sample[0] += sample[0] * vol[0]; + paint->sample[1] += sample[0] * vol[1]; + indexfrac += indexfracstep; + fetchsampleframe += (indexfrac >> 16); + indexfrac &= 0xFFFF; + } + } + } } } + ch->position = posd; + if (!looping && istartframe == totallength) + S_StopChannel(ch - channels, false, false); } - // transfer out according to DMA format - //S_CaptureAVISound(paintbuffer, end - paintedtime); - S_TransferPaintBuffer(end); - paintedtime = end; - } -} - -void SND_InitScaletable (void) -{ - int i, j; - - for (i = 0;i < 32;i++) - for (j = 0;j < 256;j++) - snd_scaletable[i][j] = ((signed char)j) * i * 8; -} - - -qboolean SND_PaintChannelFrom8 (channel_t *ch, int count) -{ - int *lscale, *rscale; - unsigned char *sfx; - const sfxbuffer_t *sb; - int i, n; - - if (ch->leftvol > 255) - ch->leftvol = 255; - if (ch->rightvol > 255) - ch->rightvol = 255; - - lscale = snd_scaletable[ch->leftvol >> 3]; - rscale = snd_scaletable[ch->rightvol >> 3]; - - sb = ch->sfx->fetcher->getsb (ch, ch->pos, count); - if (sb == NULL) - return false; - - if (ch->sfx->format.channels == 2) - { - // LordHavoc: stereo sound support, and optimizations - sfx = (unsigned char *)sb->data + (ch->pos - sb->offset) * 2; - for (i = 0;i < count;i++) - { - paintbuffer[i].left += lscale[*sfx++]; - paintbuffer[i].right += rscale[*sfx++]; - } - } - else - { - sfx = (unsigned char *)sb->data + ch->pos - sb->offset; - for (i = 0;i < count;i++) - { - n = *sfx++; - paintbuffer[i].left += lscale[n]; - paintbuffer[i].right += rscale[n]; - } - - } - ch->pos += count; - return true; -} + S_SoftClipPaintBuffer(paintbuffer, totalmixframes, snd_renderbuffer->format.width, snd_renderbuffer->format.channels); -qboolean SND_PaintChannelFrom16 (channel_t *ch, int count) -{ - int leftvol, rightvol; - signed short *sfx; - const sfxbuffer_t *sb; - int i; +#ifdef CONFIG_VIDEO_CAPTURE + if (!snd_usethreadedmixing) + S_CaptureAVISound(paintbuffer, totalmixframes); +#endif - leftvol = ch->leftvol; - rightvol = ch->rightvol; + S_ConvertPaintBuffer(paintbuffer, outbytes, totalmixframes, snd_renderbuffer->format.width, snd_renderbuffer->format.channels); - sb = ch->sfx->fetcher->getsb (ch, ch->pos, count); - if (sb == NULL) - return false; - - if (ch->sfx->format.channels == 2) - { - // LordHavoc: stereo sound support, and optimizations - sfx = (signed short *)sb->data + (ch->pos - sb->offset) * 2; - - for (i=0 ; i> 8; - paintbuffer[i].right += (*sfx++ * rightvol) >> 8; - } - } - else - { - sfx = (signed short *)sb->data + ch->pos - sb->offset; - - for (i=0 ; i> 8; - paintbuffer[i].right += (*sfx++ * rightvol) >> 8; - } + // advance the output pointer + outbytes += totalmixframes * snd_renderbuffer->format.width * snd_renderbuffer->format.channels; + bufferframes -= totalmixframes; } - - ch->pos += count; - return true; } -