Merge branch 'livekit' into reconnecting

src/state/CallViewModel.ts

@@ -14,10 +14,8 @@ import {
   ConnectionState,
   type Room as LivekitRoom,
   type LocalParticipant,
-  LocalVideoTrack,
   ParticipantEvent,
   type RemoteParticipant,
-  Track,
 } from "livekit-client";
 import {
   ClientEvent,
@@ -68,7 +66,6 @@ import {
 import {
   LocalUserMediaViewModel,
   type MediaViewModel,
-  observeTrackReference$,
   RemoteUserMediaViewModel,
   ScreenShareViewModel,
   type UserMediaViewModel,
@@ -271,6 +268,7 @@ class UserMedia {
     participant: LocalParticipant | RemoteParticipant | undefined,
     encryptionSystem: EncryptionSystem,
     livekitRoom: LivekitRoom,
+    mediaDevices: MediaDevices,
     displayname$: Observable<string>,
     handRaised$: Observable<Date | null>,
     reaction$: Observable<ReactionOption | null>,
@@ -284,6 +282,7 @@ class UserMedia {
         this.participant$ as Behavior<LocalParticipant>,
         encryptionSystem,
         livekitRoom,
+        mediaDevices,
         this.scope.behavior(displayname$),
         this.scope.behavior(handRaised$),
         this.scope.behavior(reaction$),
@@ -401,18 +400,6 @@ export class CallViewModel extends ViewModel {
   private readonly userId = this.matrixRoom.client.getUserId();
   private readonly deviceId = this.matrixRoom.client.getDeviceId();
 
-  public readonly localVideo$ = this.scope.behavior<LocalVideoTrack | null>(
-    observeTrackReference$(
-      this.livekitRoom.localParticipant,
-      Track.Source.Camera,
-    ).pipe(
-      map((trackRef) => {
-        const track = trackRef?.publication?.track;
-        return track instanceof LocalVideoTrack ? track : null;
-      }),
-    ),
-  );
-
   /**
    * The raw list of RemoteParticipants as reported by LiveKit
    */
@@ -688,6 +675,7 @@ export class CallViewModel extends ViewModel {
                         participant,
                         this.options.encryptionSystem,
                         this.livekitRoom,
+                        this.mediaDevices,
                         this.memberDisplaynames$.pipe(
                           map((m) => m.get(matrixIdentifier) ?? "[👻]"),
                         ),
@@ -752,6 +740,7 @@ export class CallViewModel extends ViewModel {
                               participant,
                               this.options.encryptionSystem,
                               this.livekitRoom,
+                              this.mediaDevices,
                               this.memberDisplaynames$.pipe(
                                 map(
                                   (m) => m.get(participant.identity) ?? "[👻]",