浏览代码

note remotestream in colibrisession as well

master
Philipp Hancke 11 年前
父节点
当前提交
4a423f3826
共有 1 个文件被更改,包括 4 次插入1 次删除
  1. 4
    1
      libs/colibri.js

+ 4
- 1
libs/colibri.js 查看文件

98
         Object.keys(ob.remotessrc).forEach(function (jid) {
98
         Object.keys(ob.remotessrc).forEach(function (jid) {
99
             if (ob.remotessrc[jid].join('\r\n').indexOf('mslabel:' + event.stream.id) != -1) {
99
             if (ob.remotessrc[jid].join('\r\n').indexOf('mslabel:' + event.stream.id) != -1) {
100
                 event.peerjid = jid;
100
                 event.peerjid = jid;
101
+                if (ob.connection.jingle.jid2session[jid]) {
102
+                    ob.connection.jingle.jid2session[jid].remotestream = event.stream;
103
+                }
101
             }
104
             }
102
         });
105
         });
103
         $(document).trigger('remotestreamadded.jingle', [event, ob.sid]);
106
         $(document).trigger('remotestreamadded.jingle', [event, ob.sid]);
376
     sess.localStream = this.connection.jingle.localStream;
379
     sess.localStream = this.connection.jingle.localStream;
377
     sess.media_constraints = this.connection.jingle.media_constraints;
380
     sess.media_constraints = this.connection.jingle.media_constraints;
378
     sess.pc_constraints = this.connection.jingle.pc_constraints;
381
     sess.pc_constraints = this.connection.jingle.pc_constraints;
379
-    sess.ice_config = this.connection.ice_config;
382
+    sess.ice_config = this.connection.jingle.ice_config;
380
 
383
 
381
     this.connection.jingle.sessions[sess.sid] = sess;
384
     this.connection.jingle.sessions[sess.sid] = sess;
382
     this.connection.jingle.jid2session[sess.peerjid] = sess;
385
     this.connection.jingle.jid2session[sess.peerjid] = sess;

正在加载...
取消
保存