retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

FS-8641 #resolve [Make frame rate configurable]

This commit is contained in:
Anthony Minessale 2015-12-15 16:16:51 -06:00
parent 6b8a6005de
commit 7733ff58d9
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
html5/verto/js/src/jquery.FSRTC.js
View File

@ -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 {

2
html5/verto/verto_communicator/src/storageService/services/storage.js
View File

@ -39,7 +39,7 @@
googEchoCancellation: true,
autoBand: true,
testSpeedJoin: true,
bestFrameRate: 15
bestFrameRate: "15"
};
data.$default(defaultSettings);

2
html5/verto/video_demo/js/verto-min.js vendored
View File

@ -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;}}