소스 검색

Taking into account the fact that FF nightlies include the local SSRCs in the local SDP.

master
George Politis 11 년 전
부모
커밋
66f7ddd6b2
1개의 변경된 파일9개의 추가작업 그리고 3개의 파일을 삭제
  1. 9
    3
      libs/strophe/strophe.jingle.adapter.js

+ 9
- 3
libs/strophe/strophe.jingle.adapter.js 파일 보기

529
                 },
529
                 },
530
                 pc_constraints: {},
530
                 pc_constraints: {},
531
                 getLocalSSRC: function (session, callback) {
531
                 getLocalSSRC: function (session, callback) {
532
-                    session.peerconnection.getStats(function (s) {
532
+                    // NOTE(gp) latest FF nightlies seem to provide the local
533
+                    // SSRCs in their SDP so there's no longer necessary to
534
+                    // take it from the peer connection stats.
535
+                    /*session.peerconnection.getStats(function (s) {
533
                             var ssrcs = {};
536
                             var ssrcs = {};
534
                             s.forEach(function (item) {
537
                             s.forEach(function (item) {
535
                                 if (item.type == "outboundrtp" && !item.isRemote)
538
                                 if (item.type == "outboundrtp" && !item.isRemote)
545
                         },
548
                         },
546
                         function () {
549
                         function () {
547
                             callback(null);
550
                             callback(null);
548
-                        });
551
+                        });*/
552
+                    callback(null);
549
                 },
553
                 },
550
                 getStreamID: function (stream) {
554
                 getStreamID: function (stream) {
551
                     var tracks = stream.getVideoTracks();
555
                     var tracks = stream.getVideoTracks();
584
                 callback(null);
588
                 callback(null);
585
             },
589
             },
586
             getStreamID: function (stream) {
590
             getStreamID: function (stream) {
587
-                return stream.id;
591
+                // streams from FF endpoints have the characters '{' and '}'
592
+                // that make jQuery choke.
593
+                return stream.id.replace(/[\{,\}]/g,"");
588
             },
594
             },
589
             getVideoSrc: function (element) {
595
             getVideoSrc: function (element) {
590
                 return element.getAttribute("src");
596
                 return element.getAttribute("src");

Loading…
취소
저장