Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-// snd_mix.c -- portable code to mix sounds for snd_dma.c
+// snd_mix.c -- portable code to mix sounds
#include "quakedef.h"
+#include "snd_main.h"
-typedef struct
+typedef struct portable_samplepair_s
{
- int left;
- int right;
-} portable_samplepair_t;
+ 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)
+// FIXME: this desyncs with the video too easily
+extern qboolean cl_capturevideo_active;
+extern void SCR_CaptureVideo_SoundFrame(unsigned char *bufstereo16le, size_t length, int rate);
+void S_CaptureAVISound(portable_sampleframe_t *buf, size_t length)
{
- int i, n;
- qbyte out[PAINTBUFFER_SIZE * 4];
- char filename[MAX_OSPATH];
-
- if (cl_avidemo.value >= 0.1f)
- {
- 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++)
- {
- 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;
- }
- if (fwrite(out, 4, length, cl_avidemo_soundfile) < length)
- {
- Cvar_SetValueQuick(&cl_avidemo, 0);
- Con_Print("avi saving sound failed, out of disk space? stopping avi demo capture.\n");
- }
- }
- else if (cl_avidemo_soundfile)
+ int n;
+ size_t i;
+ unsigned char out[PAINTBUFFER_SIZE * 4];
+ if (!cl_capturevideo_active)
+ return;
+ // write the sound buffer as little endian 16bit interleaved stereo
+ for(i = 0;i < length;i++)
{
- // 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;
+ n = buf[i].sample[0];
+ n = bound(-32768, n, 32767);
+ out[i*4+0] = n & 0xFF;
+ out[i*4+1] = (n >> 8) & 0xFF;
+ n = buf[i].sample[1];
+ n = bound(-32768, n, 32767);
+ out[i*4+2] = n & 0xFF;
+ out[i*4+3] = (n >> 8) & 0xFF;
}
+ SCR_CaptureVideo_SoundFrame(out, length, shm->format.speed);
}
-*/
+// TODO: rewrite this function
void S_TransferPaintBuffer(int endtime)
{
void *pbuf;
+ int i;
+ portable_sampleframe_t *snd_p;
+ int lpaintedtime;
+ int snd_frames;
+ int val;
if ((pbuf = S_LockBuffer()))
{
- 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;
+ snd_p = paintbuffer;
lpaintedtime = paintedtime;
- if (shm->format.width == 2)
+ for (lpaintedtime = paintedtime;lpaintedtime < endtime;lpaintedtime += snd_frames)
{
- // 16bit
- short *snd_out;
- if (shm->format.channels == 2)
+ // handle recirculating buffer issues
+ i = lpaintedtime & (shm->sampleframes - 1);
+ snd_frames = shm->sampleframes - i;
+ if (snd_frames > endtime - lpaintedtime)
+ snd_frames = endtime - lpaintedtime;
+ if (shm->format.width == 2)
{
- // 16bit 2 channels (stereo)
- while (lpaintedtime < endtime)
+ // 16bit
+ short *snd_out = (short *) pbuf + i * shm->format.channels;
+ if (shm->format.channels == 8)
{
- // 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;
+ // 7.1 surround
if (snd_swapstereo.value)
{
- for (i = 0;i < snd_linear_count;i += 2)
+ for (i = 0;i < snd_frames;i++, snd_p++)
{
- 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);
+ *snd_out++ = bound(-32768, snd_p->sample[1], 32767);
+ *snd_out++ = bound(-32768, snd_p->sample[0], 32767);
+ *snd_out++ = bound(-32768, snd_p->sample[3], 32767);
+ *snd_out++ = bound(-32768, snd_p->sample[2], 32767);
+ *snd_out++ = bound(-32768, snd_p->sample[4], 32767);
+ *snd_out++ = bound(-32768, snd_p->sample[5], 32767);
+ *snd_out++ = bound(-32768, snd_p->sample[6], 32767);
+ *snd_out++ = bound(-32768, snd_p->sample[7], 32767);
}
}
else
{
- for (i = 0;i < snd_linear_count;i += 2)
+ for (i = 0;i < snd_frames;i++, snd_p++)
{
- 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_out++ = bound(-32768, snd_p->sample[0], 32767);
+ *snd_out++ = bound(-32768, snd_p->sample[1], 32767);
+ *snd_out++ = bound(-32768, snd_p->sample[2], 32767);
+ *snd_out++ = bound(-32768, snd_p->sample[3], 32767);
+ *snd_out++ = bound(-32768, snd_p->sample[4], 32767);
+ *snd_out++ = bound(-32768, snd_p->sample[5], 32767);
+ *snd_out++ = bound(-32768, snd_p->sample[6], 32767);
+ *snd_out++ = bound(-32768, snd_p->sample[7], 32767);
}
}
- snd_p += snd_linear_count;
- lpaintedtime += (snd_linear_count >> 1);
}
- }
- else
- {
- // 16bit 1 channel (mono)
- while (lpaintedtime < endtime)
+ else if (shm->format.channels == 6)
{
- // 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++)
+ // 5.1 surround
+ if (snd_swapstereo.value)
+ {
+ for (i = 0;i < snd_frames;i++, snd_p++)
+ {
+ *snd_out++ = bound(-32768, snd_p->sample[1], 32767);
+ *snd_out++ = bound(-32768, snd_p->sample[0], 32767);
+ *snd_out++ = bound(-32768, snd_p->sample[3], 32767);
+ *snd_out++ = bound(-32768, snd_p->sample[2], 32767);
+ *snd_out++ = bound(-32768, snd_p->sample[4], 32767);
+ *snd_out++ = bound(-32768, snd_p->sample[5], 32767);
+ }
+ }
+ else
{
- val = ((snd_p[i * 2 + 0] + snd_p[i * 2 + 1]) * snd_vol) >> 9;
- snd_out[i] = bound(-32768, val, 32767);
+ for (i = 0;i < snd_frames;i++, snd_p++)
+ {
+ *snd_out++ = bound(-32768, snd_p->sample[0], 32767);
+ *snd_out++ = bound(-32768, snd_p->sample[1], 32767);
+ *snd_out++ = bound(-32768, snd_p->sample[2], 32767);
+ *snd_out++ = bound(-32768, snd_p->sample[3], 32767);
+ *snd_out++ = bound(-32768, snd_p->sample[4], 32767);
+ *snd_out++ = bound(-32768, snd_p->sample[5], 32767);
+ }
}
- snd_p += snd_linear_count << 1;
- lpaintedtime += snd_linear_count;
}
- }
- }
- else
- {
- // 8bit
- unsigned char *snd_out;
- if (shm->format.channels == 2)
- {
- // 8bit 2 channels (stereo)
- while (lpaintedtime < endtime)
+ else if (shm->format.channels == 4)
+ {
+ // 4.0 surround
+ if (snd_swapstereo.value)
+ {
+ for (i = 0;i < snd_frames;i++, snd_p++)
+ {
+ *snd_out++ = bound(-32768, snd_p->sample[1], 32767);
+ *snd_out++ = bound(-32768, snd_p->sample[0], 32767);
+ *snd_out++ = bound(-32768, snd_p->sample[3], 32767);
+ *snd_out++ = bound(-32768, snd_p->sample[2], 32767);
+ }
+ }
+ else
+ {
+ for (i = 0;i < snd_frames;i++, snd_p++)
+ {
+ *snd_out++ = bound(-32768, snd_p->sample[0], 32767);
+ *snd_out++ = bound(-32768, snd_p->sample[1], 32767);
+ *snd_out++ = bound(-32768, snd_p->sample[2], 32767);
+ *snd_out++ = bound(-32768, snd_p->sample[3], 32767);
+ }
+ }
+ }
+ else if (shm->format.channels == 2)
{
- // 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;
+ // 2.0 stereo
if (snd_swapstereo.value)
{
- for (i = 0;i < snd_linear_count;i += 2)
+ for (i = 0;i < snd_frames;i++, snd_p++)
{
- 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);
+ *snd_out++ = bound(-32768, snd_p->sample[1], 32767);
+ *snd_out++ = bound(-32768, snd_p->sample[0], 32767);
}
}
else
{
- for (i = 0;i < snd_linear_count;i += 2)
+ for (i = 0;i < snd_frames;i++, snd_p++)
{
- 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_out++ = bound(-32768, snd_p->sample[0], 32767);
+ *snd_out++ = bound(-32768, snd_p->sample[1], 32767);
}
}
- snd_p += snd_linear_count;
- lpaintedtime += (snd_linear_count >> 1);
+ }
+ else if (shm->format.channels == 1)
+ {
+ // 1.0 mono
+ for (i = 0;i < snd_frames;i++, snd_p++)
+ *snd_out++ = bound(-32768, (snd_p->sample[0] + snd_p->sample[1]) >> 1, 32767);
}
}
else
{
- // 8bit 1 channel (mono)
- while (lpaintedtime < endtime)
+ // 8bit
+ unsigned char *snd_out = (unsigned char *) pbuf + i * shm->format.channels;
+ if (shm->format.channels == 8)
+ {
+ // 7.1 surround
+ if (snd_swapstereo.value)
+ {
+ for (i = 0;i < snd_frames;i++, snd_p++)
+ {
+ val = (snd_p->sample[1] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ val = (snd_p->sample[0] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ val = (snd_p->sample[3] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ val = (snd_p->sample[2] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ val = (snd_p->sample[4] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ val = (snd_p->sample[5] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ val = (snd_p->sample[6] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ val = (snd_p->sample[7] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ }
+ }
+ else
+ {
+ for (i = 0;i < snd_frames;i++, snd_p++)
+ {
+ val = (snd_p->sample[0] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ val = (snd_p->sample[1] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ val = (snd_p->sample[2] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ val = (snd_p->sample[3] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ val = (snd_p->sample[4] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ val = (snd_p->sample[5] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ val = (snd_p->sample[6] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ val = (snd_p->sample[7] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ }
+ }
+ }
+ else if (shm->format.channels == 6)
+ {
+ // 5.1 surround
+ if (snd_swapstereo.value)
+ {
+ for (i = 0;i < snd_frames;i++, snd_p++)
+ {
+ val = (snd_p->sample[1] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ val = (snd_p->sample[0] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ val = (snd_p->sample[3] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ val = (snd_p->sample[2] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ val = (snd_p->sample[4] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ val = (snd_p->sample[5] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ }
+ }
+ else
+ {
+ for (i = 0;i < snd_frames;i++, snd_p++)
+ {
+ val = (snd_p->sample[0] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ val = (snd_p->sample[1] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ val = (snd_p->sample[2] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ val = (snd_p->sample[3] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ val = (snd_p->sample[4] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ val = (snd_p->sample[5] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ }
+ }
+ }
+ else if (shm->format.channels == 4)
+ {
+ // 4.0 surround
+ if (snd_swapstereo.value)
+ {
+ for (i = 0;i < snd_frames;i++, snd_p++)
+ {
+ val = (snd_p->sample[1] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ val = (snd_p->sample[0] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ val = (snd_p->sample[3] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ val = (snd_p->sample[2] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ }
+ }
+ else
+ {
+ for (i = 0;i < snd_frames;i++, snd_p++)
+ {
+ val = (snd_p->sample[0] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ val = (snd_p->sample[1] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ val = (snd_p->sample[2] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ val = (snd_p->sample[3] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ }
+ }
+ }
+ else if (shm->format.channels == 2)
+ {
+ // 2.0 stereo
+ if (snd_swapstereo.value)
+ {
+ for (i = 0;i < snd_frames;i++, snd_p++)
+ {
+ val = (snd_p->sample[1] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ val = (snd_p->sample[0] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ }
+ }
+ else
+ {
+ for (i = 0;i < snd_frames;i++, snd_p++)
+ {
+ val = (snd_p->sample[0] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ val = (snd_p->sample[1] >> 8) + 128;*snd_out++ = bound(0, val, 255);
+ }
+ }
+ }
+ else if (shm->format.channels == 1)
{
- // 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++)
+ // 1.0 mono
+ for (i = 0;i < snd_frames;i++, snd_p++)
{
- val = (((snd_p[i * 2] + snd_p[i * 2 + 1]) * snd_vol) >> 17) + 128;
- snd_out[i ] = bound(0, val, 255);
+ val = ((snd_p->sample[0]+snd_p->sample[1]) >> 9) + 128;*snd_out++ = bound(0, val, 255);
}
- snd_p += snd_linear_count << 1;
- lpaintedtime += snd_linear_count;
}
}
}
-
S_UnlockBuffer();
}
}
===============================================================================
*/
-qboolean SND_PaintChannelFrom8 (channel_t *ch, int endtime);
-qboolean SND_PaintChannelFrom16 (channel_t *ch, int endtime);
+qboolean SND_PaintChannel (channel_t *ch, int endtime);
void S_PaintChannels(int endtime)
{
- unsigned int i;
+ unsigned int i, j;
int end;
channel_t *ch;
sfx_t *sfx;
if (endtime - paintedtime > PAINTBUFFER_SIZE)
end = paintedtime + 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, (end - paintedtime) * sizeof (paintbuffer[0]));
// paint in the channels.
ch = channels;
sfx = ch->sfx;
if (!sfx)
continue;
- if (!ch->leftvol && !ch->rightvol)
+ for (j = 0;j < SND_LISTENERS;j++)
+ if (ch->listener_volume[j])
+ break;
+ if (j == SND_LISTENERS)
continue;
if (!S_LoadSound (sfx, true))
continue;
// if the channel is paused
if (ch->flags & CHANNELFLAG_PAUSED)
{
- size_t pausedtime;
-
- pausedtime = end - paintedtime;
+ int pausedtime = end - paintedtime;
ch->lastptime += pausedtime;
ch->end += pausedtime;
continue;
// If the sound is looped
if (loopstart >= 0)
ch->pos = (ch->pos - sfx->total_length) % (sfx->total_length - loopstart) + loopstart;
- else
+ else
ch->pos = sfx->total_length;
ch->end = paintedtime + sfx->total_length - ch->pos;
}
// paint up to end
if (ch->end < end)
- count = ch->end - ltime;
+ count = (int)ch->end - ltime;
else
count = end - ltime;
if (count > 0)
{
- if (sfx->format.width == 1)
- stop_paint = !SND_PaintChannelFrom8(ch, count);
- else
- stop_paint = !SND_PaintChannelFrom16(ch, count);
+ for (j = 0;j < SND_LISTENERS;j++)
+ ch->listener_volume[j] = bound(0, ch->listener_volume[j], 255);
+
+ stop_paint = !SND_PaintChannel (ch, count);
if (!stop_paint)
{
if (stop_paint)
{
- if (ch->sfx->fetcher->end != NULL)
- ch->sfx->fetcher->end (ch);
- ch->sfx = NULL;
+ S_StopChannel (ch - channels);
break;
}
}
}
// transfer out according to DMA format
- //S_CaptureAVISound(paintbuffer, end - paintedtime);
+ 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)
+qboolean SND_PaintChannel (channel_t *ch, int count)
{
- int *lscale, *rscale;
- unsigned char *sfx;
+ int snd_vol, vol[SND_LISTENERS];
const sfxbuffer_t *sb;
- int i, n;
+ int i;
- if (ch->leftvol > 255)
- ch->leftvol = 255;
- if (ch->rightvol > 255)
- ch->rightvol = 255;
+ // If this channel manages its own volume
+ if (ch->flags & CHANNELFLAG_FULLVOLUME)
+ snd_vol = 256;
+ else
+ snd_vol = volume.value * 256;
- lscale = snd_scaletable[ch->leftvol >> 3];
- rscale = snd_scaletable[ch->rightvol >> 3];
+ for (i = 0;i < SND_LISTENERS;i++)
+ vol[i] = ch->listener_volume[i] * snd_vol;
sb = ch->sfx->fetcher->getsb (ch, ch->pos, count);
if (sb == NULL)
return false;
- if (ch->sfx->format.channels == 2)
+#if SND_LISTENERS != 8
+#error this code only supports up to 8 channels, update it
+#endif
+
+ if (ch->sfx->format.width == 1)
{
- // LordHavoc: stereo sound support, and optimizations
- sfx = (unsigned char *)sb->data + (ch->pos - sb->offset) * 2;
- for (i = 0;i < count;i++)
+ const signed char *sfx = (signed char *)sb->data + (ch->pos - sb->offset) * ch->sfx->format.channels;
+ // Stereo sound support
+ if (ch->sfx->format.channels == 2)
{
- paintbuffer[i].left += lscale[*sfx++];
- paintbuffer[i].right += rscale[*sfx++];
+ if (vol[6] + vol[7] > 0)
+ {
+ for (i = 0;i < count;i++)
+ {
+ paintbuffer[i].sample[0] += (sfx[0] * vol[0]) >> 8;
+ paintbuffer[i].sample[1] += (sfx[1] * vol[1]) >> 8;
+ paintbuffer[i].sample[2] += (sfx[0] * vol[2]) >> 8;
+ paintbuffer[i].sample[3] += (sfx[1] * vol[3]) >> 8;
+ paintbuffer[i].sample[4] += ((sfx[0]+sfx[1]) * vol[4]) >> 9;
+ paintbuffer[i].sample[5] += ((sfx[0]+sfx[1]) * vol[5]) >> 9;
+ paintbuffer[i].sample[6] += (sfx[0] * vol[6]) >> 8;
+ paintbuffer[i].sample[7] += (sfx[1] * vol[7]) >> 8;
+ sfx += 2;
+ }
+ }
+ else if (vol[4] + vol[5] > 0)
+ {
+ for (i = 0;i < count;i++)
+ {
+ paintbuffer[i].sample[0] += (sfx[0] * vol[0]) >> 8;
+ paintbuffer[i].sample[1] += (sfx[1] * vol[1]) >> 8;
+ paintbuffer[i].sample[2] += (sfx[0] * vol[2]) >> 8;
+ paintbuffer[i].sample[3] += (sfx[1] * vol[3]) >> 8;
+ paintbuffer[i].sample[4] += ((sfx[0]+sfx[1]) * vol[4]) >> 9;
+ paintbuffer[i].sample[5] += ((sfx[0]+sfx[1]) * vol[5]) >> 9;
+ sfx += 2;
+ }
+ }
+ else if (vol[2] + vol[3] > 0)
+ {
+ for (i = 0;i < count;i++)
+ {
+ paintbuffer[i].sample[0] += (sfx[0] * vol[0]) >> 8;
+ paintbuffer[i].sample[1] += (sfx[1] * vol[1]) >> 8;
+ paintbuffer[i].sample[2] += (sfx[0] * vol[2]) >> 8;
+ paintbuffer[i].sample[3] += (sfx[1] * vol[3]) >> 8;
+ sfx += 2;
+ }
+ }
+ else if (vol[0] + vol[1] > 0)
+ {
+ for (i = 0;i < count;i++)
+ {
+ paintbuffer[i].sample[0] += (sfx[0] * vol[0]) >> 8;
+ paintbuffer[i].sample[1] += (sfx[1] * vol[1]) >> 8;
+ sfx += 2;
+ }
+ }
}
- }
- else
- {
- sfx = (unsigned char *)sb->data + ch->pos - sb->offset;
- for (i = 0;i < count;i++)
+ else if (ch->sfx->format.channels == 1)
{
- n = *sfx++;
- paintbuffer[i].left += lscale[n];
- paintbuffer[i].right += rscale[n];
+ if (vol[6] + vol[7] > 0)
+ {
+ for (i = 0;i < count;i++)
+ {
+ paintbuffer[i].sample[0] += (sfx[0] * vol[0]) >> 8;
+ paintbuffer[i].sample[1] += (sfx[0] * vol[1]) >> 8;
+ paintbuffer[i].sample[2] += (sfx[0] * vol[2]) >> 8;
+ paintbuffer[i].sample[3] += (sfx[0] * vol[3]) >> 8;
+ paintbuffer[i].sample[4] += (sfx[0] * vol[4]) >> 8;
+ paintbuffer[i].sample[5] += (sfx[0] * vol[5]) >> 8;
+ paintbuffer[i].sample[6] += (sfx[0] * vol[6]) >> 8;
+ paintbuffer[i].sample[7] += (sfx[0] * vol[7]) >> 8;
+ sfx += 1;
+ }
+ }
+ else if (vol[4] + vol[5] > 0)
+ {
+ for (i = 0;i < count;i++)
+ {
+ paintbuffer[i].sample[0] += (sfx[0] * vol[0]) >> 8;
+ paintbuffer[i].sample[1] += (sfx[0] * vol[1]) >> 8;
+ paintbuffer[i].sample[2] += (sfx[0] * vol[2]) >> 8;
+ paintbuffer[i].sample[3] += (sfx[0] * vol[3]) >> 8;
+ paintbuffer[i].sample[4] += (sfx[0] * vol[4]) >> 8;
+ paintbuffer[i].sample[5] += (sfx[0] * vol[5]) >> 8;
+ sfx += 1;
+ }
+ }
+ else if (vol[2] + vol[3] > 0)
+ {
+ for (i = 0;i < count;i++)
+ {
+ paintbuffer[i].sample[0] += (sfx[0] * vol[0]) >> 8;
+ paintbuffer[i].sample[1] += (sfx[0] * vol[1]) >> 8;
+ paintbuffer[i].sample[2] += (sfx[0] * vol[2]) >> 8;
+ paintbuffer[i].sample[3] += (sfx[0] * vol[3]) >> 8;
+ sfx += 1;
+ }
+ }
+ else if (vol[0] + vol[1] > 0)
+ {
+ for (i = 0;i < count;i++)
+ {
+ paintbuffer[i].sample[0] += (sfx[0] * vol[0]) >> 8;
+ paintbuffer[i].sample[1] += (sfx[0] * vol[1]) >> 8;
+ sfx += 1;
+ }
+ }
}
-
+ else
+ return true; // unsupported number of channels in sound
}
- ch->pos += count;
- return true;
-}
-
-qboolean SND_PaintChannelFrom16 (channel_t *ch, int count)
-{
- int leftvol, rightvol;
- signed short *sfx;
- const sfxbuffer_t *sb;
- int i;
-
- leftvol = ch->leftvol;
- rightvol = ch->rightvol;
-
- sb = ch->sfx->fetcher->getsb (ch, ch->pos, count);
- if (sb == NULL)
- return false;
-
- if (ch->sfx->format.channels == 2)
+ else if (ch->sfx->format.width == 2)
{
- // LordHavoc: stereo sound support, and optimizations
- sfx = (signed short *)sb->data + (ch->pos - sb->offset) * 2;
-
- for (i=0 ; i<count ; i++)
+ const signed short *sfx = (signed short *)sb->data + (ch->pos - sb->offset) * ch->sfx->format.channels;
+ // Stereo sound support
+ if (ch->sfx->format.channels == 2)
{
- paintbuffer[i].left += (*sfx++ * leftvol) >> 8;
- paintbuffer[i].right += (*sfx++ * rightvol) >> 8;
+ if (vol[6] + vol[7] > 0)
+ {
+ for (i = 0;i < count;i++)
+ {
+ paintbuffer[i].sample[0] += (sfx[0] * vol[0]) >> 16;
+ paintbuffer[i].sample[1] += (sfx[1] * vol[1]) >> 16;
+ paintbuffer[i].sample[2] += (sfx[0] * vol[2]) >> 16;
+ paintbuffer[i].sample[3] += (sfx[1] * vol[3]) >> 16;
+ paintbuffer[i].sample[4] += ((sfx[0]+sfx[1]) * vol[4]) >> 17;
+ paintbuffer[i].sample[5] += ((sfx[0]+sfx[1]) * vol[5]) >> 17;
+ paintbuffer[i].sample[6] += (sfx[0] * vol[6]) >> 16;
+ paintbuffer[i].sample[7] += (sfx[1] * vol[7]) >> 16;
+ sfx += 2;
+ }
+ }
+ else if (vol[4] + vol[5] > 0)
+ {
+ for (i = 0;i < count;i++)
+ {
+ paintbuffer[i].sample[0] += (sfx[0] * vol[0]) >> 16;
+ paintbuffer[i].sample[1] += (sfx[1] * vol[1]) >> 16;
+ paintbuffer[i].sample[2] += (sfx[0] * vol[2]) >> 16;
+ paintbuffer[i].sample[3] += (sfx[1] * vol[3]) >> 16;
+ paintbuffer[i].sample[4] += ((sfx[0]+sfx[1]) * vol[4]) >> 17;
+ paintbuffer[i].sample[5] += ((sfx[0]+sfx[1]) * vol[5]) >> 17;
+ sfx += 2;
+ }
+ }
+ else if (vol[2] + vol[3] > 0)
+ {
+ for (i = 0;i < count;i++)
+ {
+ paintbuffer[i].sample[0] += (sfx[0] * vol[0]) >> 16;
+ paintbuffer[i].sample[1] += (sfx[1] * vol[1]) >> 16;
+ paintbuffer[i].sample[2] += (sfx[0] * vol[2]) >> 16;
+ paintbuffer[i].sample[3] += (sfx[1] * vol[3]) >> 16;
+ sfx += 2;
+ }
+ }
+ else if (vol[0] + vol[1] > 0)
+ {
+ for (i = 0;i < count;i++)
+ {
+ paintbuffer[i].sample[0] += (sfx[0] * vol[0]) >> 16;
+ paintbuffer[i].sample[1] += (sfx[1] * vol[1]) >> 16;
+ sfx += 2;
+ }
+ }
}
- }
- else
- {
- sfx = (signed short *)sb->data + ch->pos - sb->offset;
-
- for (i=0 ; i<count ; i++)
+ else if (ch->sfx->format.channels == 1)
{
- paintbuffer[i].left += (*sfx * leftvol) >> 8;
- paintbuffer[i].right += (*sfx++ * rightvol) >> 8;
+ if (vol[6] + vol[7] > 0)
+ {
+ for (i = 0;i < count;i++)
+ {
+ paintbuffer[i].sample[0] += (sfx[0] * vol[0]) >> 16;
+ paintbuffer[i].sample[1] += (sfx[0] * vol[1]) >> 16;
+ paintbuffer[i].sample[2] += (sfx[0] * vol[2]) >> 16;
+ paintbuffer[i].sample[3] += (sfx[0] * vol[3]) >> 16;
+ paintbuffer[i].sample[4] += (sfx[0] * vol[4]) >> 16;
+ paintbuffer[i].sample[5] += (sfx[0] * vol[5]) >> 16;
+ paintbuffer[i].sample[6] += (sfx[0] * vol[6]) >> 16;
+ paintbuffer[i].sample[7] += (sfx[0] * vol[7]) >> 16;
+ sfx += 1;
+ }
+ }
+ else if (vol[4] + vol[5] > 0)
+ {
+ for (i = 0;i < count;i++)
+ {
+ paintbuffer[i].sample[0] += (sfx[0] * vol[0]) >> 16;
+ paintbuffer[i].sample[1] += (sfx[0] * vol[1]) >> 16;
+ paintbuffer[i].sample[2] += (sfx[0] * vol[2]) >> 16;
+ paintbuffer[i].sample[3] += (sfx[0] * vol[3]) >> 16;
+ paintbuffer[i].sample[4] += (sfx[0] * vol[4]) >> 16;
+ paintbuffer[i].sample[5] += (sfx[0] * vol[5]) >> 16;
+ sfx += 1;
+ }
+ }
+ else if (vol[2] + vol[3] > 0)
+ {
+ for (i = 0;i < count;i++)
+ {
+ paintbuffer[i].sample[0] += (sfx[0] * vol[0]) >> 16;
+ paintbuffer[i].sample[1] += (sfx[0] * vol[1]) >> 16;
+ paintbuffer[i].sample[2] += (sfx[0] * vol[2]) >> 16;
+ paintbuffer[i].sample[3] += (sfx[0] * vol[3]) >> 16;
+ sfx += 1;
+ }
+ }
+ else if (vol[0] + vol[1] > 0)
+ {
+ for (i = 0;i < count;i++)
+ {
+ paintbuffer[i].sample[0] += (sfx[0] * vol[0]) >> 16;
+ paintbuffer[i].sample[1] += (sfx[0] * vol[1]) >> 16;
+ sfx += 1;
+ }
+ }
}
+ else
+ return true; // unsupported number of channels in sound
}
-
ch->pos += count;
return true;
}
projects / xonotic / darkplaces.git / blobdiff