X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=snd_mix.c;h=6f92eb1348aebf82c90b1274170c911660a33cdd;hp=a006f68f7fac6ed1dceeb284b8eeb9b3402321eb;hb=05508fd28461344ad71d3fb9a25e07be53803a05;hpb=78da49ba852ed63b1079cc1ab8545e82c4abd78e diff --git a/snd_mix.c b/snd_mix.c index a006f68f..6f92eb13 100644 --- a/snd_mix.c +++ b/snd_mix.c @@ -17,36 +17,40 @@ 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 +{ + int left; + int right; +} portable_samplepair_t; // LordHavoc: was 512, expanded to 2048 #define PAINTBUFFER_SIZE 2048 portable_samplepair_t paintbuffer[PAINTBUFFER_SIZE]; -int snd_scaletable[32][256]; -/* -// LordHavoc: disabled this because it desyncs with the video too easily +// FIXME: 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) +static qfile_t *cl_avidemo_soundfile = NULL; +void S_CaptureAVISound(portable_samplepair_t *buf, size_t length) { - int i, n; + int n; + size_t i; qbyte out[PAINTBUFFER_SIZE * 4]; - char filename[MAX_OSPATH]; if (cl_avidemo.value >= 0.1f) { if (cl_avidemo_soundfile == NULL) { - sprintf (filename, "%s/dpavi.wav", com_gamedir); - cl_avidemo_soundfile = fopen(filename, "wb"); + cl_avidemo_soundfile = FS_Open ("video/dpavi.wav", "wb", false); memset(out, 0, 44); - fwrite(out, 1, 44, cl_avidemo_soundfile); + FS_Write (cl_avidemo_soundfile, out, 44); // header will be filled out when file is closed } - fseek(cl_avidemo_soundfile, 0, SEEK_END); + FS_Seek (cl_avidemo_soundfile, 0, SEEK_END); // write the sound buffer as little endian 16bit interleaved stereo for(i = 0;i < length;i++) { @@ -59,22 +63,22 @@ void S_CaptureAVISound(portable_samplepair_t *buf, int length) out[i*4+2] = n & 0xFF; out[i*4+3] = (n >> 8) & 0xFF; } - if (fwrite(out, 4, length, cl_avidemo_soundfile) < length) + if (FS_Write (cl_avidemo_soundfile, out, 4 * length) < 4 * length) { Cvar_SetValueQuick(&cl_avidemo, 0); - Con_Printf("avi saving sound failed, out of disk space? stopping avi demo capture.\n"); + 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 - fseek(cl_avidemo_soundfile, 0, SEEK_END); - i = ftell(cl_avidemo_soundfile); + 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\x00data****", 44); + 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; @@ -82,13 +86,13 @@ void S_CaptureAVISound(portable_samplepair_t *buf, int length) out[6] = (n >> 16) & 0xFF; out[7] = (n >> 24) & 0xFF; // rate - n = shm->speed; + 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->speed * 4; + n = shm->format.speed * 2 * 2; out[28] = (n) & 0xFF; out[29] = (n >> 8) & 0xFF; out[30] = (n >> 16) & 0xFF; @@ -100,14 +104,14 @@ void S_CaptureAVISound(portable_samplepair_t *buf, int length) 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); + FS_Seek (cl_avidemo_soundfile, 0, SEEK_SET); + FS_Write (cl_avidemo_soundfile, out, 44); + FS_Close (cl_avidemo_soundfile); cl_avidemo_soundfile = NULL; } } -*/ +// TODO: rewrite this function void S_TransferPaintBuffer(int endtime) { void *pbuf; @@ -115,18 +119,16 @@ 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->samplebits == 16) + if (shm->format.width == 2) { // 16bit short *snd_out; - if (shm->channels == 2) + if (shm->format.channels == 2) { // 16bit 2 channels (stereo) while (lpaintedtime < endtime) @@ -142,20 +144,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; @@ -175,7 +173,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; @@ -187,7 +185,7 @@ void S_TransferPaintBuffer(int endtime) { // 8bit unsigned char *snd_out; - if (shm->channels == 2) + if (shm->format.channels == 2) { // 8bit 2 channels (stereo) while (lpaintedtime < endtime) @@ -203,9 +201,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); } } @@ -213,9 +211,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); } } @@ -236,7 +234,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; @@ -258,15 +256,15 @@ CHANNEL MIXING =============================================================================== */ -void SND_PaintChannelFrom8 (channel_t *ch, sfxcache_t *sc, int endtime); -void SND_PaintChannelFrom16 (channel_t *ch, sfxcache_t *sc, int endtime); +qboolean SND_PaintChannelFrom8 (channel_t *ch, int endtime); +qboolean SND_PaintChannelFrom16 (channel_t *ch, int endtime); void S_PaintChannels(int endtime) { - int i; + unsigned int i; int end; channel_t *ch; - sfxcache_t *sc; + sfx_t *sfx; int ltime, count; while (paintedtime < endtime) @@ -276,25 +274,63 @@ void S_PaintChannels(int endtime) 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; for (i=0; isfx) + sfx = ch->sfx; + if (!sfx) continue; if (!ch->leftvol && !ch->rightvol) continue; - sc = S_LoadSound (ch->sfx, true); - if (!sc) + if (!S_LoadSound (sfx, true)) continue; - ltime = paintedtime; + // if the channel is paused + if (ch->flags & CHANNELFLAG_PAUSED) + { + size_t pausedtime; + pausedtime = end - paintedtime; + ch->lastptime += pausedtime; + ch->end += pausedtime; + continue; + } + + // if the sound hasn't been painted last time, update his position + if (ch->lastptime < paintedtime) + { + ch->pos += paintedtime - ch->lastptime; + + // If the sound should have ended by then + if ((unsigned int)ch->pos > sfx->total_length) + { + int loopstart; + + if (ch->flags & CHANNELFLAG_FORCELOOP) + loopstart = 0; + else + loopstart = -1; + if (sfx->loopstart >= 0) + loopstart = sfx->loopstart; + + // If the sound is looped + if (loopstart >= 0) + ch->pos = (ch->pos - sfx->total_length) % (sfx->total_length - loopstart) + loopstart; + else + ch->pos = sfx->total_length; + ch->end = paintedtime + sfx->total_length - ch->pos; + } + } + + ltime = paintedtime; while (ltime < end) { + qboolean stop_paint; + // paint up to end if (ch->end < end) count = ch->end - ltime; @@ -303,116 +339,142 @@ void S_PaintChannels(int endtime) if (count > 0) { - if (sc->width == 1) - SND_PaintChannelFrom8(ch, sc, count); + if (ch->leftvol > 255) + ch->leftvol = 255; + if (ch->rightvol > 255) + ch->rightvol = 255; + + if (sfx->format.width == 1) + stop_paint = !SND_PaintChannelFrom8 (ch, count); else - SND_PaintChannelFrom16(ch, sc, count); + stop_paint = !SND_PaintChannelFrom16 (ch, count); - ltime += count; + if (!stop_paint) + { + ltime += count; + ch->lastptime = ltime; + } } + else + stop_paint = false; - // if at end of loop, restart if (ltime >= ch->end) { - if (sc->loopstart >= 0) + // if at end of loop, restart + if ((sfx->loopstart >= 0 || (ch->flags & CHANNELFLAG_FORCELOOP)) && !stop_paint) { - ch->pos = sc->loopstart; - ch->end = ltime + sc->length - ch->pos; + ch->pos = bound(0, sfx->loopstart, (int)sfx->total_length - 1); + ch->end = ltime + sfx->total_length - ch->pos; } + // channel just stopped else - { - // channel just stopped - ch->sfx = NULL; - break; - } + stop_paint = true; + } + + if (stop_paint) + { + 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) + +// TODO: Try to merge SND_PaintChannelFrom8 and SND_PaintChannelFrom16 +qboolean SND_PaintChannelFrom8 (channel_t *ch, int count) { - int i, j; + int snd_vol, leftvol, rightvol; + const signed char *sfx; + const sfxbuffer_t *sb; + int i; - for (i = 0;i < 32;i++) - for (j = 0;j < 256;j++) - snd_scaletable[i][j] = ((signed char)j) * i * 8; -} + // 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; -void SND_PaintChannelFrom8 (channel_t *ch, sfxcache_t *sc, int count) -{ - int *lscale, *rscale; - unsigned char *sfx; - int i, n; - - if (ch->leftvol > 255) - ch->leftvol = 255; - if (ch->rightvol > 255) - ch->rightvol = 255; - - lscale = snd_scaletable[ch->leftvol >> 3]; - rscale = snd_scaletable[ch->rightvol >> 3]; - if (sc->stereo) + 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 *)sc->data + ch->pos * 2; + sfx = 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 *)sc->data + ch->pos; + sfx = 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; } -void SND_PaintChannelFrom16 (channel_t *ch, sfxcache_t *sc, 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 (sc->stereo) + // 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 *)sc->data + ch->pos * 2; + 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 { - sfx = (signed short *)sc->data + ch->pos; + sfx = (signed short *)sb->data + ch->pos - sb->offset; for (i=0 ; i> 8; - paintbuffer[i].right += (*sfx++ * rightvol) >> 8; + paintbuffer[i].left += (*sfx * leftvol) >> 16; + paintbuffer[i].right += (*sfx++ * rightvol) >> 16; } } ch->pos += count; + return true; }