haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updates app.bundle

This commit is contained in:
paweldomas 2015-07-21 10:17:59 +02:00
parent bc935eb5dc
commit 2d522f735e
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.html
View File

@ -22,7 +22,7 @@
<script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib --> <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
<script src="libs/toastr.js?v=1"></script><!-- notifications lib --> <script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
<script src="interface_config.js?v=5"></script> <script src="interface_config.js?v=5"></script>
<script src="libs/app.bundle.js?v=107"></script> <script src="libs/app.bundle.js?v=108"></script>
<script src="analytics.js?v=1"></script><!-- google analytics plugin --> <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
<link rel="stylesheet" href="css/font.css?v=7"/> <link rel="stylesheet" href="css/font.css?v=7"/>
<link rel="stylesheet" href="css/toastr.css?v=1"> <link rel="stylesheet" href="css/toastr.css?v=1">

22
libs/app.bundle.js
View File

@ -1726,12 +1726,16 @@ function RTCUtils(RTCService, onTemasysPluginReady)
element[0].play(); element[0].play();
}; };
this.getStreamID = function (stream) { this.getStreamID = function (stream) {
var tracks = stream.getVideoTracks(); var id = stream.id;
if(!tracks || tracks.length == 0) if (!id) {
{ var tracks = stream.getVideoTracks();
tracks = stream.getAudioTracks(); if (!tracks || tracks.length === 0)
{
tracks = stream.getAudioTracks();
}
id = tracks[0].id;
} }
return SDPUtil.filter_special_chars(tracks[0].id); return SDPUtil.filter_special_chars(id);
}; };
this.getVideoSrc = function (element) { this.getVideoSrc = function (element) {
if(!element) if(!element)
@ -13551,7 +13555,7 @@ JingleSession.prototype.initiate = function (peerjid, isInitiator) {
}; };
this.peerconnection.onaddstream = function (event) { this.peerconnection.onaddstream = function (event) {
if (event.stream.id !== 'default') { if (event.stream.id !== 'default') {
console.log("REMOTE STREAM ADDED: " + event.stream + " - " + event.stream.id); console.log("REMOTE STREAM ADDED: ", event.stream , event.stream.id);
self.remoteStreamAdded(event); self.remoteStreamAdded(event);
} else { } else {
// This is a recvonly stream. Clients that implement Unified Plan, // This is a recvonly stream. Clients that implement Unified Plan,
@ -14822,7 +14826,9 @@ JingleSession.prototype.remoteStreamAdded = function (data, times) {
var streamId = APP.RTC.getStreamID(data.stream); var streamId = APP.RTC.getStreamID(data.stream);
// look up an associated JID for a stream id // look up an associated JID for a stream id
if (streamId && streamId.indexOf('mixedmslabel') === -1) { if (!streamId) {
console.error("No stream ID for", data.stream);
} else if (streamId && streamId.indexOf('mixedmslabel') === -1) {
// look only at a=ssrc: and _not_ at a=ssrc-group: lines // look only at a=ssrc: and _not_ at a=ssrc-group: lines
var ssrclines var ssrclines
@ -14849,6 +14855,8 @@ JingleSession.prototype.remoteStreamAdded = function (data, times) {
data.videoType = self.ssrcVideoTypes[thessrc] data.videoType = self.ssrcVideoTypes[thessrc]
console.log('associated jid', self.ssrcOwners[thessrc], console.log('associated jid', self.ssrcOwners[thessrc],
thessrc, data.videoType); thessrc, data.videoType);
} else {
console.error("No SSRC lines for ", streamId);
} }
} }