]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
add local mute to verto
authorAnthony Minessale <anthm@freeswitch.org>
Tue, 24 Mar 2015 18:39:51 +0000 (13:39 -0500)
committerAnthony Minessale <anthm@freeswitch.org>
Wed, 25 Mar 2015 00:42:29 +0000 (19:42 -0500)
html5/verto/demo/js/verto-min.js
html5/verto/js/src/jquery.FSRTC.js
html5/verto/js/src/jquery.verto.js

index 45c9a0771a1e711c85ebf55f3724a420dfe5d6a1..35bb6d96be8b2cd933960274f2db3a667d751326 100644 (file)
@@ -6,16 +6,16 @@ function getCodecPayloadType(sdpLine){var pattern=new RegExp('a=rtpmap:(\\d+) \\
 function setDefaultCodec(mLine,payload){var elements=mLine.split(' ');var newLine=[];var index=0;for(var i=0;i<elements.length;i++){if(index===3){newLine[index++]=payload;}
 if(elements[i]!==payload)newLine[index++]=elements[i];}
 return newLine.join(' ');}
-$.FSRTC=function(options){this.options=$.extend({useVideo:null,useStereo:false,userData:null,iceServers:false,videoParams:{},audioParams:{},callbacks:{onICEComplete:function(){},onICE:function(){},onOfferSDP:function(){}}},options);this.mediaData={SDP:null,profile:{},candidateList:[]};if(moz){this.constraints={offerToReceiveAudio:true,offerToReceiveVideo:this.options.useVideo?true:false,};}else{this.constraints={optional:[{'DtlsSrtpKeyAgreement':'true'}],mandatory:{OfferToReceiveAudio:true,OfferToReceiveVideo:this.options.useVideo?true:false,}};}
+$.FSRTC=function(options){this.options=$.extend({useVideo:null,useStereo:false,userData:null,localVideo:null,screenShare:false,useCamera:"any",iceServers:false,videoParams:{},audioParams:{},callbacks:{onICEComplete:function(){},onICE:function(){},onOfferSDP:function(){}},},options);this.enabled=true;this.mediaData={SDP:null,profile:{},candidateList:[]};if(moz){this.constraints={offerToReceiveAudio:true,offerToReceiveVideo:this.options.useVideo?true:false,};}else{this.constraints={optional:[{'DtlsSrtpKeyAgreement':'true'}],mandatory:{OfferToReceiveAudio:true,OfferToReceiveVideo:this.options.useVideo?true:false,}};}
 if(self.options.useVideo){self.options.useVideo.style.display='none';}
-setCompat();checkCompat();};$.FSRTC.prototype.useVideo=function(obj){var self=this;if(obj){self.options.useVideo=obj;if(moz){self.constraints.offerToReceiveVideo=true;}else{self.constraints.mandatory.OfferToReceiveVideo=true;}}else{self.options.useVideo=null;if(moz){self.constraints.offerToReceiveVideo=false;}else{self.constraints.mandatory.OfferToReceiveVideo=false;}}
+setCompat();checkCompat();};$.FSRTC.prototype.useVideo=function(obj,local){var self=this;if(obj){self.options.useVideo=obj;self.options.localVideo=local;if(moz){self.constraints.offerToReceiveVideo=true;}else{self.constraints.mandatory.OfferToReceiveVideo=true;}}else{self.options.useVideo=null;self.options.localVideo=null;if(moz){self.constraints.offerToReceiveVideo=false;}else{self.constraints.mandatory.OfferToReceiveVideo=false;}}
 if(self.options.useVideo){self.options.useVideo.style.display='none';}};$.FSRTC.prototype.useStereo=function(on){var self=this;self.options.useStereo=on;};$.FSRTC.prototype.stereoHack=function(sdp){var self=this;if(!self.options.useStereo){return sdp;}
 var sdpLines=sdp.split('\r\n');var opusIndex=findLine(sdpLines,'a=rtpmap','opus/48000'),opusPayload;if(opusIndex){opusPayload=getCodecPayloadType(sdpLines[opusIndex]);}
 var fmtpLineIndex=findLine(sdpLines,'a=fmtp:'+opusPayload.toString());if(fmtpLineIndex===null)return sdp;sdpLines[fmtpLineIndex]=sdpLines[fmtpLineIndex].concat('; stereo=1');sdp=sdpLines.join('\r\n');return sdp;};function setCompat(){$.FSRTC.moz=!!navigator.mozGetUserMedia;if(!navigator.getUserMedia){navigator.getUserMedia=navigator.mozGetUserMedia||navigator.webkitGetUserMedia||navigator.msGetUserMedia;}}
 function checkCompat(){if(!navigator.getUserMedia){alert('This application cannot function in this browser.');return false;}
 return true;}
 function onStreamError(self,e){console.log('There has been a problem retrieving the streams - did you allow access? Check Device Resolution',e);doCallback(self,"onError",e);}
-function onStreamSuccess(self){console.log("Stream Success");}
+function onStreamSuccess(self,stream){console.log("Stream Success");doCallback(self,"onStream",stream);}
 function onICE(self,candidate){self.mediaData.candidate=candidate;self.mediaData.candidateList.push(self.mediaData.candidate);doCallback(self,"onICE");}
 function doCallback(self,func,arg){if(func in self.options.callbacks){self.options.callbacks[func](self,arg);}}
 function onICEComplete(self,candidate){console.log("ICE Complete");doCallback(self,"onICEComplete");}
@@ -27,15 +27,26 @@ function onRemoteStream(self,stream){if(self.options.useVideo){self.options.useV
 var element=self.options.useAudio;console.log("REMOTE STREAM",stream,element);if(typeof element.srcObject!=='undefined'){element.srcObject=stream;}else if(typeof element.mozSrcObject!=='undefined'){element.mozSrcObject=stream;}else if(typeof element.src!=='undefined'){element.src=URL.createObjectURL(stream);}else{console.error('Error attaching stream to element.');}
 self.options.useAudio.play();self.remoteStream=stream;}
 function onOfferSDP(self,sdp){self.mediaData.SDP=self.stereoHack(sdp.sdp);console.log("Offer SDP");doCallback(self,"onOfferSDP");}
-$.FSRTC.prototype.answer=function(sdp,onSuccess,onError){this.peer.addAnswerSDP({type:"answer",sdp:sdp},onSuccess,onError);};$.FSRTC.prototype.stop=function(){var self=this;if(self.options.useVideo){self.options.useVideo.style.display='none';}
+$.FSRTC.prototype.answer=function(sdp,onSuccess,onError){this.peer.addAnswerSDP({type:"answer",sdp:sdp},onSuccess,onError);};$.FSRTC.prototype.stop=function(){var self=this;if(self.options.useVideo){self.options.useVideo.style.display='none';self.options.useVideo[moz?'mozSrcObject':'src']="";}
 if(self.localStream){self.localStream.stop();self.localStream=null;}
-if(self.peer){console.log("stopping peer");self.peer.stop();}};$.FSRTC.prototype.createAnswer=function(sdp){var self=this;self.type="answer";self.remoteSDP=sdp;console.debug("inbound sdp: ",sdp);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:function(stream){return onRemoteStream(self,stream);},onICESDP:function(sdp){return onICESDP(self,sdp);},onChannelError:function(e){return onChannelError(self,e);},constraints:self.constraints,iceServers:self.options.iceServers,offerSDP:{type:"offer",sdp:self.remoteSDP}});onStreamSuccess(self);}
+if(self.options.localVideo){self.options.localVideo.style.display='none';self.options.localVideo[moz?'mozSrcObject':'src']="";}
+if(self.options.localVideoStream){self.options.localVideoStream.stop();}
+if(self.peer){console.log("stopping peer");self.peer.stop();}};$.FSRTC.prototype.getMute=function(){var self=this;return self.enabled;}
+$.FSRTC.prototype.setMute=function(what){var self=this;var audioTracks=self.localStream.getAudioTracks();for(var i=0,len=audioTracks.length;i<len;i++){switch(what){case"on":audioTracks[i].enabled=true;break;case"off":audioTracks[i].enabled=false;break;case"toggle":audioTracks[i].enabled=!audioTracks[i].enabled;default:break;}
+self.enabled=audioTracks[i].enabled;}
+return!self.enabled;}
+$.FSRTC.prototype.createAnswer=function(params){var self=this;self.type="answer";self.remoteSDP=params.sdp;console.debug("inbound sdp: ",params.sdp);self.options.useCamera=params.useCamera||"any";self.options.useMic=params.useMic||"any";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:function(stream){return onRemoteStream(self,stream);},onICESDP:function(sdp){return onICESDP(self,sdp);},onChannelError:function(e){return onChannelError(self,e);},constraints:self.constraints,iceServers:self.options.iceServers,offerSDP:{type:"offer",sdp:self.remoteSDP}});onStreamSuccess(self);}
 function onError(e){onStreamError(self,e);}
-var audio;if(this.options.videoParams&&this.options.videoParams.chromeMediaSource=='screen'){this.options.videoParams={chromeMediaSource:'screen',maxWidth:screen.width,maxHeight:screen.height};console.error("SCREEN SHARE");audio=false;}else{audio={mandatory:this.options.audioParams,optional:[]};}
-console.log("Mandatory audio constraints",this.options.audioParams);console.log("Mandatory video constraints",this.options.videoParams);getUserMedia({constraints:{audio:audio,video:this.options.useVideo?{mandatory:this.options.videoParams,optional:[]}:null},video:this.options.useVideo?true:false,onsuccess:onSuccess,onerror:onError});};$.FSRTC.prototype.call=function(profile){checkCompat();var self=this;self.type="offer";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: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);}
+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={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;}
+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);}
 function onError(e){onStreamError(self,e);}
-var audio;if(this.options.videoParams&&this.options.videoParams.chromeMediaSource=='screen'){this.options.videoParams={chromeMediaSource:'screen',maxWidth:screen.width,maxHeight:screen.height};console.error("SCREEN SHARE");audio=false;}else{audio={mandatory:this.options.audioParams,optional:[]};}
-console.log("Mandatory audio constraints",this.options.audioParams);console.log("Mandatory video constraints",this.options.videoParams);getUserMedia({constraints:{audio:audio,video:this.options.useVideo?{mandatory:this.options.videoParams,optional:[]}:null},video:this.options.useVideo?true:false,onsuccess:onSuccess,onerror:onError});};window.moz=!!navigator.mozGetUserMedia;function RTCPeerConnection(options){var w=window,PeerConnection=w.mozRTCPeerConnection||w.webkitRTCPeerConnection,SessionDescription=w.mozRTCSessionDescription||w.RTCSessionDescription,IceCandidate=w.mozRTCIceCandidate||w.RTCIceCandidate;var STUN={url:!moz?'stun:stun.l.google.com:19302':'stun:23.21.150.121'};var TURN={url:'turn:homeo@turn.bistri.com:80',credential:'homeo'};var iceServers=null;if(options.iceServers){var tmp=options.iceServers;if(typeof(tmp)==="boolean"){tmp=null;}
+var mediaParams=getMediaParams(self);console.log("Audio constraints",mediaParams.audio);console.log("Video constraints",mediaParams.video);getUserMedia({constraints:{audio:mediaParams.audio,video:mediaParams.video},video:mediaParams.useVideo,onsuccess:onSuccess,onerror:onError});};window.moz=!!navigator.mozGetUserMedia;function RTCPeerConnection(options){var w=window,PeerConnection=w.mozRTCPeerConnection||w.webkitRTCPeerConnection,SessionDescription=w.mozRTCSessionDescription||w.RTCSessionDescription,IceCandidate=w.mozRTCIceCandidate||w.RTCIceCandidate;var STUN={url:!moz?'stun:stun.l.google.com:19302':'stun:23.21.150.121'};var TURN={url:'turn:homeo@turn.bistri.com:80',credential:'homeo'};var iceServers=null;if(options.iceServers){var tmp=options.iceServers;if(typeof(tmp)==="boolean"){tmp=null;}
 if(tmp&&!(typeof(tmp)=="object"&&tmp.constructor===Array)){console.warn("iceServers must be an array, reverting to default ice servers");tmp=null;}
 iceServers={iceServers:tmp||[STUN]};if(!moz&&!tmp){if(parseInt(navigator.userAgent.match(/Chrom(e|ium)\/([0-9]+)\./)[2])>=28)TURN={url:'turn:turn.bistri.com:80',credential:'homeo',username:'homeo'};iceServers.iceServers=[STUN];}}
 var optional={optional:[]};if(!moz){optional.optional=[{DtlsSrtpKeyAgreement:true},{RtpDataChannels:options.onChannelMessage?true:false}];}
@@ -57,7 +68,7 @@ function onSdpSuccess(){}
 function onSdpError(e){if(options.onChannelError){options.onChannelError(e);}
 console.error('sdp error:',e);}
 return{addAnswerSDP:function(sdp,cbSuccess,cbError){peer.setRemoteDescription(new SessionDescription(sdp),cbSuccess?cbSuccess:onSdpSuccess,cbError?cbError:onSdpError);},addICE:function(candidate){peer.addIceCandidate(new IceCandidate({sdpMLineIndex:candidate.sdpMLineIndex,candidate:candidate.candidate}));},peer:peer,channel:channel,sendData:function(message){if(channel){channel.send(message);}},stop:function(){peer.close();if(options.attachStream){options.attachStream.stop();}}};}
-var video_constraints={mandatory:{},optional:[]};function getUserMedia(options){var n=navigator,media;n.getMedia=n.webkitGetUserMedia||n.mozGetUserMedia;n.getMedia(options.constraints||{audio:true,video:video_constraints},streaming,options.onerror||function(e){console.error(e);});function streaming(stream){var video=options.video;if(video){video[moz?'mozSrcObject':'src']=moz?stream:window.webkitURL.createObjectURL(stream);}
+var video_constraints={mandatory:{},optional:[]};function getUserMedia(options){var n=navigator,media;n.getMedia=n.webkitGetUserMedia||n.mozGetUserMedia;n.getMedia(options.constraints||{audio:true,video:video_constraints},streaming,options.onerror||function(e){console.error(e);});function streaming(stream){if(options.localVideo){options.localVideo[moz?'mozSrcObject':'src']=moz?stream:window.webkitURL.createObjectURL(stream);options.localVideo.style.display='block';}
 if(options.onsuccess){options.onsuccess(stream);}
 media=stream;}
 return media;}})(jQuery);(function($){$.JsonRpcClient=function(options){var self=this;this.options=$.extend({ajaxUrl:null,socketUrl:null,onmessage:null,login:null,passwd:null,sessid:null,loginParams:null,getSocket:function(onmessage_cb){return self._getSocket(onmessage_cb);}},options);self.ws_cnt=0;this.wsOnMessage=function(event){self._wsOnMessage(event);};};$.JsonRpcClient.prototype._ws_socket=null;$.JsonRpcClient.prototype._ws_callbacks={};$.JsonRpcClient.prototype._current_id=1;$.JsonRpcClient.prototype.call=function(method,params,success_cb,error_cb){if(!params){params={};}
@@ -197,7 +208,7 @@ if(success){}
 break;default:break;}};$.verto.dialog.prototype.hangup=function(params){var dialog=this;if(params){if(params.causeCode){dialog.causeCode=params.causeCode;}
 if(params.cause){dialog.cause=params.cause;}}
 if(dialog.state.val>=$.verto.enum.state.new.val&&dialog.state.val<$.verto.enum.state.hangup.val){dialog.setState($.verto.enum.state.hangup);}else if(dialog.state.val<$.verto.enum.state.destroy){dialog.setState($.verto.enum.state.destroy);}};$.verto.dialog.prototype.stopRinging=function(){var dialog=this;if(dialog.verto.ringer){dialog.verto.ringer.stop();}};$.verto.dialog.prototype.indicateRing=function(){var dialog=this;if(dialog.verto.ringer){dialog.verto.ringer.attr("src",dialog.verto.options.ringFile)[0].play();setTimeout(function(){dialog.stopRinging();if(dialog.state==$.verto.enum.state.ringing){dialog.indicateRing();}},dialog.verto.options.ringSleep);}};$.verto.dialog.prototype.ring=function(){var dialog=this;dialog.setState($.verto.enum.state.ringing);dialog.indicateRing();};$.verto.dialog.prototype.useVideo=function(on){var dialog=this;dialog.params.useVideo=on;if(on){dialog.videoStream=dialog.audioStream;}else{dialog.videoStream=null;}
-dialog.rtc.useVideo(dialog.videoStream);};$.verto.dialog.prototype.useStereo=function(on){var dialog=this;dialog.params.useStereo=on;dialog.rtc.useStereo(on);};$.verto.dialog.prototype.dtmf=function(digits){var dialog=this;if(digits){dialog.sendMethod("verto.info",{dtmf:digits});}};$.verto.dialog.prototype.transfer=function(dest,params){var dialog=this;if(dest){dialog.sendMethod("verto.modify",{action:"transfer",destination:dest,params:params});}};$.verto.dialog.prototype.hold=function(params){var dialog=this;dialog.sendMethod("verto.modify",{action:"hold",params:params});};$.verto.dialog.prototype.unhold=function(params){var dialog=this;dialog.sendMethod("verto.modify",{action:"unhold",params:params});};$.verto.dialog.prototype.toggleHold=function(params){var dialog=this;dialog.sendMethod("verto.modify",{action:"toggleHold",params:params});};$.verto.dialog.prototype.message=function(msg){var dialog=this;var err=0;msg.from=dialog.params.login;if(!msg.to){console.error("Missing To");err++;}
+dialog.rtc.useVideo(dialog.videoStream);};$.verto.dialog.prototype.setMute=function(what){var dialog=this;return dialog.rtc.setMute(what);};$.verto.dialog.prototype.getMute=function(what){var dialog=this;return dialog.rtc.getMute(what);};$.verto.dialog.prototype.useStereo=function(on){var dialog=this;dialog.params.useStereo=on;dialog.rtc.useStereo(on);};$.verto.dialog.prototype.dtmf=function(digits){var dialog=this;if(digits){dialog.sendMethod("verto.info",{dtmf:digits});}};$.verto.dialog.prototype.transfer=function(dest,params){var dialog=this;if(dest){dialog.sendMethod("verto.modify",{action:"transfer",destination:dest,params:params});}};$.verto.dialog.prototype.hold=function(params){var dialog=this;dialog.sendMethod("verto.modify",{action:"hold",params:params});};$.verto.dialog.prototype.unhold=function(params){var dialog=this;dialog.sendMethod("verto.modify",{action:"unhold",params:params});};$.verto.dialog.prototype.toggleHold=function(params){var dialog=this;dialog.sendMethod("verto.modify",{action:"toggleHold",params:params});};$.verto.dialog.prototype.message=function(msg){var dialog=this;var err=0;msg.from=dialog.params.login;if(!msg.to){console.error("Missing To");err++;}
 if(!msg.body){console.error("Missing Body");err++;}
 if(err){return false;}
 dialog.sendMethod("verto.info",{msg:msg});return true;};$.verto.dialog.prototype.answer=function(params){var dialog=this;if(!dialog.answered){if(params){if(params.useVideo){dialog.useVideo(true);}
index 82348fe140c954e2012512f2e6d7f66a428c8f9b..a01a4b40f88badf67e5b83d036415f2ec2992061 100644 (file)
@@ -77,6 +77,9 @@
             useVideo: null,
             useStereo: false,
             userData: null,
+           localVideo: null,
+           screenShare: false,
+           useCamera: "any",
             iceServers: false,
             videoParams: {},
             audioParams: {},
                 onICEComplete: function() {},
                 onICE: function() {},
                 onOfferSDP: function() {}
-            }
+            },
         }, options);
 
+       this.enabled = true;
+
         this.mediaData = {
             SDP: null,
             profile: {},
         checkCompat();
     };
 
-    $.FSRTC.prototype.useVideo = function(obj) {
+    $.FSRTC.prototype.useVideo = function(obj, local) {
         var self = this;
 
         if (obj) {
             self.options.useVideo = obj;
+           self.options.localVideo = local;
            if (moz) {
                self.constraints.offerToReceiveVideo = true;
            } else {
            }
         } else {
             self.options.useVideo = null;
+           self.options.localVideo = null;
             if (moz) {
                self.constraints.offerToReceiveVideo = false;
            } else {
         doCallback(self, "onError", e);
     }
 
-    function onStreamSuccess(self) {
+    function onStreamSuccess(self, stream) {
         console.log("Stream Success");
+        doCallback(self, "onStream", stream);
     }
 
     function onICE(self, candidate) {
 
         if (self.options.useVideo) {
             self.options.useVideo.style.display = 'none';
+           self.options.useVideo[moz ? 'mozSrcObject' : 'src'] = "";
         }
 
         if (self.localStream) {
             self.localStream = null;
         }
 
+        if (self.options.localVideo) {
+            self.options.localVideo.style.display = 'none';
+           self.options.localVideo[moz ? 'mozSrcObject' : 'src'] = "";
+        }
+
+       if (self.options.localVideoStream) {
+           self.options.localVideoStream.stop();
+        }
+
         if (self.peer) {
             console.log("stopping peer");
             self.peer.stop();
         }
     };
 
-    $.FSRTC.prototype.createAnswer = function(sdp) {
+    $.FSRTC.prototype.getMute = function() {
+       var self = this;
+       return self.enabled;
+    }
+
+    $.FSRTC.prototype.setMute = function(what) {
+       var self = this;
+       var audioTracks = self.localStream.getAudioTracks();    
+
+       for (var i = 0, len = audioTracks.length; i < len; i++ ) {
+           switch(what) {
+           case "on":
+               audioTracks[i].enabled = true;
+               break;
+           case "off":
+               audioTracks[i].enabled = false;
+               break;
+           case "toggle":
+               audioTracks[i].enabled = !audioTracks[i].enabled;
+           default:
+               break;
+           }
+
+           self.enabled = audioTracks[i].enabled;
+       }
+
+       return !self.enabled;
+    }
+
+    $.FSRTC.prototype.createAnswer = function(params) {
         var self = this;
         self.type = "answer";
-        self.remoteSDP = sdp;
-        console.debug("inbound sdp: ", sdp);
+        self.remoteSDP = params.sdp;
+        console.debug("inbound sdp: ", params.sdp);
+
+       self.options.useCamera = params.useCamera || "any";
+       self.options.useMic = params.useMic || "any";
 
         function onSuccess(stream) {
             self.localStream = stream;
             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 (this.options.videoParams && this.options.videoParams.chromeMediaSource == 'screen') {
+       if (obj.options.videoParams && obj.options.screenShare) {//obj.options.videoParams.chromeMediaSource == 'desktop') {
 
-           this.options.videoParams = {
-               chromeMediaSource: 'screen',
-               maxWidth:screen.width,
-               maxHeight:screen.height
-           };
+           //obj.options.videoParams = {
+       //      chromeMediaSource: 'screen',
+       //      maxWidth:screen.width,
+       //      maxHeight:screen.height
+       //      chromeMediaSourceId = sourceId;
+         //  };
 
            console.error("SCREEN SHARE");
            audio = false;
        } else {
            audio = {
-               mandatory: this.options.audioParams,
+               mandatory: obj.options.audioParams,
                optional: []
            };
+
+           if (obj.options.useMic !== "any") {
+               audio.optional = [{sourceId: obj.options.useMic}]
+           }
+
        }
 
-       console.log("Mandatory audio constraints", this.options.audioParams);
-       console.log("Mandatory video constraints", this.options.videoParams);
+       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!");}
+            });
+       }
 
-        getUserMedia({
-            constraints: {
-               audio: audio,
-                video: this.options.useVideo ? {
-                    mandatory: this.options.videoParams,
-                    optional: []
-                } : null
-            },
-            video: this.options.useVideo ? true : false,
-            onsuccess: onSuccess,
-            onerror: onError
-        });
+       var 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;
+       }
+
+       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) { //self.options.videoParams.chromeMediaSource == 'desktop') {
+           screen = true;
+       }
+
         function onSuccess(stream) {
-            self.localStream = stream;
+           self.localStream = stream;
 
             self.peer = RTCPeerConnection({
                 type: self.type,
                 onICEComplete: function() {
                     return onICEComplete(self);
                 },
-                onRemoteStream: function(stream) {
+                onRemoteStream: screen ? function(stream) {console.error("SKIP");} : function(stream) {
                     return onRemoteStream(self, stream);
                 },
                 onOfferSDP: function(sdp) {
                 iceServers: self.options.iceServers,
             });
 
-            onStreamSuccess(self);
+            onStreamSuccess(self, stream);
         }
 
         function onError(e) {
             onStreamError(self, e);
         }
 
+       var mediaParams = getMediaParams(self);
 
-       var audio;
-
-       if (this.options.videoParams && this.options.videoParams.chromeMediaSource == 'screen') {
-
-           this.options.videoParams = {
-               chromeMediaSource: 'screen',
-               maxWidth:screen.width,
-               maxHeight:screen.height
-           };
-
-           console.error("SCREEN SHARE");
-           audio = false;
-       } else {
-           audio = {
-               mandatory: this.options.audioParams,
-               optional: []
-           };
-       }
-
-       console.log("Mandatory audio constraints", this.options.audioParams);
-       console.log("Mandatory video constraints", this.options.videoParams);
+       console.log("Audio constraints", mediaParams.audio);
+       console.log("Video constraints", mediaParams.video);
 
 
         getUserMedia({
             constraints: {
-                audio: audio,
-                video: this.options.useVideo ? {
-                    mandatory: this.options.videoParams,
-                    optional: []
-                } : null
+                audio: mediaParams.audio,
+                video: mediaParams.video
             },
-            video: this.options.useVideo ? true : false,
+            video: mediaParams.useVideo,
             onsuccess: onSuccess,
             onerror: onError
         });
 
+
+
+
         /*
         navigator.getUserMedia({
-            video: this.options.useVideo,
+            video: self.options.useVideo,
             audio: true
         }, onSuccess, onError);
         */
         });
 
         function streaming(stream) {
-            var video = options.video;
-            if (video) {
-                video[moz ? 'mozSrcObject' : 'src'] = moz ? stream : window.webkitURL.createObjectURL(stream);
+            //var video = options.video;
+            //var localVideo = options.localVideo;
+            //if (video) {
+              //  video[moz ? 'mozSrcObject' : 'src'] = moz ? stream : window.webkitURL.createObjectURL(stream);
                 //video.play();
+            //}
+
+            if (options.localVideo) {
+                options.localVideo[moz ? 'mozSrcObject' : 'src'] = moz ? stream : window.webkitURL.createObjectURL(stream);
+               options.localVideo.style.display = 'block';
             }
+
             if (options.onsuccess) {
                 options.onsuccess(stream);
             }
+
             media = stream;
         }
 
index 12b1409db9e18a1b0c62108427a602fa914f4927..354725520740ef17ccf0337421c41b67a652500b 100644 (file)
 
     };
 
+    $.verto.dialog.prototype.setMute = function(what) {
+       var dialog = this;
+       return dialog.rtc.setMute(what);
+    };
+
+    $.verto.dialog.prototype.getMute = function(what) {
+       var dialog = this; 
+       return dialog.rtc.getMute(what);
+    };
+
     $.verto.dialog.prototype.useStereo = function(on) {
         var dialog = this;