#define size of resampling buffer

git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@835 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
Michael Gernoth 2005-03-08 12:09:20 +00:00
parent d6a76fe8bc
commit db950b359a

View File

@ -27,6 +27,7 @@
#include <ao/ao.h> #include <ao/ao.h>
#define MAX_QUEUE 10 #define MAX_QUEUE 10
#define WAVEOUTBUF 32
int g_dsp_fd; int g_dsp_fd;
ao_device *o_device = NULL; ao_device *o_device = NULL;
@ -164,7 +165,7 @@ wave_out_play(void)
{ {
struct audio_packet *packet; struct audio_packet *packet;
STREAM out; STREAM out;
unsigned char expanded[16]; unsigned char expanded[WAVEOUTBUF];
int offset,len,i; int offset,len,i;
if (queue_lo == queue_hi) if (queue_lo == queue_hi)
@ -181,7 +182,7 @@ wave_out_play(void)
if (g_samplerate == 22050 ) if (g_samplerate == 22050 )
{ {
/* Resample to 44100 */ /* Resample to 44100 */
for(i=0; (i<(2*(3-g_samplewidth))) && (out->p < out->end); i++) for(i=0; (i<((WAVEOUTBUF/8)*(3-g_samplewidth))) && (out->p < out->end); i++)
{ {
offset=i*4*g_samplewidth; offset=i*4*g_samplewidth;
memcpy(&expanded[0*g_samplewidth+offset],out->p,g_samplewidth); memcpy(&expanded[0*g_samplewidth+offset],out->p,g_samplewidth);
@ -196,7 +197,7 @@ wave_out_play(void)
} }
else else
{ {
len = (16 > (out->end - out->p)) ? (out->end - out->p) : 16; len = (WAVEOUTBUF > (out->end - out->p)) ? (out->end - out->p) : WAVEOUTBUF;
memcpy(expanded,out->p,len); memcpy(expanded,out->p,len);
out->p += len; out->p += len;
} }