FS-7746 #resolve this should work now

diff --git a/html5/verto/js/src/jquery.FSRTC.js b/html5/verto/js/src/jquery.FSRTC.js
index 303f9660b15e060ea633c9fd7d292c6b3e3b2a70..fcd300d185fd56452bb37a7a2bf0e110ede87d6e 100644 (file)
--- a/html5/verto/js/src/jquery.FSRTC.js
+++ b/html5/verto/js/src/jquery.FSRTC.js
@@ -468,6 +468,8 @@ var iceTimer;
        }
 
        var video = {};
+       var bestFrameRate = obj.options.videoParams.vertoBestFrameRate;
+       delete obj.options.videoParams.vertoBestFrameRate;
 
        if (window.moz) {
            video = obj.options.videoParams;
@@ -478,15 +480,20 @@ var iceTimer;
            video = {
                mandatory: obj.options.videoParams,
                optional: []
-            }
+            }              
        }
        
        var useVideo = obj.options.useVideo;
 
        if (useVideo && obj.options.useCamera && obj.options.useCamera !== "none") {
            if (obj.options.useCamera !== "any") {
-               video.optional = [{sourceId: obj.options.useCamera}]
+               video.optional.push({sourceId: obj.options.useCamera});
+           }
+
+           if (bestFrameRate && !window.moz) {
+               video.optional.push({minFrameRate: bestFrameRate});
            }
+
        } else {
            video = null;
            useVideo = null;

diff --git a/html5/verto/video_demo/js/verto-min.js b/html5/verto/video_demo/js/verto-min.js
index 194df38936edeab4f507cbfbf8c54efb58747866..4edb39ccea96d016d8ac1e489add350a0ba551f2 100644 (file)
--- a/html5/verto/video_demo/js/verto-min.js
+++ b/html5/verto/video_demo/js/verto-min.js
@@ -40,8 +40,9 @@ function onError(e){onStreamError(self,e);}
 var mediaParams=getMediaParams(self);console.log("Audio constraints",mediaParams.audio);console.log("Video constraints",mediaParams.video);if(self.options.useVideo&&self.options.localVideo){getUserMedia({constraints:{audio:false,video:{mandatory:self.options.videoParams,optional:[]},},localVideo:self.options.localVideo,onsuccess:function(e){self.options.localVideoStream=e;console.log("local video ready");},onerror:function(e){console.error("local video error!");}});}
 getUserMedia({constraints:{audio:mediaParams.audio,video:mediaParams.video},video:mediaParams.useVideo,onsuccess:onSuccess,onerror:onError});};function getMediaParams(obj){var audio;if(obj.options.videoParams&&obj.options.screenShare){console.error("SCREEN SHARE");audio=false;}else{audio={mandatory:obj.options.audioParams,optional:[]};if(obj.options.useMic!=="any"){audio.optional=[{sourceId:obj.options.useMic}]}}
 if(obj.options.useVideo&&obj.options.localVideo){getUserMedia({constraints:{audio:false,video:{mandatory:obj.options.videoParams,optional:[]},},localVideo:obj.options.localVideo,onsuccess:function(e){self.options.localVideoStream=e;console.log("local video ready");},onerror:function(e){console.error("local video error!");}});}
-var video={};if(window.moz){video=obj.options.videoParams;if(!video.width)video.width=video.minWidth;if(!video.height)video.height=video.minHeight;if(!video.frameRate)video.frameRate=video.minFrameRate;}else{video={mandatory:obj.options.videoParams,optional:[]}}
-var useVideo=obj.options.useVideo;if(useVideo&&obj.options.useCamera&&obj.options.useCamera!=="none"){if(obj.options.useCamera!=="any"){video.optional=[{sourceId:obj.options.useCamera}]}}else{video=null;useVideo=null;}
+var video={};var bestFrameRate=obj.options.videoParams.vertoBestFrameRate;delete obj.options.videoParams.vertoBestFrameRate;if(window.moz){video=obj.options.videoParams;if(!video.width)video.width=video.minWidth;if(!video.height)video.height=video.minHeight;if(!video.frameRate)video.frameRate=video.minFrameRate;}else{video={mandatory:obj.options.videoParams,optional:[]}}
+var useVideo=obj.options.useVideo;if(useVideo&&obj.options.useCamera&&obj.options.useCamera!=="none"){if(obj.options.useCamera!=="any"){video.optional.push({sourceId:obj.options.useCamera});}
+if(bestFrameRate&&!window.moz){video.optional.push({minFrameRate:bestFrameRate});}}else{video=null;useVideo=null;}
 return{audio:audio,video:video,useVideo:useVideo};}
 $.FSRTC.prototype.call=function(profile){checkCompat();var self=this;var screen=false;self.type="offer";if(self.options.videoParams&&self.options.screenShare){screen=true;}
 function onSuccess(stream){self.localStream=stream;self.peer=RTCPeerConnection({type:self.type,attachStream:self.localStream,onICE:function(candidate){return onICE(self,candidate);},onICEComplete:function(){return onICEComplete(self);},onRemoteStream:screen?function(stream){console.error("SKIP");}:function(stream){return onRemoteStream(self,stream);},onOfferSDP:function(sdp){return onOfferSDP(self,sdp);},onICESDP:function(sdp){return onICESDP(self,sdp);},onChannelError:function(e){return onChannelError(self,e);},constraints:self.constraints,iceServers:self.options.iceServers,});onStreamSuccess(self,stream);}

diff --git a/html5/verto/video_demo/verto.js b/html5/verto/video_demo/verto.js
index 89d28dc4288c24d7b620988c44d29d9547fa2973..a35ceb2bbe2450166151aff2e6d7d8dbdc29313f 100644 (file)
--- a/html5/verto/video_demo/verto.js
+++ b/html5/verto/video_demo/verto.js
@@ -179,7 +179,8 @@ function check_vid_res()
            "minHeight": vid_height,
            "maxWidth": vid_width,
            "maxHeight": vid_height,
-           "minFrameRate": 30, 
+           "minFrameRate": 15, 
+           "vertoBestFrameRate": 30,
            //chromeMediaSource: 'screen', 
            //mediaSource: 'screen'
        });
@@ -1165,7 +1166,8 @@ function init() {
             "minHeight": vid_height,
            "maxWidth": vid_width,
            "maxHeight": vid_height,
-           "minFrameRate": 30,
+           "minFrameRate": 15,
+           "vertoBestFrameRate": 30,
            //chromeMediaSource: 'screen',
            //mediaSource: 'screen'
         },