#include "quakedef.h"
-#ifdef _WIN32
-#include "winquake.h"
-#else
-#define DWORD unsigned long
-#endif
-
// LordHavoc: was 512, expanded to 2048
-#define PAINTBUFFER_SIZE 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;
+int snd_scaletable[32][256];
/*
// LordHavoc: disabled this because it desyncs with the video too easily
{
if (cl_avidemo_soundfile == NULL)
{
- sprintf (filename, "%s/dpavi.wav", com_gamedir);
- cl_avidemo_soundfile = fopen(filename, "wb");
+ cl_avidemo_soundfile = FS_Open ("dpavi.wav", "wb", false);
memset(out, 0, 44);
fwrite(out, 1, 44, cl_avidemo_soundfile);
// header will be filled out when file is closed
}
*/
-void Snd_WriteLinearBlastStereo16 (void)
-{
- int i;
- int val;
-
- 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);
- }
- }
-}
-
-void S_TransferStereo16 (int endtime)
+void S_TransferPaintBuffer(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)
+ 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_TransferStereo16: 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_TransferStereo16: 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;
- }
-
- 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)
- {
- reps = 0;
-
- while ((hresult = pDSBuf->lpVtbl->Lock(pDSBuf, 0, gSndBufSize, &pbuf, &dwSize, &pbuf2,&dwSize2, 0)) != DS_OK)
+ else
{
- if (hresult != DSERR_BUFFERLOST)
+ // 8bit
+ unsigned char *snd_out;
+ if (shm->channels == 2)
{
- Con_Printf ("S_TransferPaintBuffer: DS::Lock Sound Buffer Failed\n");
- S_Shutdown ();
- S_Startup ();
- return;
+ // 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);
+ }
}
-
- if (++reps > 10000)
+ else
{
- Con_Printf ("S_TransferPaintBuffer: DS: couldn't restore buffer\n");
- S_Shutdown ();
- S_Startup ();
- return;
+ // 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;
+ }
}
}
- }
- else
-#endif
- {
- pbuf = (DWORD *)shm->buffer;
- }
-
- if (shm->samplebits == 16)
- {
- short *out = (short *) pbuf;
- while (count--)
- {
- val = (*p * snd_vol) >> 8;
- out[out_idx] = bound(-32768, val, 32767);
- p+= step;
- out_idx = (out_idx + 1) & out_mask;
- }
- }
- else if (shm->samplebits == 8)
- {
- unsigned char *out = (unsigned char *) pbuf;
- while (count--)
- {
- val = ((*p * snd_vol) >> 16) + 128;
- out[out_idx] = bound(0, val, 255);
- p+= step;
- out_idx = (out_idx + 1) & out_mask;
- }
- }
-
-#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
}
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 (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.
ch = channels;
continue;
if (!ch->leftvol && !ch->rightvol)
continue;
- sc = S_LoadSound (ch->sfx);
+ sc = S_LoadSound (ch->sfx, true);
if (!sc)
continue;
// if at end of loop, restart
if (ltime >= ch->end)
{
- if (sc->loopstart >= 0)
+ if (sc->loopstart >= 0 || ch->forceloop)
{
- ch->pos = sc->loopstart;
+ ch->pos = bound(0, sc->loopstart, sc->length - 1);
ch->end = ltime + sc->length - ch->pos;
}
else
}
}
}
-
}
// transfer out according to DMA format
void SND_InitScaletable (void)
{
- int i, j;
+ int i, j;
- for (i=0 ; i<32 ; i++)
- for (j=0 ; j<256 ; 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;
{
// LordHavoc: stereo sound support, and optimizations
sfx = (unsigned char *)sc->data + ch->pos * 2;
-
- for (i=0 ; i<count ; i++)
+ for (i = 0;i < count;i++)
{
paintbuffer[i].left += lscale[*sfx++];
paintbuffer[i].right += rscale[*sfx++];
}
-
}
else
{
sfx = (unsigned char *)sc->data + ch->pos;
-
- for (i=0 ; i<count ; i++)
+ for (i = 0;i < count;i++)
{
- paintbuffer[i].left += lscale[*sfx];
- paintbuffer[i].right += rscale[*sfx++];
+ n = *sfx++;
+ paintbuffer[i].left += lscale[n];
+ paintbuffer[i].right += rscale[n];
}
}
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;
projects / xonotic / darkplaces.git / blobdiff