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

Use setTimeout() rather than potentially-inaccurate noteOn().

Browse Source
This commit is contained in:
Michael Jumper
2012-10-31 14:09:48 -07:00
parent 099b4c0126
commit 88ca65ac84
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
guacamole-common-js/src/main/resources/audio.js
View File

@@ -76,8 +76,10 @@ Guacamole.AudioChannel = function() {
var now = new Date().getTime(); var now = new Date().getTime();
// If time not initialized, initialize now // If time not initialized, initialize now
if (next_packet_time == 0) if (next_packet_time == 0 || next_packet_time < now) {
next_packet_time = now; next_packet_time = now + 50;
console.log("underflow");
}
var time_until_play = next_packet_time - now; var time_until_play = next_packet_time - now;
@@ -101,7 +103,6 @@ if (window.webkitAudioContext) {
* @constructor * @constructor
* *
* @param {String} mimetype The mimetype of the data contained by this packet. * @param {String} mimetype The mimetype of the data contained by this packet.
* @param {Number} duration The duration of the data contained by this packet.
* @param {String} data The base64-encoded sound data contained by this packet. * @param {String} data The base64-encoded sound data contained by this packet.
*/ */
Guacamole.AudioChannel.Packet = function(mimetype, data) { Guacamole.AudioChannel.Packet = function(mimetype, data) {
@@ -143,9 +144,18 @@ Guacamole.AudioChannel.Packet = function(mimetype, data) {
// Calculate time since call to play() // Calculate time since call to play()
var offset = new Date().getTime() - play_call; var offset = new Date().getTime() - play_call;
var delay = play_delay - offset;
source.buffer = buffer; source.buffer = buffer;
source.noteOn(Math.max(play_delay - offset, 0) / 1000);
if (delay <= 0)
source.noteOn(0);
else
window.setTimeout(function() {
source.noteOn(0);
}, delay);
//source.noteOn(Math.max(play_delay - offset, 0) / 1000);
if (offset > play_delay) if (offset > play_delay)
console.log("processing lag", offset - play_delay); console.log("processing lag", offset - play_delay);