auto_join_3.3
Håvar Aambø Fosstveit 2020-03-23 21:42:01 +01:00
parent 71b90dfb6c
commit 37f3c8cabd
1 changed files with 22 additions and 18 deletions

View File

@ -122,7 +122,17 @@ export default class RoomClient
} }
constructor( constructor(
{ peerId, accessCode, device, useSimulcast, useSharingSimulcast, produce, forceTcp, displayName, muted } = {}) {
peerId,
accessCode,
device,
useSimulcast,
useSharingSimulcast,
produce,
forceTcp,
displayName,
muted
} = {})
{ {
if (!peerId) if (!peerId)
throw new Error('Missing peerId'); throw new Error('Missing peerId');
@ -706,7 +716,7 @@ export default class RoomClient
this._webTorrent.seed( this._webTorrent.seed(
files, files,
{ announceList: [['wss://tracker.lab.vvc.niif.hu:443']] }, { announceList: [ [ 'wss://tracker.lab.vvc.niif.hu:443' ] ] },
(torrent) => (torrent) =>
{ {
store.dispatch(requestActions.notify( store.dispatch(requestActions.notify(
@ -2595,9 +2605,7 @@ export default class RoomClient
{ {
encodings = VIDEO_SVC_ENCODINGS; encodings = VIDEO_SVC_ENCODINGS;
} }
else else if ('simulcastEncodings' in window.config)
{
if ('simulcastEncodings' in window.config)
{ {
encodings = window.config.simulcastEncodings encodings = window.config.simulcastEncodings
.map((encoding) => ({ ...encoding, dtx: true })); .map((encoding) => ({ ...encoding, dtx: true }));
@ -2607,7 +2615,6 @@ export default class RoomClient
encodings = VIDEO_SIMULCAST_ENCODINGS encodings = VIDEO_SIMULCAST_ENCODINGS
.map((encoding) => ({ ...encoding, dtx: true })); .map((encoding) => ({ ...encoding, dtx: true }));
} }
}
this._screenSharingProducer = await this._sendTransport.produce( this._screenSharingProducer = await this._sendTransport.produce(
{ {
@ -2773,13 +2780,10 @@ export default class RoomClient
if (firstVideoCodec.mimeType.toLowerCase() === 'video/vp9') if (firstVideoCodec.mimeType.toLowerCase() === 'video/vp9')
encodings = VIDEO_KSVC_ENCODINGS; encodings = VIDEO_KSVC_ENCODINGS;
else else if ('simulcastEncodings' in window.config)
{
if ('simulcastEncodings' in window.config)
encodings = window.config.simulcastEncodings; encodings = window.config.simulcastEncodings;
else else
encodings = VIDEO_SIMULCAST_ENCODINGS; encodings = VIDEO_SIMULCAST_ENCODINGS;
}
this._webcamProducer = await this._sendTransport.produce( this._webcamProducer = await this._sendTransport.produce(
{ {