X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=snd_mix.c;h=a006f68f7fac6ed1dceeb284b8eeb9b3402321eb;hb=00ca5f39cd5c7640de9c915c1f6792f2bd4108d9;hp=1da0fcf6f29bf8b9f08c697e9496213642fc6f10;hpb=58085f067a994572314e77c72fbe0de1af9f29f7;p=xonotic%2Fdarkplaces.git diff --git a/snd_mix.c b/snd_mix.c index 1da0fcf6..a006f68f 100644 --- a/snd_mix.c +++ b/snd_mix.c @@ -8,7 +8,7 @@ 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. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -21,252 +21,232 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" -#ifdef _WIN32 -#include "winquake.h" -#else -#define DWORD unsigned long -#endif - -#define PAINTBUFFER_SIZE 512 +// LordHavoc: was 512, expanded to 2048 +#define PAINTBUFFER_SIZE 2048 portable_samplepair_t paintbuffer[PAINTBUFFER_SIZE]; -int snd_scaletable[32][256]; -int *snd_p, snd_linear_count, snd_vol; -short *snd_out; - -void Snd_WriteLinearBlastStereo16 (void); +int snd_scaletable[32][256]; -extern cvar_t snd_swapstereo; -void Snd_WriteLinearBlastStereo16 (void) +/* +// 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) { - int i; - int val; + int i, n; + qbyte out[PAINTBUFFER_SIZE * 4]; + char filename[MAX_OSPATH]; - if (snd_swapstereo.value) + if (cl_avidemo.value >= 0.1f) { - for (i=0 ; i>8; - if (val > 0x7fff) - snd_out[i] = 0x7fff; - else if (val < (short)0x8000) - snd_out[i] = (short)0x8000; - else - snd_out[i] = val; - - val = (snd_p[i]*snd_vol)>>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; + sprintf (filename, "%s/dpavi.wav", com_gamedir); + cl_avidemo_soundfile = fopen(filename, "wb"); + memset(out, 0, 44); + fwrite(out, 1, 44, cl_avidemo_soundfile); + // header will be filled out when file is closed } - } - else - { - for (i=0 ; i>8; - if (val > 0x7fff) - snd_out[i] = 0x7fff; - else if (val < (short)0x8000) - snd_out[i] = (short)0x8000; - else - snd_out[i] = val; - - val = (snd_p[i+1]*snd_vol)>>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; + 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; } - } -} - -void S_TransferStereo16 (int endtime) -{ - int lpos; - int lpaintedtime; - DWORD *pbuf; -#ifdef _WIN32 - int reps; - DWORD dwSize,dwSize2; - DWORD *pbuf2; - HRESULT hresult; -#endif - - snd_vol = volume.value*256; - - snd_p = (int *) paintbuffer; - lpaintedtime = paintedtime; - -#ifdef _WIN32 - if (pDSBuf) - { - reps = 0; - - while ((hresult = pDSBuf->lpVtbl->Lock(pDSBuf, 0, gSndBufSize, &pbuf, &dwSize, - &pbuf2, &dwSize2, 0)) != DS_OK) + if (fwrite(out, 4, length, cl_avidemo_soundfile) < length) { - if (hresult != DSERR_BUFFERLOST) - { - Con_Printf ("S_TransferStereo16: DS::Lock Sound Buffer Failed\n"); - S_Shutdown (); - S_Startup (); - return; - } - - if (++reps > 10000) - { - Con_Printf ("S_TransferStereo16: DS: couldn't restore buffer\n"); - S_Shutdown (); - S_Startup (); - return; - } + Cvar_SetValueQuick(&cl_avidemo, 0); + Con_Printf("avi saving sound failed, out of disk space? stopping avi demo capture.\n"); } } - else -#endif + else if (cl_avidemo_soundfile) { - pbuf = (DWORD *)shm->buffer; + // 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; } - - while (lpaintedtime < endtime) - { - // handle recirculating buffer issues - lpos = lpaintedtime & ((shm->samples>>1)-1); - - snd_out = (short *) pbuf + (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); - } - -#ifdef _WIN32 - if (pDSBuf) - pDSBuf->lpVtbl->Unlock(pDSBuf, pbuf, dwSize, NULL, 0); -#endif } +*/ void S_TransferPaintBuffer(int endtime) { - int out_idx; - int count; - int out_mask; - int *p; - int step; - int val; - int snd_vol; - DWORD *pbuf; -#ifdef _WIN32 - int reps; - DWORD dwSize,dwSize2; - DWORD *pbuf2; - HRESULT hresult; -#endif - - 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; - snd_vol = volume.value*256; - -#ifdef _WIN32 - if (pDSBuf) + void *pbuf; + if ((pbuf = S_LockBuffer())) { - reps = 0; - - while ((hresult = pDSBuf->lpVtbl->Lock(pDSBuf, 0, gSndBufSize, &pbuf, &dwSize, - &pbuf2,&dwSize2, 0)) != DS_OK) + 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 (hresult != DSERR_BUFFERLOST) + // 16bit + short *snd_out; + if (shm->channels == 2) { - Con_Printf ("S_TransferPaintBuffer: DS::Lock Sound Buffer Failed\n"); - S_Shutdown (); - S_Startup (); - return; + // 16bit 2 channels (stereo) + while (lpaintedtime < endtime) + { + // 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; + if (snd_swapstereo.value) + { + 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); + } + } + 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_p += snd_linear_count; + lpaintedtime += (snd_linear_count >> 1); + } } - - if (++reps > 10000) + else { - Con_Printf ("S_TransferPaintBuffer: DS: couldn't restore buffer\n"); - S_Shutdown (); - S_Startup (); - return; + // 16bit 1 channel (mono) + while (lpaintedtime < endtime) + { + // 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++) + { + val = ((snd_p[i * 2 + 0] + snd_p[i * 2 + 1]) * snd_vol) >> 9; + snd_out[i] = bound(-32768, val, 32767); + } + snd_p += snd_linear_count << 1; + lpaintedtime += snd_linear_count; + } } } - } - else -#endif - { - pbuf = (DWORD *)shm->buffer; - } - - if (shm->samplebits == 16) - { - short *out = (short *) pbuf; - while (count--) + else { - val = (*p * snd_vol) >> 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 = (unsigned char *) pbuf; - while (count--) - { - val = (*p * snd_vol) >> 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; + // 8bit + unsigned char *snd_out; + if (shm->channels == 2) + { + // 8bit 2 channels (stereo) + while (lpaintedtime < endtime) + { + // 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; + if (snd_swapstereo.value) + { + for (i = 0;i < snd_linear_count;i += 2) + { + 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); + } + } + else + { + for (i = 0;i < snd_linear_count;i += 2) + { + 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_p += snd_linear_count; + lpaintedtime += (snd_linear_count >> 1); + } + } + else + { + // 8bit 1 channel (mono) + while (lpaintedtime < endtime) + { + // 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++) + { + val = (((snd_p[i * 2] + snd_p[i * 2 + 1]) * snd_vol) >> 17) + 128; + snd_out[i ] = bound(0, val, 255); + } + snd_p += snd_linear_count << 1; + lpaintedtime += snd_linear_count; + } + } } - } - -#ifdef _WIN32 - if (pDSBuf) { - DWORD dwNewpos, dwWrite; - int il = paintedtime; - int ir = endtime - paintedtime; - - ir += il; - - pDSBuf->lpVtbl->Unlock(pDSBuf, pbuf, dwSize, NULL, 0); - pDSBuf->lpVtbl->GetCurrentPosition(pDSBuf, &dwNewpos, &dwWrite); - -// if ((dwNewpos >= il) && (dwNewpos <= ir)) -// Con_Printf("%d-%d p %d c\n", il, ir, dwNewpos); + S_UnlockBuffer(); } -#endif } @@ -283,23 +263,23 @@ void SND_PaintChannelFrom16 (channel_t *ch, sfxcache_t *sc, int endtime); void S_PaintChannels(int endtime) { - int i; - int end; + int i; + int end; channel_t *ch; - sfxcache_t *sc; - int ltime, count; + sfxcache_t *sc; + int ltime, count; while (paintedtime < endtime) { - // if paintbuffer is smaller than DMA buffer + // if paintbuffer is smaller than DMA buffer end = endtime; if (endtime - paintedtime > PAINTBUFFER_SIZE) end = paintedtime + PAINTBUFFER_SIZE; - // clear the paint buffer - memset(paintbuffer, 0, (end - paintedtime) * sizeof(portable_samplepair_t)); + // clear the paint buffer, filling it with data from rawsamples (music/video/whatever) + S_RawSamples_Dequeue(&paintbuffer->left, end - paintedtime); - // paint in the channels. + // paint in the channels. ch = channels; for (i=0; ileftvol && !ch->rightvol) continue; - sc = S_LoadSound (ch->sfx); + sc = S_LoadSound (ch->sfx, true); if (!sc) continue; ltime = paintedtime; while (ltime < end) - { // paint up to 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 at end of loop, restart if (ltime >= ch->end) { if (sc->loopstart >= 0) @@ -338,17 +319,18 @@ void S_PaintChannels(int endtime) ch->pos = sc->loopstart; ch->end = ltime + sc->length - ch->pos; } - else - { // channel just stopped + else + { + // channel just stopped ch->sfx = NULL; break; } } } - } - // transfer out according to DMA format + // transfer out according to DMA format + //S_CaptureAVISound(paintbuffer, end - paintedtime); S_TransferPaintBuffer(end); paintedtime = end; } @@ -356,71 +338,68 @@ void S_PaintChannels(int endtime) void SND_InitScaletable (void) { - int i, j; - - for (i=0 ; i<32 ; i++) - for (j=0 ; j<256 ; j++) + int i, j; + + for (i = 0;i < 32;i++) + for (j = 0;j < 256;j++) snd_scaletable[i][j] = ((signed char)j) * i * 8; } void SND_PaintChannelFrom8 (channel_t *ch, sfxcache_t *sc, int count) { -// int data; - int *lscale, *rscale; + int *lscale, *rscale; unsigned char *sfx; - int i; + 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) // LordHavoc: stereo sound support, and optimizations + if (sc->stereo) { + // LordHavoc: stereo sound support, and optimizations sfx = (unsigned char *)sc->data + ch->pos * 2; - - for (i=0 ; idata + ch->pos; - - for (i=0 ; ipos += count; } void SND_PaintChannelFrom16 (channel_t *ch, sfxcache_t *sc, int count) { -// int data; -// int left, right; int leftvol, rightvol; signed short *sfx; - int i; + int i; leftvol = ch->leftvol; rightvol = ch->rightvol; - if (sc->stereo) // LordHavoc: stereo sound support, and optimizations + if (sc->stereo) { + // LordHavoc: stereo sound support, and optimizations sfx = (signed short *)sc->data + ch->pos * 2; for (i=0 ; i> 8); - paintbuffer[i].right += (short) ((int) (*sfx++ * rightvol) >> 8); + paintbuffer[i].left += (*sfx++ * leftvol) >> 8; + paintbuffer[i].right += (*sfx++ * rightvol) >> 8; } } else @@ -429,8 +408,8 @@ void SND_PaintChannelFrom16 (channel_t *ch, sfxcache_t *sc, int count) for (i=0 ; i> 8); - paintbuffer[i].right += (short) ((int) (*sfx++ * rightvol) >> 8); + paintbuffer[i].left += (*sfx * leftvol) >> 8; + paintbuffer[i].right += (*sfx++ * rightvol) >> 8; } }