Michelle Bu 12 lat temu
rodzic
commit
363653cfdd
2 zmienionych plików z 9 dodań i 5 usunięć
  1. 3 3
      public/js/sink.js
  2. 6 2
      public/js/source.js

+ 3 - 3
public/js/sink.js

@@ -22,15 +22,15 @@ SinkPeer.prototype.socketInit = function(cb) {
     self.setupDataChannel();
 
     self._socket.on('offer', function(offer) {
-      self._pc.setRemoteDescription(JSON.parse(offer.sdp), function() {
+      self._pc.setRemoteDescription(offer.sdp, function() {
         self._pc.createAnswer(function(answer) {
           self._pc.setLocalDescription(answer, function() {
             self._socket.emit('answer',
                 { 'sink': self._id,
-                  'sdp': JSON.stringify(answer),
+                  'sdp': answer,
                   'source': offer.source });
             // Firefoxism
-            console.log('FIREFOX', new Date());
+            console.log('FIREFOX');
             self._pc.connectDataConnection(5001, 5000);
             console.log('FIREFOX-2');
           }, function(err) {

+ 6 - 2
public/js/source.js

@@ -31,7 +31,7 @@ SourcePeer.prototype.socketInit = function() {
           pc.createOffer(function(offer) {
             pc.setLocalDescription(offer, function() {
               self._socket.emit('offer',
-                  { 'sdp': JSON.stringify(offer),
+                  { 'sdp': offer,
                     'sink': target,
                     'source': self._id });
             }, function(err) {
@@ -43,7 +43,7 @@ SourcePeer.prototype.socketInit = function() {
     });
 
     self._socket.on('answer', function(data) {
-      self._pcs[data.sink].setRemoteDescription(JSON.parse(data.sdp), function() {
+      self._pcs[data.sink].setRemoteDescription(data.sdp, function() {
         // Firefoxism
         console.log('FIREFOX', new Date());
         self._pcs[data.sink].connectDataConnection(5000, 5001);
@@ -90,6 +90,10 @@ SourcePeer.prototype.setupDataChannel = function(pc, target, cb) {
     };
   };
 
+  pc.ondatachannel = function() {
+    console.log('SOURCE: data channeled');
+  };
+
   pc.onclosedconnection = function() {
     // ??
   };