safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-07 05:31:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUAC-427: Limit audio latency to reasonable bounds relative to sync instructions.

Browse Source
This commit is contained in:
Michael Jumper
2015-09-04 18:57:20 -07:00
parent 193f2c676d
commit 8a9c7ce35f
2 changed files with 97 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
guacamole-common-js/src/main/webapp/modules/Client.js
View File

@@ -77,12 +77,17 @@ Guacamole.Client = function(tunnel) {
*/
var layers = {};
/**
* All audio channels currentl in use by the client. Initially, this will
* be empty, but channels may be allocated by the server upon request.
*
* @type Object.<Number, Guacamole.AudioChannel>
*/
var audioChannels = {};
// No initial parsers
var parsers = [];
// No initial audio channels
var audio_channels = [];
// No initial streams
var streams = [];
@@ -494,6 +499,27 @@ Guacamole.Client = function(tunnel) {
*/
this.onsync = null;
/**
* Returns the audio channel having the given index, creating a new channel
* if necessary.
*
* @param {Number} index
* The index of the audio channel to retrieve.
*
* @returns {Guacamole.AudioChannel}
* The audio channel having the given index.
*/
var getAudioChannel = function getAudioChannel(index) {
// Get audio channel, creating it first if necessary
var audio_channel = audioChannels[index];
if (!audio_channel)
audio_channel = audioChannels[index] = new Guacamole.AudioChannel();
return audio_channel;
};
/**
* Returns the layer with the given index, creating it if necessary.
* Positive indices refer to visible layers, an index of zero refers to
@@ -540,18 +566,6 @@ Guacamole.Client = function(tunnel) {
}
function getAudioChannel(index) {
var audio_channel = audio_channels[index];
// If audio channel not yet created, create it
if (audio_channel == null)
audio_channel = audio_channels[index] = new Guacamole.AudioChannel();
return audio_channel;
}
/**
* Handlers for all defined layer properties.
* @private
@@ -1097,11 +1111,21 @@ Guacamole.Client = function(tunnel) {
var timestamp = parseInt(parameters[0]);
// Flush display, send sync when done
display.flush(function __send_sync_response() {
display.flush(function displaySyncComplete() {
// Synchronize all audio channels
for (var index in audioChannels) {
var audioChannel = audioChannels[index];
if (audioChannel)
audioChannel.sync();
}
// Send sync response to server
if (timestamp !== currentTimestamp) {
tunnel.sendMessage("sync", timestamp);
currentTimestamp = timestamp;
}
});
// If received first update, no longer waiting.