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.
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-// snd_mix.c -- portable code to mix sounds for snd_dma.c
#include "quakedef.h"
+#include "snd_main.h"
-#ifdef _WIN32
-#include "winquake.h"
-#else
-#define DWORD unsigned long
-#endif
+
+typedef struct portable_samplepair_s
+{
+ int sample[SND_LISTENERS];
+} portable_sampleframe_t;
// 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;
+#define PAINTBUFFER_SIZE 2048
+portable_sampleframe_t paintbuffer[PAINTBUFFER_SIZE];
-void Snd_WriteLinearBlastStereo16 (void);
-extern cvar_t snd_swapstereo;
-void Snd_WriteLinearBlastStereo16 (void)
+extern void SCR_CaptureVideo_SoundFrame(unsigned char *bufstereo16le, size_t length, int rate);
+static void S_CaptureAVISound(size_t length)
{
- int i;
- int val;
+ size_t i;
+ unsigned char out[PAINTBUFFER_SIZE * 4];
+ unsigned char* out_ptr;
- 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
+ if (!cls.capturevideo.active)
+ return;
+
+ // write the sound buffer as little endian 16bit interleaved stereo
+ for(i = 0, out_ptr = out; i < length; i++, out_ptr += 4)
{
- 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);
- }
+ int n0, n1;
+
+ n0 = paintbuffer[i].sample[0];
+ n0 = bound(-32768, n0, 32767);
+ out_ptr[0] = (unsigned char)n0;
+ out_ptr[1] = (unsigned char)(n0 >> 8);
+
+ n1 = paintbuffer[i].sample[1];
+ n1 = bound(-32768, n1, 32767);
+ out_ptr[2] = (unsigned char)n1;
+ out_ptr[3] = (unsigned char)(n1 >> 8);
}
+ SCR_CaptureVideo_SoundFrame(out, length, snd_renderbuffer->format.speed);
}
-void S_TransferStereo16 (int endtime)
+static unsigned int S_TransferPaintBuffer(snd_ringbuffer_t* rb, unsigned int starttime, unsigned 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;
+ unsigned int partialend;
- snd_p = (int *) paintbuffer;
- lpaintedtime = paintedtime;
+ // Lock submitbuffer
+ if (!simsound && !SndSys_LockRenderBuffer())
+ return 0;
-#ifdef _WIN32
- if (pDSBuf)
+ partialend = starttime;
+ while (partialend < endtime) // handle recirculating buffer issues
{
- reps = 0;
+ unsigned int startoffset, maxframes, nbframes, i;
+ void *rb_ptr;
+ portable_sampleframe_t *painted_ptr;
+ int val;
+
+ startoffset = partialend % rb->maxframes;
+ maxframes = rb->maxframes - startoffset;
+ nbframes = endtime - partialend;
+ if (nbframes > maxframes)
+ nbframes = maxframes;
- while ((hresult = pDSBuf->lpVtbl->Lock(pDSBuf, 0, gSndBufSize, &pbuf, &dwSize, &pbuf2, &dwSize2, 0)) != DS_OK)
+ rb_ptr = &rb->ring[startoffset * rb->format.width * rb->format.channels];
+ painted_ptr = &paintbuffer[partialend - starttime];
+
+ if (rb->format.width == 2) // 16bit
{
- if (hresult != DSERR_BUFFERLOST)
+ short *snd_out = (short*)rb_ptr;
+ if (rb->format.channels == 8) // 7.1 surround
{
- Con_Printf ("S_TransferStereo16: DS::Lock Sound Buffer Failed\n");
- S_Shutdown ();
- S_Startup ();
- return;
+ for (i = 0;i < nbframes;i++, painted_ptr++)
+ {
+ *snd_out++ = bound(-32768, painted_ptr->sample[0], 32767);
+ *snd_out++ = bound(-32768, painted_ptr->sample[1], 32767);
+ *snd_out++ = bound(-32768, painted_ptr->sample[2], 32767);
+ *snd_out++ = bound(-32768, painted_ptr->sample[3], 32767);
+ *snd_out++ = bound(-32768, painted_ptr->sample[4], 32767);
+ *snd_out++ = bound(-32768, painted_ptr->sample[5], 32767);
+ *snd_out++ = bound(-32768, painted_ptr->sample[6], 32767);
+ *snd_out++ = bound(-32768, painted_ptr->sample[7], 32767);
+ }
}
-
- if (++reps > 10000)
+ else if (rb->format.channels == 6) // 5.1 surround
{
- Con_Printf ("S_TransferStereo16: DS: couldn't restore buffer\n");
- S_Shutdown ();
- S_Startup ();
- return;
+ for (i = 0; i < nbframes; i++, painted_ptr++)
+ {
+ *snd_out++ = bound(-32768, painted_ptr->sample[0], 32767);
+ *snd_out++ = bound(-32768, painted_ptr->sample[1], 32767);
+ *snd_out++ = bound(-32768, painted_ptr->sample[2], 32767);
+ *snd_out++ = bound(-32768, painted_ptr->sample[3], 32767);
+ *snd_out++ = bound(-32768, painted_ptr->sample[4], 32767);
+ *snd_out++ = bound(-32768, painted_ptr->sample[5], 32767);
+ }
+ }
+ else if (rb->format.channels == 4) // 4.0 surround
+ {
+ for (i = 0; i < nbframes; i++, painted_ptr++)
+ {
+ *snd_out++ = bound(-32768, painted_ptr->sample[0], 32767);
+ *snd_out++ = bound(-32768, painted_ptr->sample[1], 32767);
+ *snd_out++ = bound(-32768, painted_ptr->sample[2], 32767);
+ *snd_out++ = bound(-32768, painted_ptr->sample[3], 32767);
+ }
+ }
+ else if (rb->format.channels == 2) // 2.0 stereo
+ {
+ for (i = 0; i < nbframes; i++, painted_ptr++)
+ {
+ *snd_out++ = bound(-32768, painted_ptr->sample[0], 32767);
+ *snd_out++ = bound(-32768, painted_ptr->sample[1], 32767);
+ }
+ }
+ else if (rb->format.channels == 1) // 1.0 mono
+ {
+ for (i = 0; i < nbframes; i++, painted_ptr++)
+ {
+ val = (painted_ptr->sample[0] + painted_ptr->sample[1]) >> 1;
+ *snd_out++ = bound(-32768, val, 32767);
+ }
}
}
- }
- else
-#endif
- {
- pbuf = (DWORD *)shm->buffer;
+ else // 8bit
+ {
+ unsigned char *snd_out = (unsigned char*)rb_ptr;
+ if (rb->format.channels == 8) // 7.1 surround
+ {
+ for (i = 0; i < nbframes; i++, painted_ptr++)
+ {
+ val = (painted_ptr->sample[0] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+ val = (painted_ptr->sample[1] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+ val = (painted_ptr->sample[2] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+ val = (painted_ptr->sample[3] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+ val = (painted_ptr->sample[4] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+ val = (painted_ptr->sample[5] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+ val = (painted_ptr->sample[6] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+ val = (painted_ptr->sample[7] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+ }
+ }
+ else if (rb->format.channels == 6) // 5.1 surround
+ {
+ for (i = 0; i < nbframes; i++, painted_ptr++)
+ {
+ val = (painted_ptr->sample[0] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+ val = (painted_ptr->sample[1] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+ val = (painted_ptr->sample[2] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+ val = (painted_ptr->sample[3] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+ val = (painted_ptr->sample[4] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+ val = (painted_ptr->sample[5] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+ }
+ }
+ else if (rb->format.channels == 4) // 4.0 surround
+ {
+ for (i = 0; i < nbframes; i++, painted_ptr++)
+ {
+ val = (painted_ptr->sample[0] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+ val = (painted_ptr->sample[1] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+ val = (painted_ptr->sample[2] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+ val = (painted_ptr->sample[3] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+ }
+ }
+ else if (rb->format.channels == 2) // 2.0 stereo
+ {
+ for (i = 0; i < nbframes; i++, painted_ptr++)
+ {
+ val = (painted_ptr->sample[0] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+ val = (painted_ptr->sample[1] >> 8) + 128; *snd_out++ = bound(0, val, 255);
+ }
+ }
+ else if (rb->format.channels == 1) // 1.0 mono
+ {
+ for (i = 0;i < nbframes;i++, painted_ptr++)
+ {
+ val = ((painted_ptr->sample[0] + painted_ptr->sample[1]) >> 9) + 128;
+ *snd_out++ = bound(0, val, 255);
+ }
+ }
+ }
+
+ partialend += nbframes;
}
- while (lpaintedtime < endtime)
- {
- // handle recirculating buffer issues
- lpos = lpaintedtime & ((shm->samples>>1)-1);
+ rb->endframe = endtime;
- snd_out = (short *) pbuf + (lpos<<1);
+ // Remove outdated samples from the ring buffer, if any
+ if (rb->startframe < soundtime)
+ rb->startframe = soundtime;
- snd_linear_count = (shm->samples>>1) - lpos;
- if (lpaintedtime + snd_linear_count > endtime)
- snd_linear_count = endtime - lpaintedtime;
+ if (!simsound)
+ SndSys_UnlockRenderBuffer();
- snd_linear_count <<= 1;
+ return endtime - starttime;
+}
- // 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
-}
+CHANNEL MIXING
-void S_TransferPaintBuffer(int endtime)
+===============================================================================
+*/
+
+static qboolean SND_PaintChannel (channel_t *ch, unsigned int count)
{
- 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
+ int snd_vol, vol[SND_LISTENERS];
+ const snd_buffer_t *sb;
+ unsigned int i, sb_offset;
- if (shm->samplebits == 16 && shm->channels == 2)
+ // If this channel manages its own volume
+ if (ch->flags & CHANNELFLAG_FULLVOLUME)
+ snd_vol = 256;
+ else
+ snd_vol = (int)(volume.value * 256);
+
+ for (i = 0;i < SND_LISTENERS;i++)
+ vol[i] = ch->listener_volume[i] * snd_vol;
+
+ sb_offset = ch->pos;
+ sb = ch->sfx->fetcher->getsb (ch, &sb_offset, count);
+ if (sb == NULL)
{
- S_TransferStereo16 (endtime);
- return;
+ Con_DPrintf("SND_PaintChannel: ERROR: can't get sound buffer from sfx \"%s\"\n",
+ ch->sfx->name); // , count); // or add this? FIXME
}
-
- 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)
+ else
{
- reps = 0;
-
- while ((hresult = pDSBuf->lpVtbl->Lock(pDSBuf, 0, gSndBufSize, &pbuf, &dwSize, &pbuf2,&dwSize2, 0)) != DS_OK)
+#if SND_LISTENERS != 8
+# error the following code only supports up to 8 channels, update it
+#endif
+ if (sb->format.width == 1)
{
- if (hresult != DSERR_BUFFERLOST)
+ const signed char *samples = (signed char*)sb->samples + (ch->pos - sb_offset) * sb->format.channels;
+
+ // Stereo sound support
+ if (sb->format.channels == 2)
{
- Con_Printf ("S_TransferPaintBuffer: DS::Lock Sound Buffer Failed\n");
- S_Shutdown ();
- S_Startup ();
- return;
+ if (vol[6] + vol[7] > 0)
+ {
+ for (i = 0;i < count;i++)
+ {
+ paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 8;
+ paintbuffer[i].sample[1] += (samples[1] * vol[1]) >> 8;
+ paintbuffer[i].sample[2] += (samples[0] * vol[2]) >> 8;
+ paintbuffer[i].sample[3] += (samples[1] * vol[3]) >> 8;
+ paintbuffer[i].sample[4] += ((samples[0] + samples[1]) * vol[4]) >> 9;
+ paintbuffer[i].sample[5] += ((samples[0] + samples[1]) * vol[5]) >> 9;
+ paintbuffer[i].sample[6] += (samples[0] * vol[6]) >> 8;
+ paintbuffer[i].sample[7] += (samples[1] * vol[7]) >> 8;
+ samples += 2;
+ }
+ }
+ else if (vol[4] + vol[5] > 0)
+ {
+ for (i = 0;i < count;i++)
+ {
+ paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 8;
+ paintbuffer[i].sample[1] += (samples[1] * vol[1]) >> 8;
+ paintbuffer[i].sample[2] += (samples[0] * vol[2]) >> 8;
+ paintbuffer[i].sample[3] += (samples[1] * vol[3]) >> 8;
+ paintbuffer[i].sample[4] += ((samples[0] + samples[1]) * vol[4]) >> 9;
+ paintbuffer[i].sample[5] += ((samples[0] + samples[1]) * vol[5]) >> 9;
+ samples += 2;
+ }
+ }
+ else if (vol[2] + vol[3] > 0)
+ {
+ for (i = 0;i < count;i++)
+ {
+ paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 8;
+ paintbuffer[i].sample[1] += (samples[1] * vol[1]) >> 8;
+ paintbuffer[i].sample[2] += (samples[0] * vol[2]) >> 8;
+ paintbuffer[i].sample[3] += (samples[1] * vol[3]) >> 8;
+ samples += 2;
+ }
+ }
+ else if (vol[0] + vol[1] > 0)
+ {
+ for (i = 0;i < count;i++)
+ {
+ paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 8;
+ paintbuffer[i].sample[1] += (samples[1] * vol[1]) >> 8;
+ samples += 2;
+ }
+ }
}
-
- if (++reps > 10000)
+ else if (sb->format.channels == 1)
{
- Con_Printf ("S_TransferPaintBuffer: DS: couldn't restore buffer\n");
- S_Shutdown ();
- S_Startup ();
- return;
+ if (vol[6] + vol[7] > 0)
+ {
+ for (i = 0;i < count;i++)
+ {
+ paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 8;
+ paintbuffer[i].sample[1] += (samples[0] * vol[1]) >> 8;
+ paintbuffer[i].sample[2] += (samples[0] * vol[2]) >> 8;
+ paintbuffer[i].sample[3] += (samples[0] * vol[3]) >> 8;
+ paintbuffer[i].sample[4] += (samples[0] * vol[4]) >> 8;
+ paintbuffer[i].sample[5] += (samples[0] * vol[5]) >> 8;
+ paintbuffer[i].sample[6] += (samples[0] * vol[6]) >> 8;
+ paintbuffer[i].sample[7] += (samples[0] * vol[7]) >> 8;
+ samples += 1;
+ }
+ }
+ else if (vol[4] + vol[5] > 0)
+ {
+ for (i = 0;i < count;i++)
+ {
+ paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 8;
+ paintbuffer[i].sample[1] += (samples[0] * vol[1]) >> 8;
+ paintbuffer[i].sample[2] += (samples[0] * vol[2]) >> 8;
+ paintbuffer[i].sample[3] += (samples[0] * vol[3]) >> 8;
+ paintbuffer[i].sample[4] += (samples[0] * vol[4]) >> 8;
+ paintbuffer[i].sample[5] += (samples[0] * vol[5]) >> 8;
+ samples += 1;
+ }
+ }
+ else if (vol[2] + vol[3] > 0)
+ {
+ for (i = 0;i < count;i++)
+ {
+ paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 8;
+ paintbuffer[i].sample[1] += (samples[0] * vol[1]) >> 8;
+ paintbuffer[i].sample[2] += (samples[0] * vol[2]) >> 8;
+ paintbuffer[i].sample[3] += (samples[0] * vol[3]) >> 8;
+ samples += 1;
+ }
+ }
+ else if (vol[0] + vol[1] > 0)
+ {
+ for (i = 0;i < count;i++)
+ {
+ paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 8;
+ paintbuffer[i].sample[1] += (samples[0] * vol[1]) >> 8;
+ samples += 1;
+ }
+ }
}
+ else
+ return false; // unsupported number of channels in sound
}
- }
- 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--)
+ else if (sb->format.width == 2)
{
- val = ((*p * snd_vol) >> 16) + 128;
- out[out_idx] = bound(0, val, 255);
- p+= step;
- out_idx = (out_idx + 1) & out_mask;
+ const signed short *samples = (signed short*)sb->samples + (ch->pos - sb_offset) * sb->format.channels;
+
+ // Stereo sound support
+ if (sb->format.channels == 2)
+ {
+ if (vol[6] + vol[7] > 0)
+ {
+ for (i = 0;i < count;i++)
+ {
+ paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 16;
+ paintbuffer[i].sample[1] += (samples[1] * vol[1]) >> 16;
+ paintbuffer[i].sample[2] += (samples[0] * vol[2]) >> 16;
+ paintbuffer[i].sample[3] += (samples[1] * vol[3]) >> 16;
+ paintbuffer[i].sample[4] += ((samples[0] + samples[1]) * vol[4]) >> 17;
+ paintbuffer[i].sample[5] += ((samples[0] + samples[1]) * vol[5]) >> 17;
+ paintbuffer[i].sample[6] += (samples[0] * vol[6]) >> 16;
+ paintbuffer[i].sample[7] += (samples[1] * vol[7]) >> 16;
+ samples += 2;
+ }
+ }
+ else if (vol[4] + vol[5] > 0)
+ {
+ for (i = 0;i < count;i++)
+ {
+ paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 16;
+ paintbuffer[i].sample[1] += (samples[1] * vol[1]) >> 16;
+ paintbuffer[i].sample[2] += (samples[0] * vol[2]) >> 16;
+ paintbuffer[i].sample[3] += (samples[1] * vol[3]) >> 16;
+ paintbuffer[i].sample[4] += ((samples[0] + samples[1]) * vol[4]) >> 17;
+ paintbuffer[i].sample[5] += ((samples[0] + samples[1]) * vol[5]) >> 17;
+ samples += 2;
+ }
+ }
+ else if (vol[2] + vol[3] > 0)
+ {
+ for (i = 0;i < count;i++)
+ {
+ paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 16;
+ paintbuffer[i].sample[1] += (samples[1] * vol[1]) >> 16;
+ paintbuffer[i].sample[2] += (samples[0] * vol[2]) >> 16;
+ paintbuffer[i].sample[3] += (samples[1] * vol[3]) >> 16;
+ samples += 2;
+ }
+ }
+ else if (vol[0] + vol[1] > 0)
+ {
+ for (i = 0;i < count;i++)
+ {
+ paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 16;
+ paintbuffer[i].sample[1] += (samples[1] * vol[1]) >> 16;
+ samples += 2;
+ }
+ }
+ }
+ else if (sb->format.channels == 1)
+ {
+ if (vol[6] + vol[7] > 0)
+ {
+ for (i = 0;i < count;i++)
+ {
+ paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 16;
+ paintbuffer[i].sample[1] += (samples[0] * vol[1]) >> 16;
+ paintbuffer[i].sample[2] += (samples[0] * vol[2]) >> 16;
+ paintbuffer[i].sample[3] += (samples[0] * vol[3]) >> 16;
+ paintbuffer[i].sample[4] += (samples[0] * vol[4]) >> 16;
+ paintbuffer[i].sample[5] += (samples[0] * vol[5]) >> 16;
+ paintbuffer[i].sample[6] += (samples[0] * vol[6]) >> 16;
+ paintbuffer[i].sample[7] += (samples[0] * vol[7]) >> 16;
+ samples += 1;
+ }
+ }
+ else if (vol[4] + vol[5] > 0)
+ {
+ for (i = 0;i < count;i++)
+ {
+ paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 16;
+ paintbuffer[i].sample[1] += (samples[0] * vol[1]) >> 16;
+ paintbuffer[i].sample[2] += (samples[0] * vol[2]) >> 16;
+ paintbuffer[i].sample[3] += (samples[0] * vol[3]) >> 16;
+ paintbuffer[i].sample[4] += (samples[0] * vol[4]) >> 16;
+ paintbuffer[i].sample[5] += (samples[0] * vol[5]) >> 16;
+ samples += 1;
+ }
+ }
+ else if (vol[2] + vol[3] > 0)
+ {
+ for (i = 0;i < count;i++)
+ {
+ paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 16;
+ paintbuffer[i].sample[1] += (samples[0] * vol[1]) >> 16;
+ paintbuffer[i].sample[2] += (samples[0] * vol[2]) >> 16;
+ paintbuffer[i].sample[3] += (samples[0] * vol[3]) >> 16;
+ samples += 1;
+ }
+ }
+ else if (vol[0] + vol[1] > 0)
+ {
+ for (i = 0;i < count;i++)
+ {
+ paintbuffer[i].sample[0] += (samples[0] * vol[0]) >> 16;
+ paintbuffer[i].sample[1] += (samples[0] * vol[1]) >> 16;
+ samples += 1;
+ }
+ }
+ }
+ else
+ return false; // unsupported number of channels in sound
}
}
-#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);
- }
-#endif
+ ch->pos += count;
+ return true;
}
-
-/*
-===============================================================================
-
-CHANNEL MIXING
-
-===============================================================================
-*/
-
-void SND_PaintChannelFrom8 (channel_t *ch, sfxcache_t *sc, int endtime);
-void SND_PaintChannelFrom16 (channel_t *ch, sfxcache_t *sc, int endtime);
-
-void S_PaintChannels(int endtime)
+void S_PaintChannels (snd_ringbuffer_t* rb, unsigned int starttime, unsigned int endtime)
{
- int i;
- int end;
- channel_t *ch;
- sfxcache_t *sc;
- int ltime, count;
+ unsigned int paintedtime;
+ paintedtime = starttime;
while (paintedtime < endtime)
{
- // if paintbuffer is smaller than DMA buffer
- end = endtime;
- if (endtime - paintedtime > PAINTBUFFER_SIZE)
- end = paintedtime + PAINTBUFFER_SIZE;
+ unsigned int partialend, i, framecount;
+ channel_t *ch;
+
+ // if paintbuffer is too small
+ if (endtime > paintedtime + PAINTBUFFER_SIZE)
+ partialend = paintedtime + PAINTBUFFER_SIZE;
+ else
+ partialend = endtime;
// clear the paint buffer
- memset(paintbuffer, 0, (end - paintedtime) * sizeof(portable_samplepair_t));
+ memset (paintbuffer, 0, (partialend - paintedtime) * sizeof (paintbuffer[0]));
// paint in the channels.
ch = channels;
- for (i=0; i<total_channels ; i++, ch++)
+ for (i = 0; i < total_channels ; i++, ch++)
{
- if (!ch->sfx)
+ sfx_t *sfx;
+ unsigned int ltime, j;
+
+ sfx = ch->sfx;
+ if (sfx == NULL)
continue;
- if (!ch->leftvol && !ch->rightvol)
+ for (j = 0;j < SND_LISTENERS;j++)
+ if (ch->listener_volume[j])
+ break;
+ if (j == SND_LISTENERS)
continue;
- sc = S_LoadSound (ch->sfx);
- if (!sc)
+ if (!S_LoadSound (sfx, true))
continue;
- ltime = paintedtime;
+ // if the channel is paused
+ if (ch->flags & CHANNELFLAG_PAUSED)
+ {
+ int pausedtime = partialend - 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 (sfx->loopstart >= 0)
+ loopstart = bound(0, sfx->loopstart, (int)sfx->total_length - 1);
+ else
+ {
+ if (ch->flags & CHANNELFLAG_FORCELOOP)
+ loopstart = 0;
+ else
+ loopstart = -1;
+ }
+
+ // 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;
+ }
+ }
- while (ltime < end)
+ ltime = paintedtime;
+ while (ltime < partialend)
{
+ int count;
+ qboolean stop_paint;
+
// paint up to end
- if (ch->end < end)
+ if (ch->end < partialend)
count = ch->end - ltime;
else
- count = end - ltime;
+ count = partialend - ltime;
if (count > 0)
- {
- if (sc->width == 1)
- SND_PaintChannelFrom8(ch, sc, count);
- else
- SND_PaintChannelFrom16(ch, sc, count);
-
- ltime += count;
+ {
+ for (j = 0; j < SND_LISTENERS; j++)
+ ch->listener_volume[j] = bound(0, ch->listener_volume[j], 255);
+
+ stop_paint = !SND_PaintChannel (ch, (unsigned int)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)
- {
- ch->pos = sc->loopstart;
- ch->end = ltime + sc->length - ch->pos;
- }
- else
+ // if at end of loop, restart
+ if ((sfx->loopstart >= 0 || (ch->flags & CHANNELFLAG_FORCELOOP)) && !stop_paint)
{
- // channel just stopped
- ch->sfx = NULL;
- break;
+ ch->pos = bound(0, sfx->loopstart, (int)sfx->total_length - 1);
+ ch->end = ltime + sfx->total_length - ch->pos;
}
+ // channel just stopped
+ else
+ stop_paint = true;
}
- }
-
- }
- // transfer out according to DMA format
- 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;
-}
-
-
-void SND_PaintChannelFrom8 (channel_t *ch, sfxcache_t *sc, int count)
-{
-// int data;
- int *lscale, *rscale;
- unsigned char *sfx;
- int i;
-
- 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
- sfx = (unsigned char *)sc->data + ch->pos * 2;
-
- 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++)
- {
- paintbuffer[i].left += lscale[*sfx];
- paintbuffer[i].right += rscale[*sfx++];
+ if (stop_paint)
+ {
+ S_StopChannel (ch - channels);
+ break;
+ }
+ }
}
-
- }
- ch->pos += 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;
-
- leftvol = ch->leftvol;
- rightvol = ch->rightvol;
- if (sc->stereo)
- {
- // LordHavoc: stereo sound support, and optimizations
- sfx = (signed short *)sc->data + ch->pos * 2;
+ S_CaptureAVISound (partialend - paintedtime);
+ framecount = S_TransferPaintBuffer (rb, paintedtime, partialend);
+ paintedtime += framecount;
- for (i=0 ; i<count ; i++)
+ // If there was not enough free space in the sound buffer, stop here
+ if (paintedtime != partialend)
{
- paintbuffer[i].left += (*sfx++ * leftvol) >> 8;
- paintbuffer[i].right += (*sfx++ * rightvol) >> 8;
+ Con_DPrintf(">> S_PaintChannels: Not enough free space in the sound buffer ( %u != %u)\n", paintedtime, partialend);
+ break;
}
}
- else
- {
- sfx = (signed short *)sc->data + ch->pos;
-
- for (i=0 ; i<count ; i++)
- {
- paintbuffer[i].left += (*sfx * leftvol) >> 8;
- paintbuffer[i].right += (*sfx++ * rightvol) >> 8;
- }
- }
-
- ch->pos += count;
}
-