pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2025-12-27 15:45:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

server: Access the correct SndChannel for a given AudioFrame

Browse Source 
The client of _get_buffer() holds a ref to the SndChannel, and we
should access that SndChannel when _put_samples() is called, not the one
that happens to currently be attached to the Interface.
This commit is contained in:
Andrew Eikum 2012-09-13 13:38:50 -05:00 committed by Christophe Fergeau
parent 0a62e33211
commit d958fc100c
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server/snd_worker.c
View File

@ -122,10 +122,14 @@ struct SndChannel {
snd_channel_cleanup_channel_proc cleanup;
};
struct PlaybackChannel;
typedef struct PlaybackChannel PlaybackChannel;
typedef struct AudioFrame AudioFrame;
struct AudioFrame {
uint32_t time;
uint32_t samples[FRAME_SIZE];
PlaybackChannel *channel;
AudioFrame *next;
};
@ -227,6 +231,7 @@ static void snd_disconnect_channel(SndChannel *channel)
static void snd_playback_free_frame(PlaybackChannel *playback_channel, AudioFrame *frame)
{
frame->channel = playback_channel;
frame->next = playback_channel->free_frames;
playback_channel->free_frames = frame;
}
@ -1067,14 +1072,16 @@ SPICE_GNUC_VISIBLE void spice_server_playback_get_buffer(SpicePlaybackInstance *
SPICE_GNUC_VISIBLE void spice_server_playback_put_samples(SpicePlaybackInstance *sin, uint32_t *samples)
{
SndChannel *channel = sin->st->worker.connection;
PlaybackChannel *playback_channel = SPICE_CONTAINEROF(channel, PlaybackChannel, base);
PlaybackChannel *playback_channel;
AudioFrame *frame;
if (!channel) {
if (!sin->st->worker.connection) {
return;
}
if (!snd_channel_put(channel)) {
frame = SPICE_CONTAINEROF(samples, AudioFrame, samples);
playback_channel = frame->channel;
if (!snd_channel_put(&playback_channel->base) || !playback_channel->base.worker->connection) {
/* lost last reference, channel has been destroyed previously */
return;
}
@ -1083,7 +1090,6 @@ SPICE_GNUC_VISIBLE void spice_server_playback_put_samples(SpicePlaybackInstance
if (playback_channel->pending_frame) {
snd_playback_free_frame(playback_channel, playback_channel->pending_frame);
}
frame = SPICE_CONTAINEROF(samples, AudioFrame, samples);
frame->time = reds_get_mm_time();
red_dispatcher_set_mm_time(frame->time);
playback_channel->pending_frame = frame;