Matrix/element-call-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-call.git synced 2026-08-05 19:59:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge fixes

Browse Source
This commit is contained in:
Timo
2024-11-04 15:38:17 +01:00
parent e1e202d7c8
commit 2a5dc60066
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/state/CallViewModel.ts
View File

@@ -72,7 +72,6 @@ import { duplicateTiles, nonMemberTiles } from "../settings/settings";
import { isFirefox } from "../Platform"; import { isFirefox } from "../Platform";
import { setPipEnabled } from "../controls"; import { setPipEnabled } from "../controls";
import { EncryptionSystem } from "../e2ee/sharedKeyManagement"; import { EncryptionSystem } from "../e2ee/sharedKeyManagement";
import { Config } from "../config/Config";
// How long we wait after a focus switch before showing the real participant // How long we wait after a focus switch before showing the real participant
// list again // list again
@@ -295,11 +294,11 @@ function findMatrixRoomMember(
export class CallViewModel extends ViewModel { export class CallViewModel extends ViewModel {
public readonly localVideo: Observable<LocalVideoTrack | null> = public readonly localVideo: Observable<LocalVideoTrack | null> =
observeTrackReference( observeTrackReference(
this.livekitRoom.localParticipant, of(this.livekitRoom.localParticipant),
Track.Source.Camera, Track.Source.Camera,
).pipe( ).pipe(
map((trackRef) => { map((trackRef) => {
const track = trackRef.publication?.track; const track = trackRef?.publication?.track;
return track instanceof LocalVideoTrack ? track : null; return track instanceof LocalVideoTrack ? track : null;
}), }),
); );
@@ -366,6 +365,7 @@ export class CallViewModel extends ViewModel {
); );
public readonly nonMemberItemCount = new BehaviorSubject<number>(0); public readonly nonMemberItemCount = new BehaviorSubject<number>(0);
private readonly mediaItems: Observable<MediaItem[]> = combineLatest([ private readonly mediaItems: Observable<MediaItem[]> = combineLatest([
this.remoteParticipants, this.remoteParticipants,
observeParticipantMedia(this.livekitRoom.localParticipant), observeParticipantMedia(this.livekitRoom.localParticipant),
@@ -409,15 +409,25 @@ export class CallViewModel extends ViewModel {
} }
const member = findMatrixRoomMember(room, mediaId); const member = findMatrixRoomMember(room, mediaId);
if (!member) {
logger.error("Could not find member for media id: ", mediaId);
}
for (let i = 0; i < 1 + duplicateTiles; i++) { for (let i = 0; i < 1 + duplicateTiles; i++) {
const indexedMediaId = `${mediaId}:${i}`; const indexedMediaId = `${mediaId}:${i}`;
const prevMedia = prevItems.get(indexedMediaId); let prevMedia = prevItems.get(indexedMediaId);
if (prevMedia && prevMedia instanceof UserMedia) { if (prevMedia && prevMedia instanceof UserMedia) {
if (prevMedia.participant.value !== participant) { if (prevMedia.participant.value !== participant) {
// Update the BahviourSubject in the UserMedia. // Update the BahviourSubject in the UserMedia.
prevMedia.participant.next(participant); prevMedia.participant.next(participant);
} }
if (prevMedia.vm.member === undefined) {
// We have a previous media created because of the `debugShowNonMember` flag.
// In this case we actually replace the media item.
// This "hack" never occurs if we do not use the `debugShowNonMember` debugging
// option and if we always find a room member for each rtc member (which also
// only fails if we have a fundamental problem)
prevMedia = undefined;
}
} }
yield [ yield [
indexedMediaId, indexedMediaId,
@@ -483,7 +493,7 @@ export class CallViewModel extends ViewModel {
nonMemberId, nonMemberId,
undefined, undefined,
participant, participant,
this.encrypted, this.encryptionSystem,
this.matrixRTCSession, this.matrixRTCSession,
), ),
]; ];