GUACAMOLE-237: Merge changes migrating to navigator.mediaDevices.getUserMedia rather than deprecated navigator.getUserMedia.

This commit is contained in:
Michael Jumper
2018-01-03 10:32:05 -08:00

View File

@@ -181,13 +181,17 @@ Guacamole.RawAudioRecorder = function RawAudioRecorder(stream, mimetype) {
*/
var context = Guacamole.AudioContextFactory.getAudioContext();
/**
* A function which directly invokes the browser's implementation of
* navigator.getUserMedia() with all provided parameters.
*
* @type Function
*/
var getUserMedia = (navigator.getUserMedia
// Some browsers do not implement navigator.mediaDevices - this
// shims in this functionality to ensure code compatibility.
if (!navigator.mediaDevices)
navigator.mediaDevices = {};
// Browsers that either do not implement navigator.mediaDevices
// at all or do not implement it completely need the getUserMedia
// method defined. This shims in this function by detecting
// one of the supported legacy methods.
if (!navigator.mediaDevices.getUserMedia)
navigator.mediaDevices.getUserMedia = (navigator.getUserMedia
|| navigator.webkitGetUserMedia
|| navigator.mozGetUserMedia
|| navigator.msGetUserMedia).bind(navigator);
@@ -419,7 +423,7 @@ Guacamole.RawAudioRecorder = function RawAudioRecorder(stream, mimetype) {
var beginAudioCapture = function beginAudioCapture() {
// Attempt to retrieve an audio input stream from the browser
getUserMedia({ 'audio' : true }, function streamReceived(stream) {
navigator.mediaDevices.getUserMedia({ 'audio' : true }, function streamReceived(stream) {
// Create processing node which receives appropriately-sized audio buffers
processor = context.createScriptProcessor(BUFFER_SIZE, format.channels, format.channels);