Matrix/element-call-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-call.git synced 2024-11-24 00:38:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Clarify how preferred devices work

Browse Source
This commit is contained in:
Robin 2024-11-21 11:32:15 -05:00
parent a2b452c1d8
commit 0718774cef
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/livekit/MediaDevicesContext.tsx
View File

@ -85,19 +85,21 @@ function useMediaDevice(
[kind, requestPermissions], [kind, requestPermissions],
); );
const available = useObservableState(deviceObserver, []); const available = useObservableState(deviceObserver, []);
const [selectedId, select] = useSetting(setting); const [preferredId, select] = useSetting(setting);
return useMemo(() => { return useMemo(() => {
let devId: string | undefined = undefined; let selectedId: string | undefined = undefined;
if (!alwaysDefault && available) { if (!alwaysDefault && available) {
// If the selected device is available, use it. Or if every available // If the preferred device is available, use it. Or if every available
// device ID is falsy, the browser is probably just being paranoid about // device ID is falsy, the browser is probably just being paranoid about
// fingerprinting and we should still try using the selected device. // fingerprinting and we should still try using the preferred device.
// Otherwise, fall back to the first available device. // Worst case it is not available and the browser will gracefully fall
devId = // back to some other device for us when requesting the media stream.
available.some((d) => d.deviceId === selectedId) || // Otherwise, select the first available device.
selectedId =
available.some((d) => d.deviceId === preferredId) ||
available.every((d) => d.deviceId === "") available.every((d) => d.deviceId === "")
? selectedId ? preferredId
: available.at(0)?.deviceId; : available.at(0)?.deviceId;
} }
@ -107,10 +109,10 @@ function useMediaDevice(
// device entries for the exact same device ID; deduplicate them // device entries for the exact same device ID; deduplicate them
[...new Map(available.map((d) => [d.deviceId, d])).values()] [...new Map(available.map((d) => [d.deviceId, d])).values()]
: [], : [],
selectedId: devId, selectedId,
select, select,
}; };
}, [available, selectedId, select, alwaysDefault]); }, [available, preferredId, select, alwaysDefault]);
} }
const deviceStub: MediaDevice = { const deviceStub: MediaDevice = {