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.
#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);
+/*
+// 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, n;
+ 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");
+ memset(out, 0, 44);
+ fwrite(out, 1, 44, cl_avidemo_soundfile);
+ // header will be filled out when file is closed
+ }
+ fseek(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 (fwrite(out, 4, length, cl_avidemo_soundfile) < length)
+ {
+ Cvar_SetValueQuick(&cl_avidemo, 0);
+ Con_Printf("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);
+
+ //"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;
+ }
+}
+*/
-extern cvar_t snd_swapstereo;
-#if !id386
void Snd_WriteLinearBlastStereo16 (void)
{
int i;
for (i=0 ; i<snd_linear_count ; i+=2)
{
val = (snd_p[i+1]*snd_vol)>>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;
+ 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;
- if (val > 0x7fff)
- snd_out[i] = 0x7fff;
- else if (val < (short)0x8000)
- snd_out[i] = (short)0x8000;
- else
- snd_out[i] = val;
-
+ snd_out[i] = bound(-32768, val, 32767);
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;
+ snd_out[i+1] = bound(-32768, val, 32767);
}
}
}
-#endif
void S_TransferStereo16 (int endtime)
{
{
reps = 0;
- while ((hresult = pDSBuf->lpVtbl->Lock(pDSBuf, 0, gSndBufSize, &pbuf, &dwSize,
- &pbuf2, &dwSize2, 0)) != DS_OK)
+ while ((hresult = pDSBuf->lpVtbl->Lock(pDSBuf, 0, gSndBufSize, &pbuf, &dwSize, &pbuf2, &dwSize2, 0)) != DS_OK)
{
if (hresult != DSERR_BUFFERLOST)
{
S_TransferStereo16 (endtime);
return;
}
-
+
p = (int *) paintbuffer;
count = (endtime - paintedtime) * shm->channels;
- out_mask = shm->samples - 1;
+ out_mask = shm->samples - 1;
out_idx = paintedtime * shm->channels & out_mask;
step = 3 - shm->channels;
snd_vol = volume.value*256;
{
reps = 0;
- while ((hresult = pDSBuf->lpVtbl->Lock(pDSBuf, 0, gSndBufSize, &pbuf, &dwSize,
- &pbuf2,&dwSize2, 0)) != DS_OK)
+ while ((hresult = pDSBuf->lpVtbl->Lock(pDSBuf, 0, gSndBufSize, &pbuf, &dwSize, &pbuf2,&dwSize2, 0)) != DS_OK)
{
if (hresult != DSERR_BUFFERLOST)
{
while (count--)
{
val = (*p * snd_vol) >> 8;
+ out[out_idx] = bound(-32768, val, 32767);
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;
}
}
unsigned char *out = (unsigned char *) pbuf;
while (count--)
{
- val = (*p * snd_vol) >> 8;
+ val = ((*p * snd_vol) >> 16) + 128;
+ out[out_idx] = bound(0, val, 255);
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;
}
}
#ifdef _WIN32
- if (pDSBuf) {
+ if (pDSBuf)
+ {
DWORD dwNewpos, dwWrite;
int il = paintedtime;
int ir = endtime - paintedtime;
-
+
ir += il;
pDSBuf->lpVtbl->Unlock(pDSBuf, pbuf, dwSize, NULL, 0);
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
+ // clear the paint buffer
memset(paintbuffer, 0, (end - paintedtime) * sizeof(portable_samplepair_t));
- // paint in the channels.
+ // paint in the channels.
ch = channels;
for (i=0; i<total_channels ; i++, ch++)
{
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)
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;
}
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;
}
-#if !id386
-
void SND_PaintChannelFrom8 (channel_t *ch, sfxcache_t *sc, int count)
{
// int data;
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 ; i<count ; i++)
paintbuffer[i].left += lscale[*sfx];
paintbuffer[i].right += rscale[*sfx++];
}
-
+
}
ch->pos += count;
}
-#endif // !id386
-
-
void SND_PaintChannelFrom16 (channel_t *ch, sfxcache_t *sc, int count)
{
// int data;
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<count ; i++)
{
- paintbuffer[i].left += (short) ((int) (*sfx++ * leftvol) >> 8);
- paintbuffer[i].right += (short) ((int) (*sfx++ * rightvol) >> 8);
+ paintbuffer[i].left += (*sfx++ * leftvol) >> 8;
+ paintbuffer[i].right += (*sfx++ * rightvol) >> 8;
}
}
else
for (i=0 ; i<count ; i++)
{
- paintbuffer[i].left += (short) ((int) (*sfx * leftvol) >> 8);
- paintbuffer[i].right += (short) ((int) (*sfx++ * rightvol) >> 8);
+ paintbuffer[i].left += (*sfx * leftvol) >> 8;
+ paintbuffer[i].right += (*sfx++ * rightvol) >> 8;
}
}
projects / xonotic / darkplaces.git / blobdiff