|
@@ -2,7 +2,6 @@ import * as ConnectionQualityEvents
|
2
|
2
|
from '../../service/connectivity/ConnectionQualityEvents';
|
3
|
3
|
import * as ConferenceEvents from '../../JitsiConferenceEvents';
|
4
|
4
|
import { getLogger } from 'jitsi-meet-logger';
|
5
|
|
-import RTCBrowserType from '../RTC/RTCBrowserType';
|
6
|
5
|
|
7
|
6
|
const XMPPEvents = require('../../service/xmpp/XMPPEvents');
|
8
|
7
|
const VideoType = require('../../service/RTC/VideoType');
|
|
@@ -159,13 +158,6 @@ export default class ConnectionQuality {
|
159
|
158
|
*/
|
160
|
159
|
this._conference = conference;
|
161
|
160
|
|
162
|
|
- /**
|
163
|
|
- * Whether simulcast is supported. Note that even if supported, it is
|
164
|
|
- * currently not used for screensharing.
|
165
|
|
- */
|
166
|
|
- this._simulcast
|
167
|
|
- = !options.disableSimulcast && RTCBrowserType.supportsSimulcast();
|
168
|
|
-
|
169
|
161
|
/**
|
170
|
162
|
* Holds statistics about the local connection quality.
|
171
|
163
|
*/
|
|
@@ -346,9 +338,14 @@ export default class ConnectionQuality {
|
346
|
338
|
const millisSinceStart = window.performance.now()
|
347
|
339
|
- Math.max(this._timeVideoUnmuted, this._timeIceConnected);
|
348
|
340
|
|
|
341
|
+ // Figure out if simulcast is in use
|
|
342
|
+ const activeTPC = this._conference.getActivePeerConnection();
|
|
343
|
+ const isSimulcastOn
|
|
344
|
+ = Boolean(activeTPC && activeTPC.isSimulcastOn());
|
|
345
|
+
|
349
|
346
|
// expected sending bitrate in perfect conditions
|
350
|
347
|
let target
|
351
|
|
- = getTarget(this._simulcast, resolution, millisSinceStart);
|
|
348
|
+ = getTarget(isSimulcastOn, resolution, millisSinceStart);
|
352
|
349
|
|
353
|
350
|
target = 0.9 * target;
|
354
|
351
|
|