FS-11284: Fix legacy/broken video constraints for specifying a video deviceId

getMediaParams() was using a legacy version of the video constraint param to
specify a deviceId.

checkRes() was incorrectly setting video constraints such that it was not
properly testing specific video devices.

diff --git a/html5/verto/js/src/jquery.FSRTC.js b/html5/verto/js/src/jquery.FSRTC.js
index c2ea803d0bc232478cc884ddf5eb0560a20714ba..5210db3081a4d9ded9b35d6147819db05e099c14 100644 (file)
--- a/html5/verto/js/src/jquery.FSRTC.js
+++ b/html5/verto/js/src/jquery.FSRTC.js
@@ -557,7 +557,9 @@
                
                if (obj.options.useCamera !== "any") {
                    //video.optional.push({sourceId: obj.options.useCamera});
-                   video.deviceId = obj.options.useCamera;
+        video.deviceId = {
+          exact: obj.options.useCamera,
+        };
                }
 
                if (bestFrameRate) {
@@ -1011,29 +1013,21 @@
            return;
        }
 
-       var video = {
-            //mandatory: {},
-            //optional: []
-        }      
-       //FIXME
-       if (cam) {
-           //video.optional = [{sourceId: cam}];
-           video.deviceId = {exact: cam};
-       }
-       
        w = resList[resI][0];
        h = resList[resI][1];
        resI++;
 
-       video = {
+       var video = {
            width: {exact: w},
            height: {exact: h}
-           //"minWidth": w,
-           //"minHeight": h,
-           //"maxWidth": w,
-           //"maxHeight": h
        };
 
+  if (cam !== "any") {
+    video.deviceId = {
+      exact: cam,
+    };
+  }
+
        getUserMedia({
            constraints: {
                 audio: ttl++ == 0,