FS-8877 #resolve [Chrome Canary removed some audio mandatory constraints that break...

diff --git a/html5/verto/js/src/jquery.FSRTC.js b/html5/verto/js/src/jquery.FSRTC.js
index 38ea5228a11c4b59d2df5f43035ece94b55cdd15..7bc2aa86130a825e6052b4773c2a2b5ded0d2704 100644 (file)
--- a/html5/verto/js/src/jquery.FSRTC.js
+++ b/html5/verto/js/src/jquery.FSRTC.js
@@ -513,7 +513,7 @@
            audio = false;
        } else {
            audio = {
-               mandatory: obj.options.audioParams,
+               mandatory: {},
                optional: []
            };
 
@@ -521,6 +521,15 @@
                audio.optional = [{sourceId: obj.options.useMic}]
            }
 
+           if (obj.options.audioParams) {
+               for (var key in obj.options.audioParams) {
+                   var con = {};
+                   con[key] = obj.options.audioParams[key];
+                   audio.optional.push(con);
+               }
+           }
+
+
        }
 
        if (obj.options.useVideo && obj.options.localVideo) {

diff --git a/html5/verto/video_demo/js/verto-min.js b/html5/verto/video_demo/js/verto-min.js
index 84453f06d12bf85dd97a6272574cfe79c8b33f12..ce4dd194f36b1ed5dd0cbd02f235d77d835f06a8 100644 (file)
--- a/html5/verto/video_demo/js/verto-min.js
+++ b/html5/verto/video_demo/js/verto-min.js
@@ -45,7 +45,8 @@ return!self.videoEnabled;}
 $.FSRTC.prototype.createAnswer=function(params){var self=this;self.type="answer";self.remoteSDP=params.sdp;console.debug("inbound sdp: ",params.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);}
 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.useMic&&obj.options.useMic==="none"){console.log("Microphone Disabled");audio=false;}else 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}]}}
+getUserMedia({constraints:{audio:mediaParams.audio,video:mediaParams.video},video:mediaParams.useVideo,onsuccess:onSuccess,onerror:onError});};function getMediaParams(obj){var audio;if(obj.options.useMic&&obj.options.useMic==="none"){console.log("Microphone Disabled");audio=false;}else if(obj.options.videoParams&&obj.options.screenShare){console.error("SCREEN SHARE");audio=false;}else{audio={mandatory:{},optional:[]};if(obj.options.useMic!=="any"){audio.optional=[{sourceId:obj.options.useMic}]}
+if(obj.options.audioParams){for(var key in obj.options.audioParams){var con={};con[key]=obj.options.audioParams[key];audio.optional.push(con);}}}
 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={};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=[];}

diff --git a/html5/verto/video_demo/verto.js b/html5/verto/video_demo/verto.js
index a4c71c36b3d25f1a1d4ea0ac371ab9c1d2bd33c6..2df2f0824d202ef2fe4a869a99fdcbd40b04d1b4 100644 (file)
--- a/html5/verto/video_demo/verto.js
+++ b/html5/verto/video_demo/verto.js
@@ -1441,11 +1441,11 @@ function init() {
 
        },
 
-//     audioParams: {
-//         googAutoGainControl: false,
-//         googNoiseSuppression: false,
-//         googHighpassFilter: false
-//     },
+       audioParams: {
+           googAutoGainControl: false,
+           googNoiseSuppression: false,
+           googHighpassFilter: false
+       },
 
        iceServers: $("#use_stun").is(':checked')
     },callbacks);