FS-8641 #resolve [Make frame rate configurable]

diff --git a/html5/verto/js/src/jquery.FSRTC.js b/html5/verto/js/src/jquery.FSRTC.js
index 7aa8f7bda7a310c3c4fe42192636fecdc7e4e24f..6025e08f7db74f0b8d1d0e4f95f30db17d676161 100644 (file)
--- a/html5/verto/js/src/jquery.FSRTC.js
+++ b/html5/verto/js/src/jquery.FSRTC.js
@@ -560,9 +560,7 @@
 
            if (bestFrameRate) {
                video.optional.push({minFrameRate: bestFrameRate});
-               if (bestFrameRate < 30) {
-                   video.optional.push({maxFrameRate: bestFrameRate});
-               }
+               video.optional.push({maxFrameRate: bestFrameRate});
            }
 
        } else {

diff --git a/html5/verto/verto_communicator/src/storageService/services/storage.js b/html5/verto/verto_communicator/src/storageService/services/storage.js
index 1e2dc6c0bc6ebce51b4e750a45c9e9ffa57d4efa..fada0a82f2ec5825315ec7873d85cb82d8e71e1c 100644 (file)
--- a/html5/verto/verto_communicator/src/storageService/services/storage.js
+++ b/html5/verto/verto_communicator/src/storageService/services/storage.js
@@ -39,7 +39,7 @@
           googEchoCancellation: true,
           autoBand: true,
           testSpeedJoin: true,
-          bestFrameRate: 15
+          bestFrameRate: "15"
        };
 
     data.$default(defaultSettings);

diff --git a/html5/verto/video_demo/js/verto-min.js b/html5/verto/video_demo/js/verto-min.js
index a204cf22856bacfff73106b4033e59ff110f28f6..be202e2068924aacdf300af07b54585cc66be1bc 100644 (file)
--- a/html5/verto/video_demo/js/verto-min.js
+++ b/html5/verto/video_demo/js/verto-min.js
@@ -50,7 +50,7 @@ if(obj.options.useVideo&&obj.options.localVideo){getUserMedia({constraints:{audi
 var video={};var bestFrameRate=obj.options.videoParams.vertoBestFrameRate;delete obj.options.videoParams.vertoBestFrameRate;video={mandatory:obj.options.videoParams,optional:[]}
 var useVideo=obj.options.useVideo;if(useVideo&&obj.options.useCamera&&obj.options.useCamera!=="none"){if(!video.optional){video.optional=[];}
 if(obj.options.useCamera!=="any"){video.optional.push({sourceId:obj.options.useCamera});}
-if(bestFrameRate){video.optional.push({minFrameRate:bestFrameRate});if(bestFrameRate<30){video.optional.push({maxFrameRate:bestFrameRate});}}}else{console.log("Camera Disabled");video=false;useVideo=false;}
+if(bestFrameRate){video.optional.push({minFrameRate:bestFrameRate});video.optional.push({maxFrameRate:bestFrameRate});}}else{console.log("Camera Disabled");video=false;useVideo=false;}
 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;if(screen){if(moz){self.constraints.OfferToReceiveVideo=false;}else{self.constraints.mandatory.OfferToReceiveVideo=false;}}