livekit-client 0.14.3 → 0.15.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (119) hide show
  1. package/.github/workflows/{lint.yaml → test.yaml} +7 -4
  2. package/.gitmodules +3 -0
  3. package/README.md +46 -14
  4. package/dist/api/SignalClient.d.ts +12 -32
  5. package/dist/api/SignalClient.js +59 -8
  6. package/dist/api/SignalClient.js.map +1 -1
  7. package/dist/connect.d.ts +1 -1
  8. package/dist/connect.js +71 -73
  9. package/dist/connect.js.map +1 -1
  10. package/dist/index.d.ts +6 -4
  11. package/dist/index.js +8 -5
  12. package/dist/index.js.map +1 -1
  13. package/dist/logger.d.ts +10 -0
  14. package/dist/logger.js +15 -0
  15. package/dist/logger.js.map +1 -1
  16. package/dist/options.d.ts +83 -19
  17. package/dist/options.js +0 -10
  18. package/dist/options.js.map +1 -1
  19. package/dist/proto/livekit_models.d.ts +45 -1
  20. package/dist/proto/livekit_models.js +333 -4
  21. package/dist/proto/livekit_models.js.map +1 -1
  22. package/dist/proto/livekit_rtc.d.ts +148 -7
  23. package/dist/proto/livekit_rtc.js +1047 -30
  24. package/dist/proto/livekit_rtc.js.map +1 -1
  25. package/dist/room/PCTransport.js +4 -0
  26. package/dist/room/PCTransport.js.map +1 -1
  27. package/dist/room/RTCEngine.d.ts +4 -2
  28. package/dist/room/RTCEngine.js +36 -38
  29. package/dist/room/RTCEngine.js.map +1 -1
  30. package/dist/room/Room.d.ts +23 -17
  31. package/dist/room/Room.js +205 -71
  32. package/dist/room/Room.js.map +1 -1
  33. package/dist/room/events.d.ts +143 -14
  34. package/dist/room/events.js +142 -13
  35. package/dist/room/events.js.map +1 -1
  36. package/dist/room/participant/LocalParticipant.d.ts +53 -13
  37. package/dist/room/participant/LocalParticipant.js +244 -169
  38. package/dist/room/participant/LocalParticipant.js.map +1 -1
  39. package/dist/room/participant/Participant.d.ts +3 -1
  40. package/dist/room/participant/Participant.js +3 -1
  41. package/dist/room/participant/Participant.js.map +1 -1
  42. package/dist/room/participant/ParticipantTrackPermission.d.ts +19 -0
  43. package/dist/room/participant/ParticipantTrackPermission.js +16 -0
  44. package/dist/room/participant/ParticipantTrackPermission.js.map +1 -0
  45. package/dist/room/participant/RemoteParticipant.d.ts +2 -2
  46. package/dist/room/participant/RemoteParticipant.js +10 -15
  47. package/dist/room/participant/RemoteParticipant.js.map +1 -1
  48. package/dist/room/participant/publishUtils.d.ts +11 -0
  49. package/dist/room/participant/publishUtils.js +148 -0
  50. package/dist/room/participant/publishUtils.js.map +1 -0
  51. package/dist/room/participant/publishUtils.test.d.ts +1 -0
  52. package/dist/room/participant/publishUtils.test.js +79 -0
  53. package/dist/room/participant/publishUtils.test.js.map +1 -0
  54. package/dist/room/stats.d.ts +21 -6
  55. package/dist/room/stats.js +22 -1
  56. package/dist/room/stats.js.map +1 -1
  57. package/dist/room/track/LocalAudioTrack.d.ts +8 -3
  58. package/dist/room/track/LocalAudioTrack.js +49 -3
  59. package/dist/room/track/LocalAudioTrack.js.map +1 -1
  60. package/dist/room/track/LocalTrack.d.ts +1 -3
  61. package/dist/room/track/LocalTrack.js +3 -50
  62. package/dist/room/track/LocalTrack.js.map +1 -1
  63. package/dist/room/track/LocalTrackPublication.d.ts +3 -1
  64. package/dist/room/track/LocalTrackPublication.js +15 -5
  65. package/dist/room/track/LocalTrackPublication.js.map +1 -1
  66. package/dist/room/track/LocalVideoTrack.d.ts +14 -5
  67. package/dist/room/track/LocalVideoTrack.js +156 -62
  68. package/dist/room/track/LocalVideoTrack.js.map +1 -1
  69. package/dist/room/track/LocalVideoTrack.test.d.ts +1 -0
  70. package/dist/room/track/LocalVideoTrack.test.js +68 -0
  71. package/dist/room/track/LocalVideoTrack.test.js.map +1 -0
  72. package/dist/room/track/RemoteAudioTrack.d.ts +6 -8
  73. package/dist/room/track/RemoteAudioTrack.js +55 -19
  74. package/dist/room/track/RemoteAudioTrack.js.map +1 -1
  75. package/dist/room/track/RemoteTrack.d.ts +14 -0
  76. package/dist/room/track/RemoteTrack.js +47 -0
  77. package/dist/room/track/RemoteTrack.js.map +1 -0
  78. package/dist/room/track/RemoteTrackPublication.d.ts +10 -4
  79. package/dist/room/track/RemoteTrackPublication.js +41 -15
  80. package/dist/room/track/RemoteTrackPublication.js.map +1 -1
  81. package/dist/room/track/RemoteVideoTrack.d.ts +7 -9
  82. package/dist/room/track/RemoteVideoTrack.js +77 -41
  83. package/dist/room/track/RemoteVideoTrack.js.map +1 -1
  84. package/dist/room/track/Track.d.ts +13 -2
  85. package/dist/room/track/Track.js +34 -2
  86. package/dist/room/track/Track.js.map +1 -1
  87. package/dist/room/track/TrackPublication.d.ts +14 -1
  88. package/dist/room/track/TrackPublication.js +24 -7
  89. package/dist/room/track/TrackPublication.js.map +1 -1
  90. package/dist/room/track/create.d.ts +4 -6
  91. package/dist/room/track/create.js +10 -57
  92. package/dist/room/track/create.js.map +1 -1
  93. package/dist/room/track/defaults.d.ts +4 -0
  94. package/dist/room/track/defaults.js +21 -0
  95. package/dist/room/track/defaults.js.map +1 -0
  96. package/dist/room/track/options.d.ts +15 -65
  97. package/dist/room/track/options.js +14 -13
  98. package/dist/room/track/options.js.map +1 -1
  99. package/dist/room/track/utils.d.ts +3 -0
  100. package/dist/room/track/utils.js +68 -0
  101. package/dist/room/track/utils.js.map +1 -0
  102. package/dist/room/track/utils.test.d.ts +1 -0
  103. package/dist/room/track/utils.test.js +85 -0
  104. package/dist/room/track/utils.test.js.map +1 -0
  105. package/dist/room/utils.d.ts +1 -1
  106. package/dist/room/utils.js +5 -6
  107. package/dist/room/utils.js.map +1 -1
  108. package/dist/version.d.ts +1 -1
  109. package/dist/version.js +1 -1
  110. package/example/index.html +193 -178
  111. package/example/sample.ts +467 -327
  112. package/example/styles.css +144 -0
  113. package/example/webpack.config.js +1 -1
  114. package/jest.config.js +6 -0
  115. package/package.json +9 -6
  116. package/tsconfig.eslint.json +8 -1
  117. package/dist/room/defaults.d.ts +0 -5
  118. package/dist/room/defaults.js +0 -32
  119. package/dist/room/defaults.js.map +0 -1
@@ -1,13 +1,11 @@
1
- import { CreateLocalTracksOptions } from './options';
2
1
  import { Track } from './Track';
3
2
  export default class LocalTrack extends Track {
4
3
  /** @internal */
5
4
  sender?: RTCRtpSender;
6
5
  protected constraints: MediaTrackConstraints;
7
- protected constructor(mediaTrack: MediaStreamTrack, kind: Track.Kind, name?: string, constraints?: MediaTrackConstraints);
6
+ protected constructor(mediaTrack: MediaStreamTrack, kind: Track.Kind, constraints?: MediaTrackConstraints);
8
7
  get id(): string;
9
8
  get dimensions(): Track.Dimensions | undefined;
10
- static constraintsForOptions(options: CreateLocalTracksOptions): MediaStreamConstraints;
11
9
  /**
12
10
  * @returns DeviceID of the device that is currently being used for this track
13
11
  */
@@ -13,16 +13,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
13
13
  };
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
15
  const logger_1 = __importDefault(require("../../logger"));
16
- const defaults_1 = require("../defaults");
17
16
  const DeviceManager_1 = __importDefault(require("../DeviceManager"));
18
17
  const errors_1 = require("../errors");
19
18
  const events_1 = require("../events");
20
19
  const Track_1 = require("./Track");
21
20
  class LocalTrack extends Track_1.Track {
22
- constructor(mediaTrack, kind, name, constraints) {
23
- super(mediaTrack, kind, name);
21
+ constructor(mediaTrack, kind, constraints) {
22
+ super(mediaTrack, kind);
24
23
  this.handleEnded = () => {
25
- this.emit(events_1.TrackEvent.Ended);
24
+ this.emit(events_1.TrackEvent.Ended, this);
26
25
  };
27
26
  this.mediaStreamTrack.addEventListener('ended', this.handleEnded);
28
27
  this.constraints = constraints !== null && constraints !== void 0 ? constraints : mediaTrack.getConstraints();
@@ -43,52 +42,6 @@ class LocalTrack extends Track_1.Track {
43
42
  }
44
43
  return undefined;
45
44
  }
46
- static constraintsForOptions(options) {
47
- const constraints = {};
48
- // default video options
49
- const defaults = defaults_1.getTrackCaptureDefaults();
50
- const videoOptions = {
51
- deviceId: defaults.videoDeviceId,
52
- };
53
- if (defaults.videoResolution) {
54
- videoOptions.width = defaults.videoResolution.width;
55
- videoOptions.height = defaults.videoResolution.height;
56
- videoOptions.frameRate = defaults.videoResolution.frameRate;
57
- }
58
- if (typeof options.video === 'object' && options.video) {
59
- Object.assign(videoOptions, options.video);
60
- if (options.video.resolution) {
61
- Object.assign(videoOptions, options.video.resolution);
62
- }
63
- }
64
- if (options.video === false) {
65
- constraints.video = false;
66
- }
67
- else {
68
- // use defaults
69
- constraints.video = videoOptions;
70
- }
71
- // default audio options
72
- const audioOptions = {
73
- deviceId: defaults.audioDeviceId,
74
- echoCancellation: defaults.echoCancellation,
75
- /* @ts-ignore */
76
- autoGainControl: defaults.autoGainControl,
77
- /* @ts-ignore */
78
- noiseSuppression: defaults.noiseSuppression,
79
- channelCount: defaults.channelCount,
80
- };
81
- if (typeof options.audio === 'object' && options.audio) {
82
- Object.assign(audioOptions, options.audio);
83
- }
84
- if (options.audio === false) {
85
- constraints.audio = false;
86
- }
87
- else {
88
- constraints.audio = audioOptions;
89
- }
90
- return constraints;
91
- }
92
45
  /**
93
46
  * @returns DeviceID of the device that is currently being used for this track
94
47
  */
@@ -1 +1 @@
1
- {"version":3,"file":"LocalTrack.js","sourceRoot":"","sources":["../../../src/room/track/LocalTrack.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"LocalTrack.js","sourceRoot":"","sources":["../../../src/room/track/LocalTrack.ts"],"names":[],"mappings":"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"}
@@ -3,10 +3,11 @@ import LocalAudioTrack from './LocalAudioTrack';
3
3
  import LocalTrack from './LocalTrack';
4
4
  import LocalVideoTrack from './LocalVideoTrack';
5
5
  import { Track } from './Track';
6
- import TrackPublication from './TrackPublication';
6
+ import { TrackPublication } from './TrackPublication';
7
7
  export default class LocalTrackPublication extends TrackPublication {
8
8
  track?: LocalTrack;
9
9
  constructor(kind: Track.Kind, ti: TrackInfo, track?: LocalTrack);
10
+ setTrack(track?: Track): void;
10
11
  get isMuted(): boolean;
11
12
  get audioTrack(): LocalAudioTrack | undefined;
12
13
  get videoTrack(): LocalVideoTrack | undefined;
@@ -18,4 +19,5 @@ export default class LocalTrackPublication extends TrackPublication {
18
19
  * Unmute track associated with this publication
19
20
  */
20
21
  unmute(): Promise<LocalTrack | undefined>;
22
+ handleTrackEnded: (track: LocalTrack) => void;
21
23
  }
@@ -8,17 +8,27 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
8
8
  step((generator = generator.apply(thisArg, _arguments || [])).next());
9
9
  });
10
10
  };
11
- var __importDefault = (this && this.__importDefault) || function (mod) {
12
- return (mod && mod.__esModule) ? mod : { "default": mod };
13
- };
14
11
  Object.defineProperty(exports, "__esModule", { value: true });
15
- const TrackPublication_1 = __importDefault(require("./TrackPublication"));
16
- class LocalTrackPublication extends TrackPublication_1.default {
12
+ const events_1 = require("../events");
13
+ const TrackPublication_1 = require("./TrackPublication");
14
+ class LocalTrackPublication extends TrackPublication_1.TrackPublication {
17
15
  constructor(kind, ti, track) {
18
16
  super(kind, ti.sid, ti.name);
17
+ this.handleTrackEnded = (track) => {
18
+ this.emit(events_1.TrackEvent.Ended, track);
19
+ };
19
20
  this.updateInfo(ti);
20
21
  this.setTrack(track);
21
22
  }
23
+ setTrack(track) {
24
+ if (this.track) {
25
+ this.track.off(events_1.TrackEvent.Ended, this.handleTrackEnded);
26
+ }
27
+ super.setTrack(track);
28
+ if (track) {
29
+ track.on(events_1.TrackEvent.Ended, this.handleTrackEnded);
30
+ }
31
+ }
22
32
  get isMuted() {
23
33
  if (this.track) {
24
34
  return this.track.isMuted;
@@ -1 +1 @@
1
- {"version":3,"file":"LocalTrackPublication.js","sourceRoot":"","sources":["../../../src/room/track/LocalTrackPublication.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAKA,0EAAkD;AAElD,MAAqB,qBAAsB,SAAQ,0BAAgB;IAGjE,YAAY,IAAgB,EAAE,EAAa,EAAE,KAAkB;QAC7D,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;QAE7B,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QACpB,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;IAED,IAAI,OAAO;QACT,IAAI,IAAI,CAAC,KAAK,EAAE;YACd,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC;SAC3B;QACD,OAAO,KAAK,CAAC,OAAO,CAAC;IACvB,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,KAAK,CAAC,UAAyC,CAAC;IACzD,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,KAAK,CAAC,UAAyC,CAAC;IACzD,CAAC;IAED;;OAEG;IACG,IAAI;;;YACR,OAAO,MAAA,IAAI,CAAC,KAAK,0CAAE,IAAI,EAAE,CAAC;;KAC3B;IAED;;OAEG;IACG,MAAM;;;YACV,OAAO,MAAA,IAAI,CAAC,KAAK,0CAAE,MAAM,EAAE,CAAC;;KAC7B;CACF;AAtCD,wCAsCC"}
1
+ {"version":3,"file":"LocalTrackPublication.js","sourceRoot":"","sources":["../../../src/room/track/LocalTrackPublication.ts"],"names":[],"mappings":";;;;;;;;;;;AACA,sCAAuC;AAKvC,yDAAsD;AAEtD,MAAqB,qBAAsB,SAAQ,mCAAgB;IAGjE,YAAY,IAAgB,EAAE,EAAa,EAAE,KAAkB;QAC7D,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;QA+C/B,qBAAgB,GAAG,CAAC,KAAiB,EAAE,EAAE;YACvC,IAAI,CAAC,IAAI,CAAC,mBAAU,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QACrC,CAAC,CAAC;QA/CA,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QACpB,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;IAED,QAAQ,CAAC,KAAa;QACpB,IAAI,IAAI,CAAC,KAAK,EAAE;YACd,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,mBAAU,CAAC,KAAK,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;SACzD;QAED,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAEtB,IAAI,KAAK,EAAE;YACT,KAAK,CAAC,EAAE,CAAC,mBAAU,CAAC,KAAK,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;SACnD;IACH,CAAC;IAED,IAAI,OAAO;QACT,IAAI,IAAI,CAAC,KAAK,EAAE;YACd,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC;SAC3B;QACD,OAAO,KAAK,CAAC,OAAO,CAAC;IACvB,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,KAAK,CAAC,UAAyC,CAAC;IACzD,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,KAAK,CAAC,UAAyC,CAAC;IACzD,CAAC;IAED;;OAEG;IACG,IAAI;;;YACR,OAAO,MAAA,IAAI,CAAC,KAAK,0CAAE,IAAI,EAAE,CAAC;;KAC3B;IAED;;OAEG;IACG,MAAM;;;YACV,OAAO,MAAA,IAAI,CAAC,KAAK,0CAAE,MAAM,EAAE,CAAC;;KAC7B;CAKF;AAtDD,wCAsDC"}
@@ -1,24 +1,33 @@
1
1
  import { SignalClient } from '../../api/SignalClient';
2
- import { VideoQuality } from '../../proto/livekit_rtc';
2
+ import { VideoLayer, VideoQuality } from '../../proto/livekit_models';
3
+ import { SubscribedQuality } from '../../proto/livekit_rtc';
3
4
  import { VideoSenderStats } from '../stats';
4
5
  import LocalTrack from './LocalTrack';
5
- import { CreateVideoTrackOptions } from './options';
6
+ import { VideoCaptureOptions } from './options';
6
7
  export default class LocalVideoTrack extends LocalTrack {
7
8
  signalClient?: SignalClient;
8
9
  private prevStats?;
9
10
  private lastQualityChange?;
10
11
  private lastExplicitQualityChange?;
11
12
  private encodings?;
12
- constructor(mediaTrack: MediaStreamTrack, name?: string, constraints?: MediaTrackConstraints);
13
+ private activeQualities?;
14
+ constructor(mediaTrack: MediaStreamTrack, constraints?: MediaTrackConstraints);
13
15
  get isSimulcast(): boolean;
14
- startMonitor(signalClient: SignalClient): void;
16
+ startMonitor(signalClient: SignalClient, disableLayerPause: boolean): void;
15
17
  stop(): void;
16
18
  mute(): Promise<LocalVideoTrack>;
17
19
  unmute(): Promise<LocalVideoTrack>;
18
20
  getSenderStats(): Promise<VideoSenderStats[]>;
19
21
  setPublishingQuality(maxQuality: VideoQuality): void;
20
22
  setDeviceId(deviceId: string): Promise<void>;
21
- restartTrack(options?: CreateVideoTrackOptions): Promise<void>;
23
+ restartTrack(options?: VideoCaptureOptions): Promise<void>;
24
+ /**
25
+ * @internal
26
+ * Sets layers that should be publishing
27
+ */
28
+ setPublishingLayers(qualities: SubscribedQuality[]): Promise<void>;
22
29
  private monitorSender;
23
30
  private checkAndUpdateSimulcast;
24
31
  }
32
+ export declare function videoQualityForRid(rid: string): VideoQuality;
33
+ export declare function videoLayersFromEncodings(width: number, height: number, encodings?: RTCRtpEncodingParameters[]): VideoLayer[];
@@ -12,31 +12,44 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
12
12
  return (mod && mod.__esModule) ? mod : { "default": mod };
13
13
  };
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
+ exports.videoLayersFromEncodings = exports.videoQualityForRid = void 0;
15
16
  const logger_1 = __importDefault(require("../../logger"));
16
- const livekit_rtc_1 = require("../../proto/livekit_rtc");
17
+ const livekit_models_1 = require("../../proto/livekit_models");
17
18
  const stats_1 = require("../stats");
19
+ const utils_1 = require("../utils");
18
20
  const LocalTrack_1 = __importDefault(require("./LocalTrack"));
19
21
  const Track_1 = require("./Track");
22
+ const utils_2 = require("./utils");
20
23
  // delay before attempting to upgrade
21
24
  const QUALITY_UPGRADE_DELAY = 60 * 1000;
22
25
  // avoid downgrading too quickly
23
26
  const QUALITY_DOWNGRADE_DELAY = 5 * 1000;
24
27
  const ridOrder = ['q', 'h', 'f'];
25
28
  class LocalVideoTrack extends LocalTrack_1.default {
26
- constructor(mediaTrack, name, constraints) {
27
- super(mediaTrack, Track_1.Track.Kind.Video, name, constraints);
28
- this.monitorSender = () => __awaiter(this, void 0, void 0, function* () {
29
+ constructor(mediaTrack, constraints) {
30
+ super(mediaTrack, Track_1.Track.Kind.Video, constraints);
31
+ this.monitorSender = (disableLayerPause) => __awaiter(this, void 0, void 0, function* () {
29
32
  if (!this.sender) {
33
+ this._currentBitrate = 0;
30
34
  return;
31
35
  }
32
36
  const stats = yield this.getSenderStats();
33
37
  const statsMap = new Map(stats.map((s) => [s.rid, s]));
34
- if (this.prevStats && this.isSimulcast) {
38
+ if (!disableLayerPause && this.prevStats && this.isSimulcast) {
35
39
  this.checkAndUpdateSimulcast(statsMap);
36
40
  }
41
+ if (this.prevStats) {
42
+ let totalBitrate = 0;
43
+ statsMap.forEach((s, key) => {
44
+ var _a;
45
+ const prev = (_a = this.prevStats) === null || _a === void 0 ? void 0 : _a.get(key);
46
+ totalBitrate += stats_1.computeBitrate(s, prev);
47
+ });
48
+ this._currentBitrate = totalBitrate;
49
+ }
37
50
  this.prevStats = statsMap;
38
51
  setTimeout(() => {
39
- this.monitorSender();
52
+ this.monitorSender(disableLayerPause);
40
53
  }, stats_1.monitorFrequency);
41
54
  });
42
55
  }
@@ -46,15 +59,17 @@ class LocalVideoTrack extends LocalTrack_1.default {
46
59
  }
47
60
  return false;
48
61
  }
49
- /* internal */
50
- startMonitor(signalClient) {
51
- // only monitor simulcast streams
52
- if (!this.isSimulcast) {
53
- return;
54
- }
62
+ /* @internal */
63
+ startMonitor(signalClient, disableLayerPause) {
64
+ var _a;
55
65
  this.signalClient = signalClient;
66
+ // save original encodings
67
+ const params = (_a = this.sender) === null || _a === void 0 ? void 0 : _a.getParameters();
68
+ if (params) {
69
+ this.encodings = params.encodings;
70
+ }
56
71
  setTimeout(() => {
57
- this.monitorSender();
72
+ this.monitorSender(disableLayerPause);
58
73
  }, stats_1.monitorFrequency);
59
74
  }
60
75
  stop() {
@@ -96,19 +111,9 @@ class LocalVideoTrack extends LocalTrack_1.default {
96
111
  }
97
112
  const items = [];
98
113
  const stats = yield this.sender.getStats();
99
- let sender;
100
- stats.forEach((v) => {
101
- if (v.type === 'track'
102
- && v.trackIdentifier === this.mediaStreamTrack.id) {
103
- sender = v;
104
- }
105
- });
106
- if (!sender) {
107
- return items;
108
- }
109
- // match the outbound-rtp items
110
114
  stats.forEach((v) => {
111
- if (v.type === 'outbound-rtp' && v.trackId === sender.id) {
115
+ var _a;
116
+ if (v.type === 'outbound-rtp') {
112
117
  const vs = {
113
118
  type: 'video',
114
119
  streamId: v.id,
@@ -118,9 +123,10 @@ class LocalVideoTrack extends LocalTrack_1.default {
118
123
  pliCount: v.pliCount,
119
124
  nackCount: v.nackCount,
120
125
  packetsSent: v.packetsSent,
126
+ bytesSent: v.bytesSent,
121
127
  framesSent: v.framesSent,
122
128
  timestamp: v.timestamp,
123
- rid: v.rid,
129
+ rid: (_a = v.rid) !== null && _a !== void 0 ? _a : '',
124
130
  retransmittedPacketsSent: v.retransmittedPacketsSent,
125
131
  qualityLimitationReason: v.qualityLimitationReason,
126
132
  qualityLimitationResolutionChanges: v.qualityLimitationResolutionChanges,
@@ -139,32 +145,15 @@ class LocalVideoTrack extends LocalTrack_1.default {
139
145
  });
140
146
  }
141
147
  setPublishingQuality(maxQuality) {
142
- if (!this.isSimulcast || !this.encodings) {
143
- return;
144
- }
145
- let hasChanged = false;
146
- const layers = [];
147
- this.encodings.forEach((encoding) => {
148
- var _a;
149
- const quality = videoQualityForRid((_a = encoding.rid) !== null && _a !== void 0 ? _a : '');
150
- const active = quality <= maxQuality;
151
- if (active !== encoding.active) {
152
- hasChanged = true;
153
- encoding.active = active;
154
- }
155
- if (active) {
156
- layers.push(quality);
157
- }
158
- });
159
- if (!hasChanged || !this.sender || !this.sid) {
160
- return;
148
+ const qualities = [];
149
+ for (let q = livekit_models_1.VideoQuality.LOW; q <= livekit_models_1.VideoQuality.HIGH; q += 1) {
150
+ qualities.push({
151
+ quality: q,
152
+ enabled: q <= maxQuality,
153
+ });
161
154
  }
162
- this.lastQualityChange = new Date().getTime();
163
- this.lastExplicitQualityChange = new Date().getTime();
164
- const params = this.sender.getParameters();
165
- params.encodings = this.encodings;
166
155
  logger_1.default.debug('setting publishing quality. max quality', maxQuality);
167
- this.sender.setParameters(params);
156
+ this.setPublishingLayers(qualities);
168
157
  }
169
158
  setDeviceId(deviceId) {
170
159
  return __awaiter(this, void 0, void 0, function* () {
@@ -183,7 +172,7 @@ class LocalVideoTrack extends LocalTrack_1.default {
183
172
  return __awaiter(this, void 0, void 0, function* () {
184
173
  let constraints;
185
174
  if (options) {
186
- const streamConstraints = LocalTrack_1.default.constraintsForOptions({ video: options });
175
+ const streamConstraints = utils_2.constraintsForOptions({ video: options });
187
176
  if (typeof streamConstraints.video !== 'boolean') {
188
177
  constraints = streamConstraints.video;
189
178
  }
@@ -191,15 +180,74 @@ class LocalVideoTrack extends LocalTrack_1.default {
191
180
  yield this.restart(constraints);
192
181
  });
193
182
  }
183
+ /**
184
+ * @internal
185
+ * Sets layers that should be publishing
186
+ */
187
+ setPublishingLayers(qualities) {
188
+ return __awaiter(this, void 0, void 0, function* () {
189
+ logger_1.default.debug('setting publishing layers', qualities);
190
+ if (!this.sender || !this.encodings) {
191
+ return;
192
+ }
193
+ const params = this.sender.getParameters();
194
+ const { encodings } = params;
195
+ if (!encodings) {
196
+ return;
197
+ }
198
+ if (encodings.length !== this.encodings.length) {
199
+ logger_1.default.warn('cannot set publishing layers, encodings mismatch');
200
+ return;
201
+ }
202
+ this.activeQualities = qualities;
203
+ let hasChanged = false;
204
+ encodings.forEach((encoding, idx) => {
205
+ var _a;
206
+ let rid = (_a = encoding.rid) !== null && _a !== void 0 ? _a : '';
207
+ if (rid === '') {
208
+ rid = 'q';
209
+ }
210
+ const quality = videoQualityForRid(rid);
211
+ const subscribedQuality = qualities.find((q) => q.quality === quality);
212
+ if (!subscribedQuality) {
213
+ return;
214
+ }
215
+ if (encoding.active !== subscribedQuality.enabled) {
216
+ hasChanged = true;
217
+ encoding.active = subscribedQuality.enabled;
218
+ logger_1.default.debug(`setting layer ${subscribedQuality.quality} to ${encoding.active ? 'enabled' : 'disabled'}`);
219
+ // FireFox does not support setting encoding.active to false, so we
220
+ // have a workaround of lowering its bitrate and resolution to the min.
221
+ if (utils_1.isFireFox()) {
222
+ if (subscribedQuality.enabled) {
223
+ encoding.scaleResolutionDownBy = this.encodings[idx].scaleResolutionDownBy;
224
+ encoding.maxBitrate = this.encodings[idx].maxBitrate;
225
+ /* @ts-ignore */
226
+ encoding.maxFrameRate = this.encodings[idx].maxFrameRate;
227
+ }
228
+ else {
229
+ encoding.scaleResolutionDownBy = 4;
230
+ encoding.maxBitrate = 10;
231
+ /* @ts-ignore */
232
+ encoding.maxFrameRate = 2;
233
+ }
234
+ }
235
+ }
236
+ });
237
+ if (hasChanged) {
238
+ params.encodings = encodings;
239
+ yield this.sender.setParameters(params);
240
+ }
241
+ });
242
+ }
194
243
  checkAndUpdateSimulcast(statsMap) {
195
244
  var _a, _b;
196
- if (!this.sender || this.isMuted) {
245
+ if (!this.sender || this.isMuted || !this.encodings) {
197
246
  return;
198
247
  }
199
- const params = this.sender.getParameters();
200
- this.encodings = params.encodings;
201
248
  let bestEncoding;
202
- this.encodings.forEach((encoding) => {
249
+ const { encodings } = this.sender.getParameters();
250
+ encodings.forEach((encoding) => {
203
251
  // skip inactive encodings
204
252
  if (!encoding.active)
205
253
  return;
@@ -246,12 +294,29 @@ class LocalVideoTrack extends LocalTrack_1.default {
246
294
  // 'elapsed', sendStats.timestamp - lastStats.timestamp);
247
295
  if (sendStats.framesSent - lastStats.framesSent > 0) {
248
296
  // frames have been sending ok, consider upgrading quality
249
- if (currentQuality === livekit_rtc_1.VideoQuality.HIGH || !this.lastQualityChange)
297
+ if (currentQuality === livekit_models_1.VideoQuality.HIGH || !this.lastQualityChange)
250
298
  return;
251
299
  const nextQuality = currentQuality + 1;
252
300
  if ((new Date()).getTime() - this.lastQualityChange < QUALITY_UPGRADE_DELAY) {
253
301
  return;
254
302
  }
303
+ if (this.activeQualities
304
+ && this.activeQualities.some((q) => q.quality === nextQuality && !q.enabled)) {
305
+ // quality has been disabled by the server, so we should skip
306
+ return;
307
+ }
308
+ // we are already at the highest layer
309
+ let bestQuality = livekit_models_1.VideoQuality.LOW;
310
+ encodings.forEach((encoding) => {
311
+ var _a;
312
+ const quality = videoQualityForRid((_a = encoding.rid) !== null && _a !== void 0 ? _a : '');
313
+ if (quality > bestQuality) {
314
+ bestQuality = quality;
315
+ }
316
+ });
317
+ if (nextQuality > bestQuality) {
318
+ return;
319
+ }
255
320
  logger_1.default.debug('upgrading video quality to', nextQuality);
256
321
  this.setPublishingQuality(nextQuality);
257
322
  return;
@@ -268,10 +333,10 @@ class LocalVideoTrack extends LocalTrack_1.default {
268
333
  && ((new Date()).getTime() - this.lastExplicitQualityChange) < QUALITY_DOWNGRADE_DELAY) {
269
334
  return;
270
335
  }
271
- if (currentQuality === livekit_rtc_1.VideoQuality.UNRECOGNIZED) {
336
+ if (currentQuality === livekit_models_1.VideoQuality.UNRECOGNIZED) {
272
337
  return;
273
338
  }
274
- if (currentQuality === livekit_rtc_1.VideoQuality.LOW) {
339
+ if (currentQuality === livekit_models_1.VideoQuality.LOW) {
275
340
  // already the lowest quality, nothing we can do
276
341
  return;
277
342
  }
@@ -283,13 +348,42 @@ exports.default = LocalVideoTrack;
283
348
  function videoQualityForRid(rid) {
284
349
  switch (rid) {
285
350
  case 'f':
286
- return livekit_rtc_1.VideoQuality.HIGH;
351
+ return livekit_models_1.VideoQuality.HIGH;
287
352
  case 'h':
288
- return livekit_rtc_1.VideoQuality.MEDIUM;
353
+ return livekit_models_1.VideoQuality.MEDIUM;
289
354
  case 'q':
290
- return livekit_rtc_1.VideoQuality.LOW;
355
+ return livekit_models_1.VideoQuality.LOW;
291
356
  default:
292
- return livekit_rtc_1.VideoQuality.UNRECOGNIZED;
357
+ return livekit_models_1.VideoQuality.UNRECOGNIZED;
358
+ }
359
+ }
360
+ exports.videoQualityForRid = videoQualityForRid;
361
+ function videoLayersFromEncodings(width, height, encodings) {
362
+ // default to a single layer, HQ
363
+ if (!encodings) {
364
+ return [{
365
+ quality: livekit_models_1.VideoQuality.HIGH,
366
+ width,
367
+ height,
368
+ bitrate: 0,
369
+ ssrc: 0,
370
+ }];
293
371
  }
372
+ return encodings.map((encoding) => {
373
+ var _a, _b, _c;
374
+ const scale = (_a = encoding.scaleResolutionDownBy) !== null && _a !== void 0 ? _a : 1;
375
+ let quality = videoQualityForRid((_b = encoding.rid) !== null && _b !== void 0 ? _b : '');
376
+ if (quality === livekit_models_1.VideoQuality.UNRECOGNIZED && encodings.length === 1) {
377
+ quality = livekit_models_1.VideoQuality.HIGH;
378
+ }
379
+ return {
380
+ quality,
381
+ width: width / scale,
382
+ height: height / scale,
383
+ bitrate: (_c = encoding.maxBitrate) !== null && _c !== void 0 ? _c : 0,
384
+ ssrc: 0,
385
+ };
386
+ });
294
387
  }
388
+ exports.videoLayersFromEncodings = videoLayersFromEncodings;
295
389
  //# sourceMappingURL=LocalVideoTrack.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"LocalVideoTrack.js","sourceRoot":"","sources":["../../../src/room/track/LocalVideoTrack.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"LocalVideoTrack.js","sourceRoot":"","sources":["../../../src/room/track/LocalVideoTrack.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1 @@
1
+ export {};
@@ -0,0 +1,68 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const livekit_models_1 = require("../../proto/livekit_models");
4
+ const LocalVideoTrack_1 = require("./LocalVideoTrack");
5
+ describe('videoLayersFromEncodings', () => {
6
+ it('returns single layer for no encoding', () => {
7
+ const layers = LocalVideoTrack_1.videoLayersFromEncodings(640, 360);
8
+ expect(layers).toHaveLength(1);
9
+ expect(layers[0].quality).toBe(livekit_models_1.VideoQuality.HIGH);
10
+ expect(layers[0].width).toBe(640);
11
+ expect(layers[0].height).toBe(360);
12
+ });
13
+ it('returns single layer for explicit encoding', () => {
14
+ const layers = LocalVideoTrack_1.videoLayersFromEncodings(640, 360, [{
15
+ maxBitrate: 200000,
16
+ }]);
17
+ expect(layers).toHaveLength(1);
18
+ expect(layers[0].quality).toBe(livekit_models_1.VideoQuality.HIGH);
19
+ expect(layers[0].bitrate).toBe(200000);
20
+ });
21
+ it('returns three layers for simulcast', () => {
22
+ const layers = LocalVideoTrack_1.videoLayersFromEncodings(1280, 720, [
23
+ {
24
+ scaleResolutionDownBy: 4,
25
+ rid: 'q',
26
+ maxBitrate: 125000,
27
+ },
28
+ {
29
+ scaleResolutionDownBy: 2,
30
+ rid: 'h',
31
+ maxBitrate: 500000,
32
+ },
33
+ {
34
+ rid: 'f',
35
+ maxBitrate: 1200000,
36
+ },
37
+ ]);
38
+ expect(layers).toHaveLength(3);
39
+ expect(layers[0].quality).toBe(livekit_models_1.VideoQuality.LOW);
40
+ expect(layers[0].width).toBe(320);
41
+ expect(layers[2].quality).toBe(livekit_models_1.VideoQuality.HIGH);
42
+ expect(layers[2].height).toBe(720);
43
+ });
44
+ it('handles portrait', () => {
45
+ const layers = LocalVideoTrack_1.videoLayersFromEncodings(720, 1280, [
46
+ {
47
+ scaleResolutionDownBy: 4,
48
+ rid: 'q',
49
+ maxBitrate: 125000,
50
+ },
51
+ {
52
+ scaleResolutionDownBy: 2,
53
+ rid: 'h',
54
+ maxBitrate: 500000,
55
+ },
56
+ {
57
+ rid: 'f',
58
+ maxBitrate: 1200000,
59
+ },
60
+ ]);
61
+ expect(layers).toHaveLength(3);
62
+ expect(layers[0].quality).toBe(livekit_models_1.VideoQuality.LOW);
63
+ expect(layers[0].height).toBe(320);
64
+ expect(layers[2].quality).toBe(livekit_models_1.VideoQuality.HIGH);
65
+ expect(layers[2].width).toBe(720);
66
+ });
67
+ });
68
+ //# sourceMappingURL=LocalVideoTrack.test.js.map