quakespasm/Quake/snd_mix.c

326 lines
7 KiB
C
Raw Normal View History

/*
Copyright (C) 1996-2001 Id Software, Inc.
Copyright (C) 2010-2011 O. Sezer <sezero@users.sourceforge.net>
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
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;
short *snd_out;
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;
static void Snd_WriteLinearBlastStereo16 (void)
{
int i;
int val;
for (i = 0; i < snd_linear_count; i += 2)
{
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
val = snd_p[i] >> 8;
if (val > 0x7fff)
snd_out[i] = 0x7fff;
else if (val < (short)0x8000)
snd_out[i] = (short)0x8000;
else
snd_out[i] = val;
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
val = snd_p[i+1] >> 8;
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;
}
}
static void S_TransferStereo16 (int endtime)
{
int lpos;
int lpaintedtime;
snd_p = (int *) paintbuffer;
lpaintedtime = paintedtime;
while (lpaintedtime < endtime)
{
// handle recirculating buffer issues
lpos = lpaintedtime & ((shm->samples >> 1) - 1);
snd_out = (short *)shm->buffer + (lpos << 1);
snd_linear_count = (shm->samples >> 1) - lpos;
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;
lpaintedtime += (snd_linear_count >> 1);
}
}
static void S_TransferPaintBuffer (int endtime)
{
int out_idx, out_mask;
int count, step, val;
int *p;
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)
{
short *out = (short *)shm->buffer;
while (count--)
{
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
val = *p >> 8;
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;
}
}
else if (shm->samplebits == 8)
{
unsigned char *out = shm->buffer;
while (count--)
{
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
val = *p >> 8;
p+= step;
if (val > 0x7fff)
val = 0x7fff;
else if (val < (short)0x8000)
val = (short)0x8000;
out[out_idx] = (val >> 8) + 128;
out_idx = (out_idx + 1) & out_mask;
}
}
}
/*
===============================================================================
CHANNEL MIXING
===============================================================================
*/
static void SND_PaintChannelFrom8 (channel_t *ch, sfxcache_t *sc, int endtime);
static void SND_PaintChannelFrom16 (channel_t *ch, sfxcache_t *sc, int endtime);
void S_PaintChannels (int endtime)
{
int i;
int end, ltime, count;
channel_t *ch;
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;
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
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
if (s_rawend < paintedtime)
{ // clear
memset(paintbuffer, 0, (end - paintedtime) * sizeof(portable_samplepair_t));
}
else
{ // copy from the streaming sound source
int s;
int stop;
stop = (end < s_rawend) ? end : s_rawend;
for (i = paintedtime; i < stop; i++)
{
s = i & (MAX_RAW_SAMPLES - 1);
paintbuffer[i - paintedtime] = s_rawsamples[s];
}
// if (i != end)
// Con_Printf ("partial stream\n");
// else
// Con_Printf ("full stream\n");
for ( ; i < end; i++)
{
paintbuffer[i - paintedtime].left =
paintbuffer[i - paintedtime].right = 0;
}
}
// paint in the channels.
ch = snd_channels;
for (i = 0; i < total_channels; i++, ch++)
{
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)
{
if (sc->width == 1)
SND_PaintChannelFrom8(ch, sc, count);
else
SND_PaintChannelFrom16(ch, sc, count);
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;
}
}
}
}
// 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;
for (i = 0; i < 32; 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
scale = i * 8 * 256 * sfxvolume.value;
for (j = 0; j < 256; j++)
{
/* 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;
snd_scaletable[i][j] = ((j < 128) ? j : j - 0xff) * scale;
}
}
}
static void SND_PaintChannelFrom8 (channel_t *ch, sfxcache_t *sc, int count)
{
int data;
int *lscale, *rscale;
unsigned char *sfx;
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];
sfx = (unsigned char *)sc->data + ch->pos;
for (i = 0; i < count; i++)
{
data = sfx[i];
paintbuffer[i].left += lscale[data];
paintbuffer[i].right += rscale[data];
}
ch->pos += count;
}
static void SND_PaintChannelFrom16 (channel_t *ch, sfxcache_t *sc, int count)
{
int data;
int left, right;
int leftvol, rightvol;
signed short *sfx;
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;
leftvol >>= 8;
rightvol >>= 8;
sfx = (signed short *)sc->data + ch->pos;
for (i = 0; i < count; i++)
{
data = sfx[i];
// this was causing integer overflow as observed in quakespasm
// with the warpspasm mod moved >>8 to left/right volume above.
// left = (data * leftvol) >> 8;
// right = (data * rightvol) >> 8;
left = data * leftvol;
right = data * rightvol;
paintbuffer[i].left += left;
paintbuffer[i].right += right;
}
ch->pos += count;
}