X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=snd_mix.c;h=e7396cb8b81a239600a17f41f44339a8230aa050;hp=efd562c21de80154a1082b183e2a6db1fe646155;hb=f9d8bc7ea04ff91fcbd90fe50a299b37724b349b;hpb=418e862c46c86f780f73e01e303fd039de913a48 diff --git a/snd_mix.c b/snd_mix.c index efd562c2..e7396cb8 100644 --- a/snd_mix.c +++ b/snd_mix.c @@ -17,11 +17,12 @@ 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 +// 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; @@ -30,87 +31,33 @@ typedef struct // LordHavoc: was 512, expanded to 2048 #define PAINTBUFFER_SIZE 2048 portable_samplepair_t paintbuffer[PAINTBUFFER_SIZE]; -int snd_scaletable[32][256]; -// FIXME: it desyncs with the video too easily -extern cvar_t cl_avidemo; -static qfile_t *cl_avidemo_soundfile = NULL; +// FIXME: this desyncs with the video too easily +extern qboolean cl_capturevideo_active; +extern void SCR_CaptureVideo_SoundFrame(qbyte *bufstereo16le, size_t length, int rate); void S_CaptureAVISound(portable_samplepair_t *buf, size_t length) { int n; size_t i; qbyte out[PAINTBUFFER_SIZE * 4]; - - if (cl_avidemo.value >= 0.1f) + if (!cl_capturevideo_active) + return; + // write the sound buffer as little endian 16bit interleaved stereo + for(i = 0;i < length;i++) { - if (cl_avidemo_soundfile == NULL) - { - cl_avidemo_soundfile = FS_Open ("video/dpavi.wav", "wb", false); - memset(out, 0, 44); - FS_Write (cl_avidemo_soundfile, out, 44); - // header will be filled out when file is closed - } - FS_Seek (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 (FS_Write (cl_avidemo_soundfile, out, 4 * length) < 4 * 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) - { - // file has not been closed yet, close it - FS_Seek (cl_avidemo_soundfile, 0, SEEK_END); - i = FS_Tell (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\0data****", 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->format.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->format.speed * 2 * 2; - 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; - - FS_Seek (cl_avidemo_soundfile, 0, SEEK_SET); - FS_Write (cl_avidemo_soundfile, out, 44); - FS_Close (cl_avidemo_soundfile); - cl_avidemo_soundfile = NULL; + n = buf[i].left; + n = bound(-32768, n, 32767); + out[i*4+0] = n & 0xFF; + out[i*4+1] = (n >> 8) & 0xFF; + n = buf[i].right; + 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; @@ -118,12 +65,10 @@ void S_TransferPaintBuffer(int endtime) { int i; int *snd_p; - int snd_vol; int lpaintedtime; int snd_linear_count; int val; snd_p = (int *) paintbuffer; - snd_vol = volume.value*256; lpaintedtime = paintedtime; if (shm->format.width == 2) { @@ -145,20 +90,16 @@ void S_TransferPaintBuffer(int endtime) { 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); + snd_out[i ] = bound(-32768, snd_p[i + 1], 32767); + snd_out[i + 1] = bound(-32768, snd_p[i ], 32767); } } else { for (i = 0;i < snd_linear_count;i += 2) { - val = (snd_p[i ] * snd_vol) >> 8; - snd_out[i ] = bound(-32768, val, 32767); - val = (snd_p[i + 1] * snd_vol) >> 8; - snd_out[i + 1] = bound(-32768, val, 32767); + snd_out[i ] = bound(-32768, snd_p[i ], 32767); + snd_out[i + 1] = bound(-32768, snd_p[i + 1], 32767); } } snd_p += snd_linear_count; @@ -178,7 +119,7 @@ void S_TransferPaintBuffer(int endtime) snd_linear_count = endtime - lpaintedtime; for (i = 0;i < snd_linear_count;i++) { - val = ((snd_p[i * 2 + 0] + snd_p[i * 2 + 1]) * snd_vol) >> 9; + val = (snd_p[i * 2 + 0] + snd_p[i * 2 + 1]) >> 1; snd_out[i] = bound(-32768, val, 32767); } snd_p += snd_linear_count << 1; @@ -206,9 +147,9 @@ void S_TransferPaintBuffer(int endtime) { for (i = 0;i < snd_linear_count;i += 2) { - val = ((snd_p[i + 1] * snd_vol) >> 16) + 128; + val = (snd_p[i + 1] >> 8) + 128; snd_out[i ] = bound(0, val, 255); - val = ((snd_p[i ] * snd_vol) >> 16) + 128; + val = (snd_p[i ] >> 8) + 128; snd_out[i + 1] = bound(0, val, 255); } } @@ -216,9 +157,9 @@ void S_TransferPaintBuffer(int endtime) { for (i = 0;i < snd_linear_count;i += 2) { - val = ((snd_p[i ] * snd_vol) >> 16) + 128; + val = (snd_p[i ] >> 8) + 128; snd_out[i ] = bound(0, val, 255); - val = ((snd_p[i + 1] * snd_vol) >> 16) + 128; + val = (snd_p[i + 1] >> 8) + 128; snd_out[i + 1] = bound(0, val, 255); } } @@ -239,7 +180,7 @@ void S_TransferPaintBuffer(int endtime) snd_linear_count = endtime - lpaintedtime; for (i = 0;i < snd_linear_count;i++) { - val = (((snd_p[i * 2] + snd_p[i * 2 + 1]) * snd_vol) >> 17) + 128; + val = ((snd_p[i * 2] + snd_p[i * 2 + 1]) >> 9) + 128; snd_out[i ] = bound(0, val, 255); } snd_p += snd_linear_count << 1; @@ -297,9 +238,7 @@ void S_PaintChannels(int endtime) // 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; @@ -325,7 +264,7 @@ void S_PaintChannels(int endtime) // 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; } @@ -338,7 +277,7 @@ void S_PaintChannels(int endtime) // paint up to end if (ch->end < end) - count = ch->end - ltime; + count = (int)ch->end - ltime; else count = end - ltime; @@ -350,9 +289,9 @@ void S_PaintChannels(int endtime) ch->rightvol = 255; if (sfx->format.width == 1) - stop_paint = !SND_PaintChannelFrom8(ch, count); + stop_paint = !SND_PaintChannelFrom8 (ch, count); else - stop_paint = !SND_PaintChannelFrom16(ch, count); + stop_paint = !SND_PaintChannelFrom16 (ch, count); if (!stop_paint) { @@ -391,50 +330,46 @@ void S_PaintChannels(int endtime) } } -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; -} - +// TODO: Try to merge SND_PaintChannelFrom8 and SND_PaintChannelFrom16 qboolean SND_PaintChannelFrom8 (channel_t *ch, int count) { - int *lscale, *rscale; - unsigned char *sfx; + int snd_vol, leftvol, rightvol; + const signed char *sfx; const sfxbuffer_t *sb; - int i, n; + int i; + + // 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]; + leftvol = ch->leftvol * snd_vol; + rightvol = ch->rightvol * snd_vol; sb = ch->sfx->fetcher->getsb (ch, ch->pos, count); if (sb == NULL) return false; + // Stereo sound support if (ch->sfx->format.channels == 2) { - // LordHavoc: stereo sound support, and optimizations - sfx = (unsigned char *)sb->data + (ch->pos - sb->offset) * 2; + sfx = (signed char *)sb->data + (ch->pos - sb->offset) * 2; for (i = 0;i < count;i++) { - paintbuffer[i].left += lscale[*sfx++]; - paintbuffer[i].right += rscale[*sfx++]; + paintbuffer[i].left += (*sfx++ * leftvol) >> 8; + paintbuffer[i].right += (*sfx++ * rightvol) >> 8; } } else { - sfx = (unsigned char *)sb->data + ch->pos - sb->offset; + sfx = (signed char *)sb->data + ch->pos - sb->offset; for (i = 0;i < count;i++) { - n = *sfx++; - paintbuffer[i].left += lscale[n]; - paintbuffer[i].right += rscale[n]; + paintbuffer[i].left += (*sfx * leftvol) >> 8; + paintbuffer[i].right += (*sfx++ * rightvol) >> 8; } - } ch->pos += count; return true; @@ -442,27 +377,33 @@ qboolean SND_PaintChannelFrom8 (channel_t *ch, int count) qboolean SND_PaintChannelFrom16 (channel_t *ch, int count) { - int leftvol, rightvol; + int snd_vol, leftvol, rightvol; signed short *sfx; const sfxbuffer_t *sb; int i; - leftvol = ch->leftvol; - rightvol = ch->rightvol; + // If this channel manages its own volume + if (ch->flags & CHANNELFLAG_FULLVOLUME) + snd_vol = 256; + else + snd_vol = volume.value * 256; + + leftvol = ch->leftvol * snd_vol; + rightvol = ch->rightvol * snd_vol; sb = ch->sfx->fetcher->getsb (ch, ch->pos, count); if (sb == NULL) return false; + // Stereo sound support if (ch->sfx->format.channels == 2) { - // LordHavoc: stereo sound support, and optimizations sfx = (signed short *)sb->data + (ch->pos - sb->offset) * 2; for (i=0 ; i> 8; - paintbuffer[i].right += (*sfx++ * rightvol) >> 8; + paintbuffer[i].left += (*sfx++ * leftvol) >> 16; + paintbuffer[i].right += (*sfx++ * rightvol) >> 16; } } else @@ -471,8 +412,8 @@ qboolean SND_PaintChannelFrom16 (channel_t *ch, int count) for (i=0 ; i> 8; - paintbuffer[i].right += (*sfx++ * rightvol) >> 8; + paintbuffer[i].left += (*sfx * leftvol) >> 16; + paintbuffer[i].right += (*sfx++ * rightvol) >> 16; } }