From 83b36da50734d271e641ed1eb97e3f4f140e3d7c Mon Sep 17 00:00:00 2001 From: Enrico Date: Tue, 11 Apr 2017 18:02:12 +0200 Subject: [PATCH 1/4] sourceId for firefox --- erizo_controller/erizoClient/src/Connection.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/erizo_controller/erizoClient/src/Connection.js b/erizo_controller/erizoClient/src/Connection.js index 16a3e4655b..698966981d 100644 --- a/erizo_controller/erizoClient/src/Connection.js +++ b/erizo_controller/erizoClient/src/Connection.js @@ -141,14 +141,23 @@ Erizo.GetUserMedia = function (config, callback, error) { } else { if (config.video && Erizo.getBrowser() === 'mozilla') { var ffConfig = {video:{}, audio: config.audio, screen: config.screen}; + if (config.audio.mandatory !== undefined) { + var audioCfg = config.audio.mandatory; + if (audioCfg.sourceId) { + ffConfig.audio.deviceId = audioCfg.sourceId + } + } if (config.video.mandatory !== undefined) { var videoCfg = config.video.mandatory; ffConfig.video.width = {min: videoCfg.minWidth, max: videoCfg.maxWidth}; ffConfig.video.height = {min: videoCfg.minHeight, max: videoCfg.maxHeight}; + if (videoCfg.sourceId) { + ffConfig.video.deviceId = videoCfg.sourceId + } } if (config.video.optional !== undefined) { - ffConfig.video.frameRate = config.video.optional[1].maxFrameRate; + ffConfig.video.frameRate = config.video.optional[1].maxFrameRate } if (navigator.mediaDevices && navigator.mediaDevices.getUserMedia) { promise = navigator.mediaDevices.getUserMedia(ffConfig).then(callback); From 8924e2c25d7e866afd1e9baf9a4ef579c013e1be Mon Sep 17 00:00:00 2001 From: Enrico Date: Tue, 11 Apr 2017 18:02:55 +0200 Subject: [PATCH 2/4] sourceId for firefox#2 --- erizo_controller/erizoClient/src/Connection.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/erizo_controller/erizoClient/src/Connection.js b/erizo_controller/erizoClient/src/Connection.js index 698966981d..e9b6b38877 100644 --- a/erizo_controller/erizoClient/src/Connection.js +++ b/erizo_controller/erizoClient/src/Connection.js @@ -144,7 +144,7 @@ Erizo.GetUserMedia = function (config, callback, error) { if (config.audio.mandatory !== undefined) { var audioCfg = config.audio.mandatory; if (audioCfg.sourceId) { - ffConfig.audio.deviceId = audioCfg.sourceId + ffConfig.audio.deviceId = audioCfg.sourceId; } } if (config.video.mandatory !== undefined) { @@ -152,12 +152,12 @@ Erizo.GetUserMedia = function (config, callback, error) { ffConfig.video.width = {min: videoCfg.minWidth, max: videoCfg.maxWidth}; ffConfig.video.height = {min: videoCfg.minHeight, max: videoCfg.maxHeight}; if (videoCfg.sourceId) { - ffConfig.video.deviceId = videoCfg.sourceId + ffConfig.video.deviceId = videoCfg.sourceId; } } if (config.video.optional !== undefined) { - ffConfig.video.frameRate = config.video.optional[1].maxFrameRate + ffConfig.video.frameRate = config.video.optional[1].maxFrameRate; } if (navigator.mediaDevices && navigator.mediaDevices.getUserMedia) { promise = navigator.mediaDevices.getUserMedia(ffConfig).then(callback); From d7f2570d423d0ac3ef27ef50ff5e2da30b735d0d Mon Sep 17 00:00:00 2001 From: Enrico Date: Tue, 11 Apr 2017 18:20:06 +0200 Subject: [PATCH 3/4] sourceId for firefox#2 --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index f9b0b3954b..c454f16e71 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ erizo_controller/erizoAgent/erizo-*.log spine/erizofc.js extras/basic_example/public/assets/ rtp_media_config.js +.idea From 5a9dd4bbb2ce7ee917c6bfeffae358711bfdec82 Mon Sep 17 00:00:00 2001 From: Enrico Date: Tue, 18 Apr 2017 08:47:02 +0200 Subject: [PATCH 4/4] removed gitignore .idea --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index c454f16e71..f9b0b3954b 100644 --- a/.gitignore +++ b/.gitignore @@ -17,4 +17,3 @@ erizo_controller/erizoAgent/erizo-*.log spine/erizofc.js extras/basic_example/public/assets/ rtp_media_config.js -.idea