kekePower/rdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

much better sound synchronization using the provided timestamps

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@890 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
Michael Gernoth 2005-04-22 21:54:57 +00:00
parent d419f824d3
commit 19769936e4
1 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
rdpsnd_libao.c
View File

@ -25,6 +25,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#include <ao/ao.h> #include <ao/ao.h>
#include <sys/time.h>
#define MAX_QUEUE 10 #define MAX_QUEUE 10
#define WAVEOUTBUF 64 #define WAVEOUTBUF 64
@ -35,6 +36,7 @@ int default_driver;
int g_samplerate; int g_samplerate;
int g_channels; int g_channels;
BOOL g_dsp_busy = False; BOOL g_dsp_busy = False;
static BOOL g_reopened;
static short g_samplewidth; static short g_samplewidth;
static struct audio_packet static struct audio_packet
@ -69,6 +71,8 @@ wave_out_open(void)
g_dsp_fd = 0; g_dsp_fd = 0;
queue_lo = queue_hi = 0; queue_lo = queue_hi = 0;
g_reopened = True;
return True; return True;
} }
@ -129,6 +133,7 @@ wave_out_set_format(WAVEFORMATEX * pwfx)
return False; return False;
} }
g_reopened = True;
return True; return True;
} }
@ -172,6 +177,18 @@ wave_out_play(void)
STREAM out; STREAM out;
unsigned char outbuf[WAVEOUTBUF]; unsigned char outbuf[WAVEOUTBUF];
int offset, len, i; int offset, len, i;
static long prev_s, prev_us;
unsigned int duration;
struct timeval tv;
int next_tick;
if (g_reopened)
{
g_reopened = False;
gettimeofday(&tv, NULL);
prev_s = tv.tv_sec;
prev_us = tv.tv_usec;
}
if (queue_lo == queue_hi) if (queue_lo == queue_hi)
{ {
@ -182,6 +199,15 @@ wave_out_play(void)
packet = &packet_queue[queue_lo]; packet = &packet_queue[queue_lo];
out = &packet->s; out = &packet->s;
if (((queue_lo + 1) % MAX_QUEUE) != queue_hi)
{
next_tick = packet_queue[(queue_lo + 1) % MAX_QUEUE].tick;
}
else
{
next_tick = (packet->tick + 65535) % 65536;
}
len = 0; len = 0;
if (g_samplerate == 22050) if (g_samplerate == 22050)
@ -216,9 +242,28 @@ wave_out_play(void)
ao_play(o_device, outbuf, len); ao_play(o_device, outbuf, len);
if (out->p == out->end) gettimeofday(&tv, NULL);
duration = ((tv.tv_sec - prev_s) * 1000000 + (tv.tv_usec - prev_us)) / 1000;
if (packet->tick > next_tick)
next_tick += 65536;
if ((out->p == out->end) || duration > next_tick - packet->tick + 500)
{ {
rdpsnd_send_completion(packet->tick, packet->index); prev_s = tv.tv_sec;
prev_us = tv.tv_usec;
if (abs((next_tick - packet->tick) - duration) > 20)
{
DEBUG(("duration: %d, calc: %d, ", duration, next_tick - packet->tick));
DEBUG(("last: %d, is: %d, should: %d\n", packet->tick,
(packet->tick + duration) % 65536, next_tick % 65536));
}
/* Until all drivers are using the windows sound-ticks, we need to
substract the 50 ticks added later by rdpsnd.c */
rdpsnd_send_completion(((packet->tick + duration) % 65536) - 50, packet->index);
free(out->data); free(out->data);
queue_lo = (queue_lo + 1) % MAX_QUEUE; queue_lo = (queue_lo + 1) % MAX_QUEUE;
} }