|
|
@@ -1215,42 +1215,6 @@ JingleSessionPC.onJingleFatalError = function (session, error)
|
|
1215
|
1215
|
this.room.eventEmitter.emit(XMPPEvents.JINGLE_FATAL_ERROR, session, error);
|
|
1216
|
1216
|
}
|
|
1217
|
1217
|
|
|
1218
|
|
-// an attempt to work around https://github.com/jitsi/jitmeet/issues/32
|
|
1219
|
|
-JingleSessionPC.prototype.sendKeyframe = function () {
|
|
1220
|
|
- var pc = this.peerconnection;
|
|
1221
|
|
- logger.log('sendkeyframe', pc.iceConnectionState);
|
|
1222
|
|
- if (pc.iceConnectionState !== 'connected') return; // safe...
|
|
1223
|
|
- var self = this;
|
|
1224
|
|
- pc.setRemoteDescription(
|
|
1225
|
|
- pc.remoteDescription,
|
|
1226
|
|
- function () {
|
|
1227
|
|
- pc.createAnswer(
|
|
1228
|
|
- function (modifiedAnswer) {
|
|
1229
|
|
- pc.setLocalDescription(
|
|
1230
|
|
- modifiedAnswer,
|
|
1231
|
|
- function () {
|
|
1232
|
|
- // noop
|
|
1233
|
|
- },
|
|
1234
|
|
- function (error) {
|
|
1235
|
|
- logger.log('triggerKeyframe setLocalDescription failed', error);
|
|
1236
|
|
- self.room.eventEmitter.emit(XMPPEvents.SET_LOCAL_DESCRIPTION_ERROR);
|
|
1237
|
|
- }
|
|
1238
|
|
- );
|
|
1239
|
|
- },
|
|
1240
|
|
- function (error) {
|
|
1241
|
|
- logger.log('triggerKeyframe createAnswer failed', error);
|
|
1242
|
|
- self.room.eventEmitter.emit(XMPPEvents.CREATE_ANSWER_ERROR);
|
|
1243
|
|
- }
|
|
1244
|
|
- );
|
|
1245
|
|
- },
|
|
1246
|
|
- function (error) {
|
|
1247
|
|
- logger.log('triggerKeyframe setRemoteDescription failed', error);
|
|
1248
|
|
- eventEmitter.emit(XMPPEvents.SET_REMOTE_DESCRIPTION_ERROR);
|
|
1249
|
|
- }
|
|
1250
|
|
- );
|
|
1251
|
|
-}
|
|
1252
|
|
-
|
|
1253
|
|
-
|
|
1254
|
1218
|
JingleSessionPC.prototype.remoteStreamAdded = function (data, times) {
|
|
1255
|
1219
|
var self = this;
|
|
1256
|
1220
|
var thessrc;
|
|
|
@@ -1290,17 +1254,6 @@ JingleSessionPC.prototype.remoteStreamAdded = function (data, times) {
|
|
1290
|
1254
|
}
|
|
1291
|
1255
|
|
|
1292
|
1256
|
this.room.remoteStreamAdded(data, this.sid, thessrc);
|
|
1293
|
|
-
|
|
1294
|
|
- var isVideo = data.stream.getVideoTracks().length > 0;
|
|
1295
|
|
- // an attempt to work around https://github.com/jitsi/jitmeet/issues/32
|
|
1296
|
|
- if (isVideo &&
|
|
1297
|
|
- data.peerjid && this.peerjid === data.peerjid &&
|
|
1298
|
|
- data.stream.getVideoTracks().length === 0 &&
|
|
1299
|
|
- RTC.localVideo.getTracks().length > 0) {
|
|
1300
|
|
- window.setTimeout(function () {
|
|
1301
|
|
- self.sendKeyframe();
|
|
1302
|
|
- }, 3000);
|
|
1303
|
|
- }
|
|
1304
|
1257
|
}
|
|
1305
|
1258
|
|
|
1306
|
1259
|
/**
|