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

Fixes broken video in FF

This commit is contained in:
paweldomas 2015-07-21 10:15:57 +02:00
parent c3548eb866
commit bc935eb5dc
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/RTC/RTCUtils.js
View File

@ -164,12 +164,16 @@ function RTCUtils(RTCService, onTemasysPluginReady)
element[0].play();
};
this.getStreamID = function (stream) {
var tracks = stream.getVideoTracks();
if(!tracks || tracks.length == 0)
{
tracks = stream.getAudioTracks();
var id = stream.id;
if (!id) {
var tracks = stream.getVideoTracks();
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) {
if(!element)

8
modules/xmpp/JingleSession.js
View File

@ -101,7 +101,7 @@ JingleSession.prototype.initiate = function (peerjid, isInitiator) {
};
this.peerconnection.onaddstream = function (event) {
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);
} else {
// This is a recvonly stream. Clients that implement Unified Plan,
@ -1372,7 +1372,9 @@ JingleSession.prototype.remoteStreamAdded = function (data, times) {
var streamId = APP.RTC.getStreamID(data.stream);
// 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
var ssrclines
@ -1399,6 +1401,8 @@ JingleSession.prototype.remoteStreamAdded = function (data, times) {
data.videoType = self.ssrcVideoTypes[thessrc]
console.log('associated jid', self.ssrcOwners[thessrc],
thessrc, data.videoType);
} else {
console.error("No SSRC lines for ", streamId);
}
}