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

Use high-resolution timestamps if available.

Browse Source
This commit is contained in:
Michael Jumper
2012-11-13 12:17:14 -08:00
parent 6332e5015f
commit 5b017e0b77
1 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,15 +73,11 @@ Guacamole.AudioChannel = function() {
var packet = var packet =
new Guacamole.AudioChannel.Packet(mimetype, data); new Guacamole.AudioChannel.Packet(mimetype, data);
var now; var now = Guacamole.AudioChannel.getTimestamp();
if (Guacamole.AudioChannel.context)
now = Guacamole.AudioChannel.context.currentTime * 1000;
else
now = new Date().getTime();
// If underflow is detected, delay start // If underflow is detected, reschedule new packets relative to now.
if (next_packet_time < now) if (next_packet_time < now)
next_packet_time = now + 50; next_packet_time = now;
// Schedule next packet // Schedule next packet
packet.play(next_packet_time); packet.play(next_packet_time);
@@ -96,6 +92,28 @@ if (window.webkitAudioContext) {
Guacamole.AudioChannel.context = new webkitAudioContext(); Guacamole.AudioChannel.context = new webkitAudioContext();
} }
Guacamole.AudioChannel.getTimestamp = function() {
// If we have an audio context, use its timestamp
if (Guacamole.AudioChannel.context)
return Guacamole.AudioChannel.context.currentTime * 1000;
// If we have high-resolution timers, use those
if (window.performance) {
if (window.performance.now)
return window.peformance.now();
if (window.performance.webkitNow)
return window.performance.webkitNow();
}
// Fallback to millisecond-resolution system time
return new Date().getTime();
};
/** /**
* Abstract representation of an audio packet. * Abstract representation of an audio packet.
* *
@@ -173,7 +191,7 @@ Guacamole.AudioChannel.Packet = function(mimetype, data) {
this.play = function(when) { this.play = function(when) {
// Calculate time until play // Calculate time until play
var now = new Date().getTime(); var now = Guacamole.AudioChannel.getTimestamp();
var delay = when - now; var delay = when - now;
// Play now if too late // Play now if too late