Merge 0c5b9dbba5 into 322413b3c5

src/input/camera_access.js

@@ -84,11 +84,20 @@ function normalizeConstraints(config, cb) {
 
     if ( typeof MediaStreamTrack !== 'undefined' && typeof MediaStreamTrack.getSources !== 'undefined') {
         MediaStreamTrack.getSources(function(sourceInfos) {
-            var videoSourceId;
+            var videoSourceId, videoIndex = 0;
             for (var i = 0; i < sourceInfos.length; ++i) {
                 var sourceInfo = sourceInfos[i];
-                if (sourceInfo.kind === "video" && sourceInfo.facing === videoConstraints.facing) {
-                    videoSourceId = sourceInfo.id;
+                if (sourceInfo.kind === "video") {
+                    if (sourceInfo.facing === videoConstraints.facing) {
+                        videoSourceId = sourceInfo.id;
+                        break;
+                    }
+                    
+                    if (videoConstraints.cameraIndex === 'undefined' || videoConstraints.cameraIndex >= videoIndex) {
+                        videoSourceId = sourceInfo.id;
+                    }
+                    
+                    videoIndex++;
                 }
             }
             constraints.video = {