X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=snd_mix.c;h=dc2a147402a58b0c06fcacea31ae6d62e7f2b868;hp=e27b97dd65e89e12fef7eac176ee414139c295ec;hb=7fe21433f8c26bd2442ab72707f7f6063c1932e7;hpb=ff46d6ff516fda192c5adc55a5c9b82007545bd2 diff --git a/snd_mix.c b/snd_mix.c index e27b97dd..dc2a1474 100644 --- a/snd_mix.c +++ b/snd_mix.c @@ -17,401 +17,596 @@ 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 portable_samplepair_s +{ + int sample[SND_LISTENERS]; +} portable_sampleframe_t; // LordHavoc: was 512, expanded to 2048 #define PAINTBUFFER_SIZE 2048 -portable_samplepair_t paintbuffer[PAINTBUFFER_SIZE]; -int snd_scaletable[32][256]; +portable_sampleframe_t paintbuffer[PAINTBUFFER_SIZE]; -/* -// 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) + +extern void SCR_CaptureVideo_SoundFrame(unsigned char *bufstereo16le, size_t length, int rate); +static void S_CaptureAVISound(size_t length) { - int i, n; - qbyte out[PAINTBUFFER_SIZE * 4]; - char filename[MAX_OSPATH]; + size_t i; + unsigned char out[PAINTBUFFER_SIZE * 4]; + unsigned char* out_ptr; + + if (!cls.capturevideo.active) + return; - if (cl_avidemo.value >= 0.1f) + // write the sound buffer as little endian 16bit interleaved stereo + for(i = 0, out_ptr = out; i < length; i++, out_ptr += 4) { - if (cl_avidemo_soundfile == NULL) - { - 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 - } - fseek(cl_avidemo_soundfile, 0, SEEK_END); - // write the sound buffer as little endian 16bit interleaved stereo - for(i = 0;i < length;i++) + int n0, n1; + + n0 = paintbuffer[i].sample[0]; + n0 = bound(-32768, n0, 32767); + out_ptr[0] = (unsigned char)n0; + out_ptr[1] = (unsigned char)(n0 >> 8); + + n1 = paintbuffer[i].sample[1]; + n1 = bound(-32768, n1, 32767); + out_ptr[2] = (unsigned char)n1; + out_ptr[3] = (unsigned char)(n1 >> 8); + } + SCR_CaptureVideo_SoundFrame(out, length, snd_renderbuffer->format.speed); +} + +static unsigned int S_TransferPaintBuffer(snd_ringbuffer_t* rb, unsigned int starttime, unsigned int endtime) +{ + unsigned int partialend; + + // Lock submitbuffer + if (!simsound && !SndSys_LockRenderBuffer()) + return 0; + + partialend = starttime; + while (partialend < endtime) // handle recirculating buffer issues + { + unsigned int startoffset, maxframes, nbframes, i; + void *rb_ptr; + portable_sampleframe_t *painted_ptr; + int val; + + startoffset = partialend % rb->maxframes; + maxframes = rb->maxframes - startoffset; + nbframes = endtime - partialend; + if (nbframes > maxframes) + nbframes = maxframes; + + rb_ptr = &rb->ring[startoffset * rb->format.width * rb->format.channels]; + painted_ptr = &paintbuffer[partialend - starttime]; + + if (rb->format.width == 2) // 16bit { - 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; + short *snd_out = (short*)rb_ptr; + if (rb->format.channels == 8) // 7.1 surround + { + for (i = 0;i < nbframes;i++, painted_ptr++) + { + *snd_out++ = bound(-32768, painted_ptr->sample[0], 32767); + *snd_out++ = bound(-32768, painted_ptr->sample[1], 32767); + *snd_out++ = bound(-32768, painted_ptr->sample[2], 32767); + *snd_out++ = bound(-32768, painted_ptr->sample[3], 32767); + *snd_out++ = bound(-32768, painted_ptr->sample[4], 32767); + *snd_out++ = bound(-32768, painted_ptr->sample[5], 32767); + *snd_out++ = bound(-32768, painted_ptr->sample[6], 32767); + *snd_out++ = bound(-32768, painted_ptr->sample[7], 32767); + } + } + else if (rb->format.channels == 6) // 5.1 surround + { + for (i = 0; i < nbframes; i++, painted_ptr++) + { + *snd_out++ = bound(-32768, painted_ptr->sample[0], 32767); + *snd_out++ = bound(-32768, painted_ptr->sample[1], 32767); + *snd_out++ = bound(-32768, painted_ptr->sample[2], 32767); + *snd_out++ = bound(-32768, painted_ptr->sample[3], 32767); + *snd_out++ = bound(-32768, painted_ptr->sample[4], 32767); + *snd_out++ = bound(-32768, painted_ptr->sample[5], 32767); + } + } + else if (rb->format.channels == 4) // 4.0 surround + { + for (i = 0; i < nbframes; i++, painted_ptr++) + { + *snd_out++ = bound(-32768, painted_ptr->sample[0], 32767); + *snd_out++ = bound(-32768, painted_ptr->sample[1], 32767); + *snd_out++ = bound(-32768, painted_ptr->sample[2], 32767); + *snd_out++ = bound(-32768, painted_ptr->sample[3], 32767); + } + } + else if (rb->format.channels == 2) // 2.0 stereo + { + for (i = 0; i < nbframes; i++, painted_ptr++) + { + *snd_out++ = bound(-32768, painted_ptr->sample[0], 32767); + *snd_out++ = bound(-32768, painted_ptr->sample[1], 32767); + } + } + else if (rb->format.channels == 1) // 1.0 mono + { + for (i = 0; i < nbframes; i++, painted_ptr++) + { + val = (painted_ptr->sample[0] + painted_ptr->sample[1]) >> 1; + *snd_out++ = bound(-32768, val, 32767); + } + } } - if (fwrite(out, 4, length, cl_avidemo_soundfile) < length) + else // 8bit { - Cvar_SetValueQuick(&cl_avidemo, 0); - Con_Print("avi saving sound failed, out of disk space? stopping avi demo capture.\n"); + unsigned char *snd_out = (unsigned char*)rb_ptr; + if (rb->format.channels == 8) // 7.1 surround + { + for (i = 0; i < nbframes; i++, painted_ptr++) + { + val = (painted_ptr->sample[0] >> 8) + 128; *snd_out++ = bound(0, val, 255); + val = (painted_ptr->sample[1] >> 8) + 128; *snd_out++ = bound(0, val, 255); + val = (painted_ptr->sample[2] >> 8) + 128; *snd_out++ = bound(0, val, 255); + val = (painted_ptr->sample[3] >> 8) + 128; *snd_out++ = bound(0, val, 255); + val = (painted_ptr->sample[4] >> 8) + 128; *snd_out++ = bound(0, val, 255); + val = (painted_ptr->sample[5] >> 8) + 128; *snd_out++ = bound(0, val, 255); + val = (painted_ptr->sample[6] >> 8) + 128; *snd_out++ = bound(0, val, 255); + val = (painted_ptr->sample[7] >> 8) + 128; *snd_out++ = bound(0, val, 255); + } + } + else if (rb->format.channels == 6) // 5.1 surround + { + for (i = 0; i < nbframes; i++, painted_ptr++) + { + val = (painted_ptr->sample[0] >> 8) + 128; *snd_out++ = bound(0, val, 255); + val = (painted_ptr->sample[1] >> 8) + 128; *snd_out++ = bound(0, val, 255); + val = (painted_ptr->sample[2] >> 8) + 128; *snd_out++ = bound(0, val, 255); + val = (painted_ptr->sample[3] >> 8) + 128; *snd_out++ = bound(0, val, 255); + val = (painted_ptr->sample[4] >> 8) + 128; *snd_out++ = bound(0, val, 255); + val = (painted_ptr->sample[5] >> 8) + 128; *snd_out++ = bound(0, val, 255); + } + } + else if (rb->format.channels == 4) // 4.0 surround + { + for (i = 0; i < nbframes; i++, painted_ptr++) + { + val = (painted_ptr->sample[0] >> 8) + 128; *snd_out++ = bound(0, val, 255); + val = (painted_ptr->sample[1] >> 8) + 128; *snd_out++ = bound(0, val, 255); + val = (painted_ptr->sample[2] >> 8) + 128; *snd_out++ = bound(0, val, 255); + val = (painted_ptr->sample[3] >> 8) + 128; *snd_out++ = bound(0, val, 255); + } + } + else if (rb->format.channels == 2) // 2.0 stereo + { + for (i = 0; i < nbframes; i++, painted_ptr++) + { + val = (painted_ptr->sample[0] >> 8) + 128; *snd_out++ = bound(0, val, 255); + val = (painted_ptr->sample[1] >> 8) + 128; *snd_out++ = bound(0, val, 255); + } + } + else if (rb->format.channels == 1) // 1.0 mono + { + for (i = 0;i < nbframes;i++, painted_ptr++) + { + val = ((painted_ptr->sample[0] + painted_ptr->sample[1]) >> 9) + 128; + *snd_out++ = bound(0, val, 255); + } + } } + + partialend += nbframes; } - 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; - } + + rb->endframe = endtime; + + // Remove outdated samples from the ring buffer, if any + if (rb->startframe < soundtime) + rb->startframe = soundtime; + + if (!simsound) + SndSys_UnlockRenderBuffer(); + + return endtime - starttime; } + + +/* +=============================================================================== + +CHANNEL MIXING + +=============================================================================== */ -void S_TransferPaintBuffer(int endtime) +static qboolean SND_PaintChannel (channel_t *ch, unsigned int count) { - void *pbuf; - if ((pbuf = S_LockBuffer())) + int snd_vol, vol[SND_LISTENERS]; + const snd_buffer_t *sb; + unsigned int i, sb_offset; + + // If this channel manages its own volume + if (ch->flags & CHANNELFLAG_FULLVOLUME) + snd_vol = 256; + else + snd_vol = (int)(volume.value * 256); + + for (i = 0;i < SND_LISTENERS;i++) + vol[i] = ch->listener_volume[i] * snd_vol; + + sb_offset = ch->pos; + sb = ch->sfx->fetcher->getsb (ch, &sb_offset, count); + if (sb == NULL) { - 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->samplebits == 16) + Con_DPrintf("SND_PaintChannel: ERROR: can't get sound buffer from sfx \"%s\"\n", + ch->sfx->name); // , count); // or add this? FIXME + } + else + { +#if SND_LISTENERS != 8 +# error the following code only supports up to 8 channels, update it +#endif + if (sb->format.width == 1) { - // 16bit - short *snd_out; - if (shm->channels == 2) + const signed char *samples = (signed char*)sb->samples + (ch->pos - sb_offset) * sb->format.channels; + + // Stereo sound support + if (sb->format.channels == 2) { - // 16bit 2 channels (stereo) - while (lpaintedtime < endtime) + if (vol[6] + vol[7] > 0) { - // 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 < count;i++) { - 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); - } + paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 8; + paintbuffer[i].sample[1] += (samples[1] * vol[1]) >> 8; + paintbuffer[i].sample[2] += (samples[0] * vol[2]) >> 8; + paintbuffer[i].sample[3] += (samples[1] * vol[3]) >> 8; + paintbuffer[i].sample[4] += ((samples[0] + samples[1]) * vol[4]) >> 9; + paintbuffer[i].sample[5] += ((samples[0] + samples[1]) * vol[5]) >> 9; + paintbuffer[i].sample[6] += (samples[0] * vol[6]) >> 8; + paintbuffer[i].sample[7] += (samples[1] * vol[7]) >> 8; + samples += 2; } - else + } + else if (vol[4] + vol[5] > 0) + { + for (i = 0;i < count;i++) + { + paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 8; + paintbuffer[i].sample[1] += (samples[1] * vol[1]) >> 8; + paintbuffer[i].sample[2] += (samples[0] * vol[2]) >> 8; + paintbuffer[i].sample[3] += (samples[1] * vol[3]) >> 8; + paintbuffer[i].sample[4] += ((samples[0] + samples[1]) * vol[4]) >> 9; + paintbuffer[i].sample[5] += ((samples[0] + samples[1]) * vol[5]) >> 9; + samples += 2; + } + } + else if (vol[2] + vol[3] > 0) + { + for (i = 0;i < count;i++) + { + paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 8; + paintbuffer[i].sample[1] += (samples[1] * vol[1]) >> 8; + paintbuffer[i].sample[2] += (samples[0] * vol[2]) >> 8; + paintbuffer[i].sample[3] += (samples[1] * vol[3]) >> 8; + samples += 2; + } + } + else if (vol[0] + vol[1] > 0) + { + for (i = 0;i < count;i++) { - 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); - } + paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 8; + paintbuffer[i].sample[1] += (samples[1] * vol[1]) >> 8; + samples += 2; } - snd_p += snd_linear_count; - lpaintedtime += (snd_linear_count >> 1); } } - else + else if (sb->format.channels == 1) { - // 16bit 1 channel (mono) - while (lpaintedtime < endtime) + if (vol[6] + vol[7] > 0) + { + for (i = 0;i < count;i++) + { + paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 8; + paintbuffer[i].sample[1] += (samples[0] * vol[1]) >> 8; + paintbuffer[i].sample[2] += (samples[0] * vol[2]) >> 8; + paintbuffer[i].sample[3] += (samples[0] * vol[3]) >> 8; + paintbuffer[i].sample[4] += (samples[0] * vol[4]) >> 8; + paintbuffer[i].sample[5] += (samples[0] * vol[5]) >> 8; + paintbuffer[i].sample[6] += (samples[0] * vol[6]) >> 8; + paintbuffer[i].sample[7] += (samples[0] * vol[7]) >> 8; + samples += 1; + } + } + else if (vol[4] + vol[5] > 0) + { + for (i = 0;i < count;i++) + { + paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 8; + paintbuffer[i].sample[1] += (samples[0] * vol[1]) >> 8; + paintbuffer[i].sample[2] += (samples[0] * vol[2]) >> 8; + paintbuffer[i].sample[3] += (samples[0] * vol[3]) >> 8; + paintbuffer[i].sample[4] += (samples[0] * vol[4]) >> 8; + paintbuffer[i].sample[5] += (samples[0] * vol[5]) >> 8; + samples += 1; + } + } + else if (vol[2] + vol[3] > 0) + { + for (i = 0;i < count;i++) + { + paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 8; + paintbuffer[i].sample[1] += (samples[0] * vol[1]) >> 8; + paintbuffer[i].sample[2] += (samples[0] * vol[2]) >> 8; + paintbuffer[i].sample[3] += (samples[0] * vol[3]) >> 8; + samples += 1; + } + } + else if (vol[0] + vol[1] > 0) { - // 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++) + for (i = 0;i < count;i++) { - val = ((snd_p[i * 2 + 0] + snd_p[i * 2 + 1]) * snd_vol) >> 9; - snd_out[i] = bound(-32768, val, 32767); + paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 8; + paintbuffer[i].sample[1] += (samples[0] * vol[1]) >> 8; + samples += 1; } - snd_p += snd_linear_count << 1; - lpaintedtime += snd_linear_count; } } + else + return false; // unsupported number of channels in sound } - else + else if (sb->format.width == 2) { - // 8bit - unsigned char *snd_out; - if (shm->channels == 2) + const signed short *samples = (signed short*)sb->samples + (ch->pos - sb_offset) * sb->format.channels; + + // Stereo sound support + if (sb->format.channels == 2) { - // 8bit 2 channels (stereo) - while (lpaintedtime < endtime) + if (vol[6] + vol[7] > 0) { - // 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 < count;i++) { - 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); - } + paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 16; + paintbuffer[i].sample[1] += (samples[1] * vol[1]) >> 16; + paintbuffer[i].sample[2] += (samples[0] * vol[2]) >> 16; + paintbuffer[i].sample[3] += (samples[1] * vol[3]) >> 16; + paintbuffer[i].sample[4] += ((samples[0] + samples[1]) * vol[4]) >> 17; + paintbuffer[i].sample[5] += ((samples[0] + samples[1]) * vol[5]) >> 17; + paintbuffer[i].sample[6] += (samples[0] * vol[6]) >> 16; + paintbuffer[i].sample[7] += (samples[1] * vol[7]) >> 16; + samples += 2; } - else + } + else if (vol[4] + vol[5] > 0) + { + for (i = 0;i < count;i++) { - 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); - } + paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 16; + paintbuffer[i].sample[1] += (samples[1] * vol[1]) >> 16; + paintbuffer[i].sample[2] += (samples[0] * vol[2]) >> 16; + paintbuffer[i].sample[3] += (samples[1] * vol[3]) >> 16; + paintbuffer[i].sample[4] += ((samples[0] + samples[1]) * vol[4]) >> 17; + paintbuffer[i].sample[5] += ((samples[0] + samples[1]) * vol[5]) >> 17; + samples += 2; + } + } + else if (vol[2] + vol[3] > 0) + { + for (i = 0;i < count;i++) + { + paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 16; + paintbuffer[i].sample[1] += (samples[1] * vol[1]) >> 16; + paintbuffer[i].sample[2] += (samples[0] * vol[2]) >> 16; + paintbuffer[i].sample[3] += (samples[1] * vol[3]) >> 16; + samples += 2; + } + } + else if (vol[0] + vol[1] > 0) + { + for (i = 0;i < count;i++) + { + paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 16; + paintbuffer[i].sample[1] += (samples[1] * vol[1]) >> 16; + samples += 2; } - snd_p += snd_linear_count; - lpaintedtime += (snd_linear_count >> 1); } } - else + else if (sb->format.channels == 1) { - // 8bit 1 channel (mono) - while (lpaintedtime < endtime) + if (vol[6] + vol[7] > 0) + { + for (i = 0;i < count;i++) + { + paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 16; + paintbuffer[i].sample[1] += (samples[0] * vol[1]) >> 16; + paintbuffer[i].sample[2] += (samples[0] * vol[2]) >> 16; + paintbuffer[i].sample[3] += (samples[0] * vol[3]) >> 16; + paintbuffer[i].sample[4] += (samples[0] * vol[4]) >> 16; + paintbuffer[i].sample[5] += (samples[0] * vol[5]) >> 16; + paintbuffer[i].sample[6] += (samples[0] * vol[6]) >> 16; + paintbuffer[i].sample[7] += (samples[0] * vol[7]) >> 16; + samples += 1; + } + } + else if (vol[4] + vol[5] > 0) + { + for (i = 0;i < count;i++) + { + paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 16; + paintbuffer[i].sample[1] += (samples[0] * vol[1]) >> 16; + paintbuffer[i].sample[2] += (samples[0] * vol[2]) >> 16; + paintbuffer[i].sample[3] += (samples[0] * vol[3]) >> 16; + paintbuffer[i].sample[4] += (samples[0] * vol[4]) >> 16; + paintbuffer[i].sample[5] += (samples[0] * vol[5]) >> 16; + samples += 1; + } + } + else if (vol[2] + vol[3] > 0) + { + for (i = 0;i < count;i++) + { + paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 16; + paintbuffer[i].sample[1] += (samples[0] * vol[1]) >> 16; + paintbuffer[i].sample[2] += (samples[0] * vol[2]) >> 16; + paintbuffer[i].sample[3] += (samples[0] * vol[3]) >> 16; + samples += 1; + } + } + else if (vol[0] + vol[1] > 0) { - // 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++) + for (i = 0;i < count;i++) { - val = (((snd_p[i * 2] + snd_p[i * 2 + 1]) * snd_vol) >> 17) + 128; - snd_out[i ] = bound(0, val, 255); + paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 16; + paintbuffer[i].sample[1] += (samples[0] * vol[1]) >> 16; + samples += 1; } - snd_p += snd_linear_count << 1; - lpaintedtime += snd_linear_count; } } + else + return false; // unsupported number of channels in sound } - - S_UnlockBuffer(); } -} - - -/* -=============================================================================== - -CHANNEL MIXING - -=============================================================================== -*/ -void SND_PaintChannelFrom8 (channel_t *ch, sfxcache_t *sc, int endtime); -void SND_PaintChannelFrom16 (channel_t *ch, sfxcache_t *sc, int endtime); + ch->pos += count; + return true; +} -void S_PaintChannels(int endtime) +void S_PaintChannels (snd_ringbuffer_t* rb, unsigned int starttime, unsigned int endtime) { - int i; - int end; - channel_t *ch; - sfxcache_t *sc; - int ltime, count; + unsigned int paintedtime; + paintedtime = starttime; while (paintedtime < endtime) { - // if paintbuffer is smaller than DMA buffer - end = endtime; - if (endtime - paintedtime > PAINTBUFFER_SIZE) - end = paintedtime + PAINTBUFFER_SIZE; + unsigned int partialend, i, framecount; + channel_t *ch; + + // if paintbuffer is too small + if (endtime > paintedtime + PAINTBUFFER_SIZE) + partialend = paintedtime + PAINTBUFFER_SIZE; + else + partialend = endtime; - // 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, (partialend - paintedtime) * sizeof (paintbuffer[0])); // paint in the channels. ch = channels; - for (i=0; isfx) + sfx_t *sfx; + unsigned int ltime, j; + + sfx = ch->sfx; + if (sfx == NULL) continue; - if (!ch->leftvol && !ch->rightvol) + for (j = 0;j < SND_LISTENERS;j++) + if (ch->listener_volume[j]) + break; + if (j == SND_LISTENERS) continue; - sc = S_LoadSound (ch->sfx, true); - if (!sc) + if (!S_LoadSound (sfx, true)) continue; - ltime = paintedtime; + // if the channel is paused + if (ch->flags & CHANNELFLAG_PAUSED) + { + int pausedtime = partialend - paintedtime; + ch->lastptime += pausedtime; + ch->end += pausedtime; + continue; + } - while (ltime < end) + // if the sound hasn't been painted last time, update his position + if (ch->lastptime < paintedtime) { + ch->pos += paintedtime - ch->lastptime; + + // If the sound should have ended by then + if ((unsigned int)ch->pos > sfx->total_length) + { + int loopstart; + + if (sfx->loopstart >= 0) + loopstart = bound(0, sfx->loopstart, (int)sfx->total_length - 1); + else + { + if (ch->flags & CHANNELFLAG_FORCELOOP) + loopstart = 0; + else + loopstart = -1; + } + + // 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; + } + } + + ltime = paintedtime; + while (ltime < partialend) + { + int count; + qboolean stop_paint; + // paint up to end - if (ch->end < end) + if (ch->end < partialend) count = ch->end - ltime; else - count = end - ltime; + count = partialend - ltime; if (count > 0) { - if (sc->width == 1) - SND_PaintChannelFrom8(ch, sc, count); - else - SND_PaintChannelFrom16(ch, sc, count); + for (j = 0; j < SND_LISTENERS; j++) + ch->listener_volume[j] = bound(0, ch->listener_volume[j], 255); - ltime += count; + stop_paint = !SND_PaintChannel (ch, (unsigned int)count); + if (!stop_paint) + { + ltime += count; + ch->lastptime = ltime; + } } + else + stop_paint = false; - // if at end of loop, restart if (ltime >= ch->end) { - if (sc->loopstart >= 0 || ch->forceloop) + // if at end of loop, restart + if ((sfx->loopstart >= 0 || (ch->flags & CHANNELFLAG_FORCELOOP)) && !stop_paint) { - ch->pos = bound(0, sc->loopstart, sc->length - 1); - ch->end = ltime + sc->length - ch->pos; + ch->pos = bound(0, sfx->loopstart, (int)sfx->total_length - 1); + ch->end = ltime + sfx->total_length - ch->pos; } + // channel just stopped else - { - // channel just stopped - ch->sfx = NULL; - break; - } + stop_paint = true; } - } - } - - // 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; -} - - -void SND_PaintChannelFrom8 (channel_t *ch, sfxcache_t *sc, int count) -{ - int *lscale, *rscale; - unsigned char *sfx; - 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]; - if (sc->stereo) - { - // LordHavoc: stereo sound support, and optimizations - sfx = (unsigned char *)sc->data + ch->pos * 2; - for (i = 0;i < count;i++) - { - paintbuffer[i].left += lscale[*sfx++]; - paintbuffer[i].right += rscale[*sfx++]; - } - } - else - { - sfx = (unsigned char *)sc->data + ch->pos; - for (i = 0;i < count;i++) - { - n = *sfx++; - paintbuffer[i].left += lscale[n]; - paintbuffer[i].right += rscale[n]; + if (stop_paint) + { + S_StopChannel (ch - channels); + break; + } + } } - } - ch->pos += count; -} - -void SND_PaintChannelFrom16 (channel_t *ch, sfxcache_t *sc, int count) -{ - int leftvol, rightvol; - signed short *sfx; - int i; - - leftvol = ch->leftvol; - rightvol = ch->rightvol; - if (sc->stereo) - { - // LordHavoc: stereo sound support, and optimizations - sfx = (signed short *)sc->data + ch->pos * 2; + S_CaptureAVISound (partialend - paintedtime); + framecount = S_TransferPaintBuffer (rb, paintedtime, partialend); + paintedtime += framecount; - for (i=0 ; i> 8; - paintbuffer[i].right += (*sfx++ * rightvol) >> 8; + Con_DPrintf(">> S_PaintChannels: Not enough free space in the sound buffer ( %u != %u)\n", paintedtime, partialend); + break; } } - else - { - sfx = (signed short *)sc->data + ch->pos; - - for (i=0 ; i> 8; - paintbuffer[i].right += (*sfx++ * rightvol) >> 8; - } - } - - ch->pos += count; } -