Merge pull request #7309 from TheThingsNetwork/fix/video-feed

Fix video feed on firefox
TheThingsNetwork · Sep 16, 2024 · 70e1ede · 70e1ede
2 parents 4efe7ca + ab04e15
commit 70e1ede
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/pkg/webui/components/qr/input/video/index.js b/pkg/webui/components/qr/input/video/index.js
@@ -76,14 +76,20 @@ const Camera = props => {
  }
  }, [cameras])
 
- const setDeviceIdFromStream = useCallback(userStream => {
- const videoTracks = userStream.getVideoTracks()
-
- if (videoTracks.length > 0) {
- const { deviceId } = videoTracks[0].getSettings()
- setDeviceId(deviceId)
- }
- }, [])
+ const setDeviceIdFromStream = useCallback(
+ userStream => {
+ const videoTracks = userStream.getVideoTracks()
+ if (videoTracks.length > 0) {
+ const { deviceId } = videoTracks[0].getSettings()
+ if (deviceId) {
+ setDeviceId(deviceId)
+ } else if (cameras.length > 0) {
+ setDeviceId(cameras[0].deviceId)
+ }
+ }
+ },
+ [cameras],
+ )
 
  useEffect(() => {
  setHasFrontCamera(cameras.some(device => device.label.toLowerCase().includes('front')))