|
@@ -1726,12 +1726,16 @@ function RTCUtils(RTCService, onTemasysPluginReady)
|
1726
|
1726
|
element[0].play();
|
1727
|
1727
|
};
|
1728
|
1728
|
this.getStreamID = function (stream) {
|
1729
|
|
- var tracks = stream.getVideoTracks();
|
1730
|
|
- if(!tracks || tracks.length == 0)
|
1731
|
|
- {
|
1732
|
|
- tracks = stream.getAudioTracks();
|
|
1729
|
+ var id = stream.id;
|
|
1730
|
+ if (!id) {
|
|
1731
|
+ var tracks = stream.getVideoTracks();
|
|
1732
|
+ if (!tracks || tracks.length === 0)
|
|
1733
|
+ {
|
|
1734
|
+ tracks = stream.getAudioTracks();
|
|
1735
|
+ }
|
|
1736
|
+ id = tracks[0].id;
|
1733
|
1737
|
}
|
1734
|
|
- return SDPUtil.filter_special_chars(tracks[0].id);
|
|
1738
|
+ return SDPUtil.filter_special_chars(id);
|
1735
|
1739
|
};
|
1736
|
1740
|
this.getVideoSrc = function (element) {
|
1737
|
1741
|
if(!element)
|
|
@@ -13551,7 +13555,7 @@ JingleSession.prototype.initiate = function (peerjid, isInitiator) {
|
13551
|
13555
|
};
|
13552
|
13556
|
this.peerconnection.onaddstream = function (event) {
|
13553
|
13557
|
if (event.stream.id !== 'default') {
|
13554
|
|
- console.log("REMOTE STREAM ADDED: " + event.stream + " - " + event.stream.id);
|
|
13558
|
+ console.log("REMOTE STREAM ADDED: ", event.stream , event.stream.id);
|
13555
|
13559
|
self.remoteStreamAdded(event);
|
13556
|
13560
|
} else {
|
13557
|
13561
|
// This is a recvonly stream. Clients that implement Unified Plan,
|
|
@@ -14822,7 +14826,9 @@ JingleSession.prototype.remoteStreamAdded = function (data, times) {
|
14822
|
14826
|
var streamId = APP.RTC.getStreamID(data.stream);
|
14823
|
14827
|
|
14824
|
14828
|
// look up an associated JID for a stream id
|
14825
|
|
- if (streamId && streamId.indexOf('mixedmslabel') === -1) {
|
|
14829
|
+ if (!streamId) {
|
|
14830
|
+ console.error("No stream ID for", data.stream);
|
|
14831
|
+ } else if (streamId && streamId.indexOf('mixedmslabel') === -1) {
|
14826
|
14832
|
// look only at a=ssrc: and _not_ at a=ssrc-group: lines
|
14827
|
14833
|
|
14828
|
14834
|
var ssrclines
|
|
@@ -14849,6 +14855,8 @@ JingleSession.prototype.remoteStreamAdded = function (data, times) {
|
14849
|
14855
|
data.videoType = self.ssrcVideoTypes[thessrc]
|
14850
|
14856
|
console.log('associated jid', self.ssrcOwners[thessrc],
|
14851
|
14857
|
thessrc, data.videoType);
|
|
14858
|
+ } else {
|
|
14859
|
+ console.error("No SSRC lines for ", streamId);
|
14852
|
14860
|
}
|
14853
|
14861
|
}
|
14854
|
14862
|
|