2010-02-15 23:26:55 +00:00
|
|
|
/*
|
|
|
|
Copyright (C) 1996-2001 Id Software, Inc.
|
2011-01-30 21:34:12 +00:00
|
|
|
Copyright (C) 2010-2011 O. Sezer <sezero@users.sourceforge.net>
|
2014-09-22 08:55:46 +00:00
|
|
|
Copyright (C) 2010-2014 QuakeSpasm developers
|
2010-02-15 23:26:55 +00:00
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or
|
|
|
|
modify it under the terms of the GNU General Public License
|
|
|
|
as published by the Free Software Foundation; either version 2
|
|
|
|
of the License, or (at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
|
|
|
|
|
|
See the GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
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"
|
|
|
|
|
backports from uhexen2 source, preparing for streaming music support:
* snd_mix.c: Increased PAINTBUFFER_SIZE from 512 to 2048.
* snd_mix.c: snd_vol is static now. it is calculated in S_PaintChannels and
only used in SND_PaintChannelFrom16. all its other uses are removed from
Snd_WriteLinearBlastStereo16, S_TransferStereo16, S_TransferPaintBuffer.
The way it was, the sound volume was applied to the whole final contents
of the paint buffer, but with this new quake2+ way we can add raw samples
to the paint buffer with its own volume, such as bgmvolume. However, this
makes the snd_scaletable to be recalculated everytime the sfxvolume is,
changed, therefore it is adjusted that way to incorporate sfxvolume.
* snd_mix.c: In S_PaintChannels, check against s_rawend and copy from the
streaming sound source if necessary.
* snd_dma.c: Added old_volume to detect sfxvolume changes. Made S_Update to
compare it to sfxvolume.value and call SND_InitScaletable() if it changed.
* snd_dma.c: Add new globals s_rawsamples and s_rawend. Reset s_rawend to 0
in S_ClearBuffer. Add new function S_RawSamples, adapted from quake2 with
its 8 bit stereo playback fixed.
* snd_dma.c (S_FileExtension): Add new function which returns the given
sound file's extension including the dot, or NULL.
* q_sound.h: Add new macro MAX_RAW_SAMPLES, defined as 8192. Add externs
for new globals s_rawsamples and s_rawend. Add prototype for the new
S_RawSamples and S_FileExtension functions.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@355 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-12-30 17:11:28 +00:00
|
|
|
#define PAINTBUFFER_SIZE 2048
|
2010-02-15 23:26:55 +00:00
|
|
|
portable_samplepair_t paintbuffer[PAINTBUFFER_SIZE];
|
|
|
|
int snd_scaletable[32][256];
|
backports from uhexen2 source, preparing for streaming music support:
* snd_mix.c: Increased PAINTBUFFER_SIZE from 512 to 2048.
* snd_mix.c: snd_vol is static now. it is calculated in S_PaintChannels and
only used in SND_PaintChannelFrom16. all its other uses are removed from
Snd_WriteLinearBlastStereo16, S_TransferStereo16, S_TransferPaintBuffer.
The way it was, the sound volume was applied to the whole final contents
of the paint buffer, but with this new quake2+ way we can add raw samples
to the paint buffer with its own volume, such as bgmvolume. However, this
makes the snd_scaletable to be recalculated everytime the sfxvolume is,
changed, therefore it is adjusted that way to incorporate sfxvolume.
* snd_mix.c: In S_PaintChannels, check against s_rawend and copy from the
streaming sound source if necessary.
* snd_dma.c: Added old_volume to detect sfxvolume changes. Made S_Update to
compare it to sfxvolume.value and call SND_InitScaletable() if it changed.
* snd_dma.c: Add new globals s_rawsamples and s_rawend. Reset s_rawend to 0
in S_ClearBuffer. Add new function S_RawSamples, adapted from quake2 with
its 8 bit stereo playback fixed.
* snd_dma.c (S_FileExtension): Add new function which returns the given
sound file's extension including the dot, or NULL.
* q_sound.h: Add new macro MAX_RAW_SAMPLES, defined as 8192. Add externs
for new globals s_rawsamples and s_rawend. Add prototype for the new
S_RawSamples and S_FileExtension functions.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@355 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-12-30 17:11:28 +00:00
|
|
|
int *snd_p, snd_linear_count;
|
2010-06-03 16:28:30 +00:00
|
|
|
short *snd_out;
|
2010-02-15 23:26:55 +00:00
|
|
|
|
backports from uhexen2 source, preparing for streaming music support:
* snd_mix.c: Increased PAINTBUFFER_SIZE from 512 to 2048.
* snd_mix.c: snd_vol is static now. it is calculated in S_PaintChannels and
only used in SND_PaintChannelFrom16. all its other uses are removed from
Snd_WriteLinearBlastStereo16, S_TransferStereo16, S_TransferPaintBuffer.
The way it was, the sound volume was applied to the whole final contents
of the paint buffer, but with this new quake2+ way we can add raw samples
to the paint buffer with its own volume, such as bgmvolume. However, this
makes the snd_scaletable to be recalculated everytime the sfxvolume is,
changed, therefore it is adjusted that way to incorporate sfxvolume.
* snd_mix.c: In S_PaintChannels, check against s_rawend and copy from the
streaming sound source if necessary.
* snd_dma.c: Added old_volume to detect sfxvolume changes. Made S_Update to
compare it to sfxvolume.value and call SND_InitScaletable() if it changed.
* snd_dma.c: Add new globals s_rawsamples and s_rawend. Reset s_rawend to 0
in S_ClearBuffer. Add new function S_RawSamples, adapted from quake2 with
its 8 bit stereo playback fixed.
* snd_dma.c (S_FileExtension): Add new function which returns the given
sound file's extension including the dot, or NULL.
* q_sound.h: Add new macro MAX_RAW_SAMPLES, defined as 8192. Add externs
for new globals s_rawsamples and s_rawend. Add prototype for the new
S_RawSamples and S_FileExtension functions.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@355 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-12-30 17:11:28 +00:00
|
|
|
static int snd_vol;
|
|
|
|
|
2010-12-30 21:10:26 +00:00
|
|
|
static void Snd_WriteLinearBlastStereo16 (void)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
int val;
|
|
|
|
|
2010-06-03 16:28:30 +00:00
|
|
|
for (i = 0; i < snd_linear_count; i += 2)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
2017-07-28 20:50:03 +00:00
|
|
|
val = snd_p[i] / 256;
|
2010-02-15 23:26:55 +00:00
|
|
|
if (val > 0x7fff)
|
|
|
|
snd_out[i] = 0x7fff;
|
|
|
|
else if (val < (short)0x8000)
|
|
|
|
snd_out[i] = (short)0x8000;
|
|
|
|
else
|
|
|
|
snd_out[i] = val;
|
|
|
|
|
2017-07-28 20:50:03 +00:00
|
|
|
val = snd_p[i+1] / 256;
|
2010-02-15 23:26:55 +00:00
|
|
|
if (val > 0x7fff)
|
|
|
|
snd_out[i+1] = 0x7fff;
|
|
|
|
else if (val < (short)0x8000)
|
|
|
|
snd_out[i+1] = (short)0x8000;
|
|
|
|
else
|
|
|
|
snd_out[i+1] = val;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-12-30 21:10:26 +00:00
|
|
|
static void S_TransferStereo16 (int endtime)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
|
|
|
int lpos;
|
|
|
|
int lpaintedtime;
|
|
|
|
|
|
|
|
snd_p = (int *) paintbuffer;
|
|
|
|
lpaintedtime = paintedtime;
|
|
|
|
|
|
|
|
while (lpaintedtime < endtime)
|
|
|
|
{
|
|
|
|
// handle recirculating buffer issues
|
2010-06-03 16:28:30 +00:00
|
|
|
lpos = lpaintedtime & ((shm->samples >> 1) - 1);
|
2010-02-15 23:26:55 +00:00
|
|
|
|
2010-06-03 16:28:30 +00:00
|
|
|
snd_out = (short *)shm->buffer + (lpos << 1);
|
2010-02-15 23:26:55 +00:00
|
|
|
|
2010-06-03 16:28:30 +00:00
|
|
|
snd_linear_count = (shm->samples >> 1) - lpos;
|
2010-02-15 23:26:55 +00:00
|
|
|
if (lpaintedtime + snd_linear_count > endtime)
|
|
|
|
snd_linear_count = endtime - lpaintedtime;
|
|
|
|
|
|
|
|
snd_linear_count <<= 1;
|
|
|
|
|
|
|
|
// write a linear blast of samples
|
|
|
|
Snd_WriteLinearBlastStereo16 ();
|
|
|
|
|
|
|
|
snd_p += snd_linear_count;
|
2010-06-03 16:28:30 +00:00
|
|
|
lpaintedtime += (snd_linear_count >> 1);
|
2010-02-15 23:26:55 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-12-30 21:10:26 +00:00
|
|
|
static void S_TransferPaintBuffer (int endtime)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
2010-06-03 16:28:30 +00:00
|
|
|
int out_idx, out_mask;
|
|
|
|
int count, step, val;
|
|
|
|
int *p;
|
2010-02-15 23:26:55 +00:00
|
|
|
|
|
|
|
if (shm->samplebits == 16 && shm->channels == 2)
|
|
|
|
{
|
|
|
|
S_TransferStereo16 (endtime);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
p = (int *) paintbuffer;
|
|
|
|
count = (endtime - paintedtime) * shm->channels;
|
|
|
|
out_mask = shm->samples - 1;
|
|
|
|
out_idx = paintedtime * shm->channels & out_mask;
|
|
|
|
step = 3 - shm->channels;
|
|
|
|
|
|
|
|
if (shm->samplebits == 16)
|
|
|
|
{
|
2010-06-03 16:28:30 +00:00
|
|
|
short *out = (short *)shm->buffer;
|
2010-02-15 23:26:55 +00:00
|
|
|
while (count--)
|
|
|
|
{
|
2017-07-28 20:50:03 +00:00
|
|
|
val = *p / 256;
|
2010-02-15 23:26:55 +00:00
|
|
|
p+= step;
|
|
|
|
if (val > 0x7fff)
|
|
|
|
val = 0x7fff;
|
|
|
|
else if (val < (short)0x8000)
|
|
|
|
val = (short)0x8000;
|
|
|
|
out[out_idx] = val;
|
|
|
|
out_idx = (out_idx + 1) & out_mask;
|
|
|
|
}
|
|
|
|
}
|
2012-06-25 12:50:09 +00:00
|
|
|
else if (shm->samplebits == 8 && !shm->signed8)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
2010-06-03 16:28:30 +00:00
|
|
|
unsigned char *out = shm->buffer;
|
2010-02-15 23:26:55 +00:00
|
|
|
while (count--)
|
|
|
|
{
|
2017-07-28 20:50:03 +00:00
|
|
|
val = *p / 256;
|
2010-02-15 23:26:55 +00:00
|
|
|
p+= step;
|
|
|
|
if (val > 0x7fff)
|
|
|
|
val = 0x7fff;
|
|
|
|
else if (val < (short)0x8000)
|
|
|
|
val = (short)0x8000;
|
2017-07-28 20:50:03 +00:00
|
|
|
out[out_idx] = (val / 256) + 128;
|
2010-02-15 23:26:55 +00:00
|
|
|
out_idx = (out_idx + 1) & out_mask;
|
|
|
|
}
|
|
|
|
}
|
2012-06-25 12:50:09 +00:00
|
|
|
else if (shm->samplebits == 8) /* S8 format, e.g. with Amiga AHI */
|
|
|
|
{
|
|
|
|
signed char *out = (signed char *) shm->buffer;
|
|
|
|
while (count--)
|
|
|
|
{
|
2017-07-28 20:50:03 +00:00
|
|
|
val = *p / 256;
|
2012-06-25 12:50:09 +00:00
|
|
|
p+= step;
|
|
|
|
if (val > 0x7fff)
|
|
|
|
val = 0x7fff;
|
|
|
|
else if (val < (short)0x8000)
|
|
|
|
val = (short)0x8000;
|
2017-07-28 20:50:03 +00:00
|
|
|
out[out_idx] = (val / 256);
|
2012-06-25 12:50:09 +00:00
|
|
|
out_idx = (out_idx + 1) & out_mask;
|
|
|
|
}
|
|
|
|
}
|
2010-02-15 23:26:55 +00:00
|
|
|
}
|
|
|
|
|
2014-08-05 05:40:34 +00:00
|
|
|
/*
|
|
|
|
==============
|
|
|
|
S_MakeBlackmanWindowKernel
|
|
|
|
|
|
|
|
Makes a lowpass filter kernel, from equation 16-4 in
|
|
|
|
"The Scientist and Engineer's Guide to Digital Signal Processing"
|
|
|
|
|
|
|
|
M is the kernel size (not counting the center point), must be even
|
|
|
|
kernel has room for M+1 floats
|
|
|
|
f_c is the filter cutoff frequency, as a fraction of the samplerate
|
|
|
|
==============
|
|
|
|
*/
|
|
|
|
static void S_MakeBlackmanWindowKernel(float *kernel, int M, float f_c)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for (i = 0; i <= M; i++)
|
|
|
|
{
|
|
|
|
if (i == M/2)
|
|
|
|
{
|
|
|
|
kernel[i] = 2 * M_PI * f_c;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
kernel[i] = ( sin(2 * M_PI * f_c * (i - M/2.0)) / (i - (M/2.0)) )
|
|
|
|
* (0.42 - 0.5*cos(2 * M_PI * i / (double)M)
|
|
|
|
+ 0.08*cos(4 * M_PI * i / (double)M) );
|
|
|
|
}
|
|
|
|
}
|
2014-09-02 05:40:41 +00:00
|
|
|
|
2014-08-05 05:40:34 +00:00
|
|
|
// normalize the kernel so all of the values sum to 1
|
|
|
|
{
|
|
|
|
float sum = 0;
|
|
|
|
for (i = 0; i <= M; i++)
|
|
|
|
{
|
|
|
|
sum += kernel[i];
|
|
|
|
}
|
2014-09-02 05:40:41 +00:00
|
|
|
|
2014-08-05 05:40:34 +00:00
|
|
|
for (i = 0; i <= M; i++)
|
|
|
|
{
|
|
|
|
kernel[i] /= sum;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
float *memory; // kernelsize floats
|
|
|
|
float *kernel; // kernelsize floats
|
|
|
|
int kernelsize; // M+1, rounded up to be a multiple of 16
|
|
|
|
int M; // M value used to make kernel, even
|
|
|
|
int parity; // 0-3
|
|
|
|
float f_c; // cutoff frequency, [0..1], fraction of sample rate
|
|
|
|
} filter_t;
|
|
|
|
|
|
|
|
static void S_UpdateFilter(filter_t *filter, int M, float f_c)
|
|
|
|
{
|
|
|
|
if (filter->f_c != f_c || filter->M != M)
|
|
|
|
{
|
|
|
|
if (filter->memory != NULL) free(filter->memory);
|
|
|
|
if (filter->kernel != NULL) free(filter->kernel);
|
2014-09-02 05:40:41 +00:00
|
|
|
|
2014-08-05 05:40:34 +00:00
|
|
|
filter->M = M;
|
|
|
|
filter->f_c = f_c;
|
2014-09-02 05:40:41 +00:00
|
|
|
|
2014-08-05 05:40:34 +00:00
|
|
|
filter->parity = 0;
|
|
|
|
// M + 1 rounded up to the next multiple of 16
|
|
|
|
filter->kernelsize = (M + 1) + 16 - ((M + 1) % 16);
|
2014-09-02 05:40:41 +00:00
|
|
|
filter->memory = (float *) calloc(filter->kernelsize, sizeof(float));
|
|
|
|
filter->kernel = (float *) calloc(filter->kernelsize, sizeof(float));
|
2014-08-05 05:40:34 +00:00
|
|
|
|
|
|
|
S_MakeBlackmanWindowKernel(filter->kernel, M, f_c);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
==============
|
|
|
|
S_ApplyFilter
|
|
|
|
|
|
|
|
Lowpass-filter the given buffer containing 44100Hz audio.
|
|
|
|
|
|
|
|
As an optimization, it decimates the audio to 11025Hz (setting every sample
|
|
|
|
position that's not a multiple of 4 to 0), then convoluting with the filter
|
|
|
|
kernel is 4x faster, because we can skip 3/4 of the input samples that are
|
|
|
|
known to be 0 and skip 3/4 of the filter kernel.
|
|
|
|
==============
|
|
|
|
*/
|
|
|
|
static void S_ApplyFilter(filter_t *filter, int *data, int stride, int count)
|
|
|
|
{
|
|
|
|
int i, j;
|
|
|
|
float *input;
|
|
|
|
const int kernelsize = filter->kernelsize;
|
|
|
|
const float *kernel = filter->kernel;
|
|
|
|
int parity;
|
2014-09-02 05:40:41 +00:00
|
|
|
|
|
|
|
input = (float *) malloc(sizeof(float) * (filter->kernelsize + count));
|
2017-09-17 02:12:53 +00:00
|
|
|
if (!input)
|
|
|
|
return;
|
2014-09-02 05:40:41 +00:00
|
|
|
|
2014-08-05 05:40:34 +00:00
|
|
|
// set up the input buffer
|
|
|
|
// memory holds the previous filter->kernelsize samples of input.
|
|
|
|
memcpy(input, filter->memory, filter->kernelsize * sizeof(float));
|
|
|
|
|
|
|
|
for (i=0; i<count; i++)
|
|
|
|
{
|
|
|
|
input[filter->kernelsize+i] = data[i * stride] / (32768.0 * 256.0);
|
|
|
|
}
|
2014-09-02 05:40:41 +00:00
|
|
|
|
2014-08-05 05:40:34 +00:00
|
|
|
// copy out the last filter->kernelsize samples to 'memory' for next time
|
|
|
|
memcpy(filter->memory, input + count, filter->kernelsize * sizeof(float));
|
|
|
|
|
2014-09-02 05:40:41 +00:00
|
|
|
// apply the filter
|
2014-08-05 05:40:34 +00:00
|
|
|
parity = filter->parity;
|
2014-09-02 05:40:41 +00:00
|
|
|
|
2014-08-05 05:40:34 +00:00
|
|
|
for (i=0; i<count; i++)
|
|
|
|
{
|
|
|
|
const float *input_plus_i = input + i;
|
|
|
|
float val[4] = {0, 0, 0, 0};
|
2014-09-02 05:40:41 +00:00
|
|
|
|
2014-08-05 05:40:34 +00:00
|
|
|
for (j = (4 - parity) % 4; j < kernelsize; j+=16)
|
|
|
|
{
|
|
|
|
val[0] += kernel[j] * input_plus_i[j];
|
|
|
|
val[1] += kernel[j+4] * input_plus_i[j+4];
|
|
|
|
val[2] += kernel[j+8] * input_plus_i[j+8];
|
|
|
|
val[3] += kernel[j+12] * input_plus_i[j+12];
|
|
|
|
}
|
2014-09-02 05:40:41 +00:00
|
|
|
|
2014-08-05 05:40:34 +00:00
|
|
|
// 4.0 factor is to increase volume by 12 dB; this is to make up the
|
|
|
|
// volume drop caused by the zero-filling this filter does.
|
|
|
|
data[i * stride] = (val[0] + val[1] + val[2] + val[3])
|
|
|
|
* (32768.0 * 256.0 * 4.0);
|
2014-09-02 05:40:41 +00:00
|
|
|
|
2014-08-05 05:40:34 +00:00
|
|
|
parity = (parity + 1) % 4;
|
|
|
|
}
|
2014-09-02 05:40:41 +00:00
|
|
|
|
2014-08-05 05:40:34 +00:00
|
|
|
filter->parity = parity;
|
|
|
|
|
|
|
|
free(input);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
==============
|
|
|
|
S_LowpassFilter
|
|
|
|
|
|
|
|
lowpass filters 24-bit integer samples in 'data' (stored in 32-bit ints).
|
|
|
|
assumes 44100Hz sample rate, and lowpasses at around 5kHz
|
|
|
|
memory should be a zero-filled filter_t struct
|
|
|
|
==============
|
|
|
|
*/
|
|
|
|
static void S_LowpassFilter(int *data, int stride, int count,
|
|
|
|
filter_t *memory)
|
|
|
|
{
|
|
|
|
int M;
|
|
|
|
float bw, f_c;
|
2014-09-02 05:40:41 +00:00
|
|
|
|
2014-08-05 05:40:34 +00:00
|
|
|
switch ((int)snd_filterquality.value)
|
|
|
|
{
|
2014-09-02 05:40:41 +00:00
|
|
|
case 1:
|
|
|
|
M = 126; bw = 0.900; break;
|
|
|
|
case 2:
|
|
|
|
M = 150; bw = 0.915; break;
|
|
|
|
case 3:
|
|
|
|
M = 174; bw = 0.930; break;
|
|
|
|
case 4:
|
|
|
|
M = 198; bw = 0.945; break;
|
|
|
|
case 5:
|
|
|
|
default:
|
|
|
|
M = 222; bw = 0.960; break;
|
2014-08-05 05:40:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
f_c = (bw * 11025 / 2.0) / 44100.0;
|
2014-09-02 05:40:41 +00:00
|
|
|
|
2014-08-05 05:40:34 +00:00
|
|
|
S_UpdateFilter(memory, M, f_c);
|
|
|
|
S_ApplyFilter(memory, data, stride, count);
|
|
|
|
}
|
2010-02-15 23:26:55 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
===============================================================================
|
|
|
|
|
|
|
|
CHANNEL MIXING
|
|
|
|
|
|
|
|
===============================================================================
|
|
|
|
*/
|
|
|
|
|
2014-01-12 02:55:04 +00:00
|
|
|
static void SND_PaintChannelFrom8 (channel_t *ch, sfxcache_t *sc, int endtime, int paintbufferstart);
|
|
|
|
static void SND_PaintChannelFrom16 (channel_t *ch, sfxcache_t *sc, int endtime, int paintbufferstart);
|
2010-02-15 23:26:55 +00:00
|
|
|
|
2010-06-03 16:28:30 +00:00
|
|
|
void S_PaintChannels (int endtime)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
2010-06-03 16:28:30 +00:00
|
|
|
int i;
|
|
|
|
int end, ltime, count;
|
|
|
|
channel_t *ch;
|
2010-02-15 23:26:55 +00:00
|
|
|
sfxcache_t *sc;
|
|
|
|
|
backports from uhexen2 source, preparing for streaming music support:
* snd_mix.c: Increased PAINTBUFFER_SIZE from 512 to 2048.
* snd_mix.c: snd_vol is static now. it is calculated in S_PaintChannels and
only used in SND_PaintChannelFrom16. all its other uses are removed from
Snd_WriteLinearBlastStereo16, S_TransferStereo16, S_TransferPaintBuffer.
The way it was, the sound volume was applied to the whole final contents
of the paint buffer, but with this new quake2+ way we can add raw samples
to the paint buffer with its own volume, such as bgmvolume. However, this
makes the snd_scaletable to be recalculated everytime the sfxvolume is,
changed, therefore it is adjusted that way to incorporate sfxvolume.
* snd_mix.c: In S_PaintChannels, check against s_rawend and copy from the
streaming sound source if necessary.
* snd_dma.c: Added old_volume to detect sfxvolume changes. Made S_Update to
compare it to sfxvolume.value and call SND_InitScaletable() if it changed.
* snd_dma.c: Add new globals s_rawsamples and s_rawend. Reset s_rawend to 0
in S_ClearBuffer. Add new function S_RawSamples, adapted from quake2 with
its 8 bit stereo playback fixed.
* snd_dma.c (S_FileExtension): Add new function which returns the given
sound file's extension including the dot, or NULL.
* q_sound.h: Add new macro MAX_RAW_SAMPLES, defined as 8192. Add externs
for new globals s_rawsamples and s_rawend. Add prototype for the new
S_RawSamples and S_FileExtension functions.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@355 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-12-30 17:11:28 +00:00
|
|
|
snd_vol = sfxvolume.value * 256;
|
|
|
|
|
2010-02-15 23:26:55 +00:00
|
|
|
while (paintedtime < endtime)
|
|
|
|
{
|
|
|
|
// if paintbuffer is smaller than DMA buffer
|
|
|
|
end = endtime;
|
|
|
|
if (endtime - paintedtime > PAINTBUFFER_SIZE)
|
|
|
|
end = paintedtime + PAINTBUFFER_SIZE;
|
|
|
|
|
|
|
|
// clear the paint buffer
|
2014-08-05 05:40:34 +00:00
|
|
|
memset(paintbuffer, 0, (end - paintedtime) * sizeof(portable_samplepair_t));
|
2010-02-15 23:26:55 +00:00
|
|
|
|
|
|
|
// paint in the channels.
|
2010-06-03 17:25:24 +00:00
|
|
|
ch = snd_channels;
|
2010-06-03 16:28:30 +00:00
|
|
|
for (i = 0; i < total_channels; i++, ch++)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
|
|
|
if (!ch->sfx)
|
|
|
|
continue;
|
|
|
|
if (!ch->leftvol && !ch->rightvol)
|
|
|
|
continue;
|
|
|
|
sc = S_LoadSound (ch->sfx);
|
|
|
|
if (!sc)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
ltime = paintedtime;
|
|
|
|
|
|
|
|
while (ltime < end)
|
|
|
|
{ // paint up to end
|
|
|
|
if (ch->end < end)
|
|
|
|
count = ch->end - ltime;
|
|
|
|
else
|
|
|
|
count = end - ltime;
|
|
|
|
|
|
|
|
if (count > 0)
|
|
|
|
{
|
2014-01-12 02:55:04 +00:00
|
|
|
// the last param to SND_PaintChannelFrom is the index
|
|
|
|
// to start painting to in the paintbuffer, usually 0.
|
2010-02-15 23:26:55 +00:00
|
|
|
if (sc->width == 1)
|
2014-01-12 02:55:04 +00:00
|
|
|
SND_PaintChannelFrom8(ch, sc, count, ltime - paintedtime);
|
2010-02-15 23:26:55 +00:00
|
|
|
else
|
2014-01-12 02:55:04 +00:00
|
|
|
SND_PaintChannelFrom16(ch, sc, count, ltime - paintedtime);
|
2010-02-15 23:26:55 +00:00
|
|
|
|
|
|
|
ltime += count;
|
|
|
|
}
|
|
|
|
|
|
|
|
// if at end of loop, restart
|
|
|
|
if (ltime >= ch->end)
|
|
|
|
{
|
|
|
|
if (sc->loopstart >= 0)
|
|
|
|
{
|
|
|
|
ch->pos = sc->loopstart;
|
|
|
|
ch->end = ltime + sc->length - ch->pos;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{ // channel just stopped
|
|
|
|
ch->sfx = NULL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-08-05 05:40:34 +00:00
|
|
|
// clip each sample to 0dB, then reduce by 6dB (to leave some headroom for
|
|
|
|
// the lowpass filter and the music). the lowpass will smooth out the
|
|
|
|
// clipping
|
|
|
|
for (i=0; i<end-paintedtime; i++)
|
|
|
|
{
|
2017-07-28 20:50:03 +00:00
|
|
|
paintbuffer[i].left = CLAMP(-32768 * 256, paintbuffer[i].left, 32767 * 256) / 2;
|
|
|
|
paintbuffer[i].right = CLAMP(-32768 * 256, paintbuffer[i].right, 32767 * 256) / 2;
|
2014-08-05 05:40:34 +00:00
|
|
|
}
|
2014-09-02 05:40:41 +00:00
|
|
|
|
2014-08-05 05:40:34 +00:00
|
|
|
// apply a lowpass filter
|
|
|
|
if (sndspeed.value == 11025 && shm->speed == 44100)
|
|
|
|
{
|
|
|
|
static filter_t memory_l, memory_r;
|
|
|
|
S_LowpassFilter((int *)paintbuffer, 2, end - paintedtime, &memory_l);
|
|
|
|
S_LowpassFilter(((int *)paintbuffer) + 1, 2, end - paintedtime, &memory_r);
|
|
|
|
}
|
2014-09-02 05:40:41 +00:00
|
|
|
|
2014-08-05 05:40:34 +00:00
|
|
|
// paint in the music
|
|
|
|
if (s_rawend >= paintedtime)
|
|
|
|
{ // copy from the streaming sound source
|
|
|
|
int s;
|
|
|
|
int stop;
|
2014-09-02 05:40:41 +00:00
|
|
|
|
2014-08-05 05:40:34 +00:00
|
|
|
stop = (end < s_rawend) ? end : s_rawend;
|
2014-09-02 05:40:41 +00:00
|
|
|
|
2014-08-05 05:40:34 +00:00
|
|
|
for (i = paintedtime; i < stop; i++)
|
|
|
|
{
|
|
|
|
s = i & (MAX_RAW_SAMPLES - 1);
|
|
|
|
// lower music by 6db to match sfx
|
2017-07-28 20:50:03 +00:00
|
|
|
paintbuffer[i - paintedtime].left += s_rawsamples[s].left / 2;
|
|
|
|
paintbuffer[i - paintedtime].right += s_rawsamples[s].right / 2;
|
2014-08-05 05:40:34 +00:00
|
|
|
}
|
|
|
|
// if (i != end)
|
|
|
|
// Con_Printf ("partial stream\n");
|
|
|
|
// else
|
|
|
|
// Con_Printf ("full stream\n");
|
|
|
|
}
|
2014-09-02 05:40:41 +00:00
|
|
|
|
2010-02-15 23:26:55 +00:00
|
|
|
// transfer out according to DMA format
|
|
|
|
S_TransferPaintBuffer(end);
|
|
|
|
paintedtime = end;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void SND_InitScaletable (void)
|
|
|
|
{
|
|
|
|
int i, j;
|
backports from uhexen2 source, preparing for streaming music support:
* snd_mix.c: Increased PAINTBUFFER_SIZE from 512 to 2048.
* snd_mix.c: snd_vol is static now. it is calculated in S_PaintChannels and
only used in SND_PaintChannelFrom16. all its other uses are removed from
Snd_WriteLinearBlastStereo16, S_TransferStereo16, S_TransferPaintBuffer.
The way it was, the sound volume was applied to the whole final contents
of the paint buffer, but with this new quake2+ way we can add raw samples
to the paint buffer with its own volume, such as bgmvolume. However, this
makes the snd_scaletable to be recalculated everytime the sfxvolume is,
changed, therefore it is adjusted that way to incorporate sfxvolume.
* snd_mix.c: In S_PaintChannels, check against s_rawend and copy from the
streaming sound source if necessary.
* snd_dma.c: Added old_volume to detect sfxvolume changes. Made S_Update to
compare it to sfxvolume.value and call SND_InitScaletable() if it changed.
* snd_dma.c: Add new globals s_rawsamples and s_rawend. Reset s_rawend to 0
in S_ClearBuffer. Add new function S_RawSamples, adapted from quake2 with
its 8 bit stereo playback fixed.
* snd_dma.c (S_FileExtension): Add new function which returns the given
sound file's extension including the dot, or NULL.
* q_sound.h: Add new macro MAX_RAW_SAMPLES, defined as 8192. Add externs
for new globals s_rawsamples and s_rawend. Add prototype for the new
S_RawSamples and S_FileExtension functions.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@355 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-12-30 17:11:28 +00:00
|
|
|
int scale;
|
2010-02-15 23:26:55 +00:00
|
|
|
|
2010-06-03 16:28:30 +00:00
|
|
|
for (i = 0; i < 32; i++)
|
2010-02-20 00:25:33 +00:00
|
|
|
{
|
backports from uhexen2 source, preparing for streaming music support:
* snd_mix.c: Increased PAINTBUFFER_SIZE from 512 to 2048.
* snd_mix.c: snd_vol is static now. it is calculated in S_PaintChannels and
only used in SND_PaintChannelFrom16. all its other uses are removed from
Snd_WriteLinearBlastStereo16, S_TransferStereo16, S_TransferPaintBuffer.
The way it was, the sound volume was applied to the whole final contents
of the paint buffer, but with this new quake2+ way we can add raw samples
to the paint buffer with its own volume, such as bgmvolume. However, this
makes the snd_scaletable to be recalculated everytime the sfxvolume is,
changed, therefore it is adjusted that way to incorporate sfxvolume.
* snd_mix.c: In S_PaintChannels, check against s_rawend and copy from the
streaming sound source if necessary.
* snd_dma.c: Added old_volume to detect sfxvolume changes. Made S_Update to
compare it to sfxvolume.value and call SND_InitScaletable() if it changed.
* snd_dma.c: Add new globals s_rawsamples and s_rawend. Reset s_rawend to 0
in S_ClearBuffer. Add new function S_RawSamples, adapted from quake2 with
its 8 bit stereo playback fixed.
* snd_dma.c (S_FileExtension): Add new function which returns the given
sound file's extension including the dot, or NULL.
* q_sound.h: Add new macro MAX_RAW_SAMPLES, defined as 8192. Add externs
for new globals s_rawsamples and s_rawend. Add prototype for the new
S_RawSamples and S_FileExtension functions.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@355 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-12-30 17:11:28 +00:00
|
|
|
scale = i * 8 * 256 * sfxvolume.value;
|
2010-06-03 16:28:30 +00:00
|
|
|
for (j = 0; j < 256; j++)
|
2011-02-21 18:03:35 +00:00
|
|
|
{
|
2010-02-20 00:25:33 +00:00
|
|
|
/* When compiling with gcc-4.1.0 at optimisations O1 and
|
|
|
|
higher, the tricky signed char type conversion is not
|
|
|
|
guaranteed. Therefore we explicity calculate the signed
|
|
|
|
value from the index as required. From Kevin Shanahan.
|
|
|
|
See: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=26719
|
|
|
|
*/
|
backports from uhexen2 source, preparing for streaming music support:
* snd_mix.c: Increased PAINTBUFFER_SIZE from 512 to 2048.
* snd_mix.c: snd_vol is static now. it is calculated in S_PaintChannels and
only used in SND_PaintChannelFrom16. all its other uses are removed from
Snd_WriteLinearBlastStereo16, S_TransferStereo16, S_TransferPaintBuffer.
The way it was, the sound volume was applied to the whole final contents
of the paint buffer, but with this new quake2+ way we can add raw samples
to the paint buffer with its own volume, such as bgmvolume. However, this
makes the snd_scaletable to be recalculated everytime the sfxvolume is,
changed, therefore it is adjusted that way to incorporate sfxvolume.
* snd_mix.c: In S_PaintChannels, check against s_rawend and copy from the
streaming sound source if necessary.
* snd_dma.c: Added old_volume to detect sfxvolume changes. Made S_Update to
compare it to sfxvolume.value and call SND_InitScaletable() if it changed.
* snd_dma.c: Add new globals s_rawsamples and s_rawend. Reset s_rawend to 0
in S_ClearBuffer. Add new function S_RawSamples, adapted from quake2 with
its 8 bit stereo playback fixed.
* snd_dma.c (S_FileExtension): Add new function which returns the given
sound file's extension including the dot, or NULL.
* q_sound.h: Add new macro MAX_RAW_SAMPLES, defined as 8192. Add externs
for new globals s_rawsamples and s_rawend. Add prototype for the new
S_RawSamples and S_FileExtension functions.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@355 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-12-30 17:11:28 +00:00
|
|
|
// snd_scaletable[i][j] = ((signed char)j) * scale;
|
2013-01-11 20:58:08 +00:00
|
|
|
snd_scaletable[i][j] = ((j < 128) ? j : j - 256) * scale;
|
2011-02-21 18:03:35 +00:00
|
|
|
}
|
2010-02-20 00:25:33 +00:00
|
|
|
}
|
2010-02-15 23:26:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-01-12 02:55:04 +00:00
|
|
|
static void SND_PaintChannelFrom8 (channel_t *ch, sfxcache_t *sc, int count, int paintbufferstart)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
2010-06-03 16:28:30 +00:00
|
|
|
int data;
|
2010-02-15 23:26:55 +00:00
|
|
|
int *lscale, *rscale;
|
2010-06-03 16:28:30 +00:00
|
|
|
unsigned char *sfx;
|
2010-02-15 23:26:55 +00:00
|
|
|
int i;
|
|
|
|
|
|
|
|
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];
|
2011-02-21 18:03:35 +00:00
|
|
|
sfx = (unsigned char *)sc->data + ch->pos;
|
2010-02-15 23:26:55 +00:00
|
|
|
|
2010-06-03 16:28:30 +00:00
|
|
|
for (i = 0; i < count; i++)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
|
|
|
data = sfx[i];
|
2014-01-12 02:55:04 +00:00
|
|
|
paintbuffer[paintbufferstart + i].left += lscale[data];
|
|
|
|
paintbuffer[paintbufferstart + i].right += rscale[data];
|
2010-02-15 23:26:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
ch->pos += count;
|
|
|
|
}
|
|
|
|
|
2014-01-12 02:55:04 +00:00
|
|
|
static void SND_PaintChannelFrom16 (channel_t *ch, sfxcache_t *sc, int count, int paintbufferstart)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
2010-06-03 16:28:30 +00:00
|
|
|
int data;
|
|
|
|
int left, right;
|
|
|
|
int leftvol, rightvol;
|
|
|
|
signed short *sfx;
|
2010-02-15 23:26:55 +00:00
|
|
|
int i;
|
|
|
|
|
backports from uhexen2 source, preparing for streaming music support:
* snd_mix.c: Increased PAINTBUFFER_SIZE from 512 to 2048.
* snd_mix.c: snd_vol is static now. it is calculated in S_PaintChannels and
only used in SND_PaintChannelFrom16. all its other uses are removed from
Snd_WriteLinearBlastStereo16, S_TransferStereo16, S_TransferPaintBuffer.
The way it was, the sound volume was applied to the whole final contents
of the paint buffer, but with this new quake2+ way we can add raw samples
to the paint buffer with its own volume, such as bgmvolume. However, this
makes the snd_scaletable to be recalculated everytime the sfxvolume is,
changed, therefore it is adjusted that way to incorporate sfxvolume.
* snd_mix.c: In S_PaintChannels, check against s_rawend and copy from the
streaming sound source if necessary.
* snd_dma.c: Added old_volume to detect sfxvolume changes. Made S_Update to
compare it to sfxvolume.value and call SND_InitScaletable() if it changed.
* snd_dma.c: Add new globals s_rawsamples and s_rawend. Reset s_rawend to 0
in S_ClearBuffer. Add new function S_RawSamples, adapted from quake2 with
its 8 bit stereo playback fixed.
* snd_dma.c (S_FileExtension): Add new function which returns the given
sound file's extension including the dot, or NULL.
* q_sound.h: Add new macro MAX_RAW_SAMPLES, defined as 8192. Add externs
for new globals s_rawsamples and s_rawend. Add prototype for the new
S_RawSamples and S_FileExtension functions.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@355 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-12-30 17:11:28 +00:00
|
|
|
leftvol = ch->leftvol * snd_vol;
|
|
|
|
rightvol = ch->rightvol * snd_vol;
|
2017-07-28 20:50:03 +00:00
|
|
|
leftvol /= 256;
|
|
|
|
rightvol /= 256;
|
2010-02-15 23:26:55 +00:00
|
|
|
sfx = (signed short *)sc->data + ch->pos;
|
|
|
|
|
2010-06-03 16:28:30 +00:00
|
|
|
for (i = 0; i < count; i++)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
|
|
|
data = sfx[i];
|
2011-01-18 06:50:35 +00:00
|
|
|
// this was causing integer overflow as observed in quakespasm
|
2011-01-22 20:11:46 +00:00
|
|
|
// with the warpspasm mod moved >>8 to left/right volume above.
|
2011-01-18 06:50:35 +00:00
|
|
|
// left = (data * leftvol) >> 8;
|
|
|
|
// right = (data * rightvol) >> 8;
|
|
|
|
left = data * leftvol;
|
|
|
|
right = data * rightvol;
|
2014-01-12 02:55:04 +00:00
|
|
|
paintbuffer[paintbufferstart + i].left += left;
|
|
|
|
paintbuffer[paintbufferstart + i].right += right;
|
2010-02-15 23:26:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
ch->pos += count;
|
|
|
|
}
|
|
|
|
|