fixes

ealymbaev · Mar 6, 2013 · ba28371 · ba28371
1 parent c1bca65
commit ba28371
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 22 deletions.
diff --git a/dist/Call.js b/dist/Call.js
diff --git a/dist/shims.js b/dist/shims.js
diff --git a/examples/holla.js b/examples/holla.js
@@ -3547,13 +3547,18 @@ require.register("holla/dist/Call.js", function(exports, require, module){
         return _this.pc.addIceCandidate(new shims.IceCandidate(candidate));
       });
       this.parent.on("sdp." + this.user, function(desc) {
+        var err, succ;
         desc.sdp = shims.processSDPIn(desc.sdp);
-        _this.pc.setRemoteDescription(new shims.SessionDescription(desc));
-        console.log(desc);
-        if (!_this.isCaller) {
-          _this.initSDP();
-        }
-        return _this.emit("sdp");
+        err = function(e) {
+          throw e;
+        };
+        succ = function() {
+          if (!_this.isCaller) {
+            _this.initSDP();
+          }
+          return _this.emit("sdp");
+        };
+        return _this.pc.setRemoteDescription(new shims.SessionDescription(desc), succ, err);
       });
       this.parent.on("hangup." + this.user, function() {
         return _this.emit("hangup");
@@ -3946,6 +3951,10 @@ require.register("holla/dist/shims.js", function(exports, require, module){
         ]
       };
       mediaConstraints = {
+        mandatory: {
+          OfferToReceiveAudio: true,
+          OfferToReceiveVideo: true
+        },
         optional: [
           {
             DtlsSrtpKeyAgreement: true

diff --git a/holla.js b/holla.js
@@ -3547,13 +3547,18 @@ require.register("holla/dist/Call.js", function(exports, require, module){
         return _this.pc.addIceCandidate(new shims.IceCandidate(candidate));
       });
       this.parent.on("sdp." + this.user, function(desc) {
+        var err, succ;
         desc.sdp = shims.processSDPIn(desc.sdp);
-        _this.pc.setRemoteDescription(new shims.SessionDescription(desc));
-        console.log(desc);
-        if (!_this.isCaller) {
-          _this.initSDP();
-        }
-        return _this.emit("sdp");
+        err = function(e) {
+          throw e;
+        };
+        succ = function() {
+          if (!_this.isCaller) {
+            _this.initSDP();
+          }
+          return _this.emit("sdp");
+        };
+        return _this.pc.setRemoteDescription(new shims.SessionDescription(desc), succ, err);
       });
       this.parent.on("hangup." + this.user, function() {
         return _this.emit("hangup");
@@ -3946,6 +3951,10 @@ require.register("holla/dist/shims.js", function(exports, require, module){
         ]
       };
       mediaConstraints = {
+        mandatory: {
+          OfferToReceiveAudio: true,
+          OfferToReceiveVideo: true
+        },
         optional: [
           {
             DtlsSrtpKeyAgreement: true

diff --git a/holla.min.js b/holla.min.js
diff --git a/lib/Call.coffee b/lib/Call.coffee
@@ -24,9 +24,11 @@ class Call extends EventEmitter
 
     @parent.on "sdp.#{@user}", (desc) =>
       desc.sdp = shims.processSDPIn desc.sdp
-      @pc.setRemoteDescription new shims.SessionDescription(desc)
-      @initSDP() unless @isCaller
-      @emit "sdp"
+      err = (e) -> throw e
+      succ = =>
+        @initSDP() unless @isCaller
+        @emit "sdp"
+      @pc.setRemoteDescription new shims.SessionDescription(desc), succ, err
 
     @parent.on "hangup.#{@user}", =>
       @emit "hangup"

diff --git a/lib/shims.coffee b/lib/shims.coffee
@@ -164,6 +164,9 @@ shim = ->
         url: "stun:stun.l.google.com:19302"
       ]
     mediaConstraints =
+      mandatory:
+        OfferToReceiveAudio: true
+        OfferToReceiveVideo: true
       optional: [
         DtlsSrtpKeyAgreement: true
       ]