Use Correct Stream Event When Multiple Cameras Exist (#1944)

viamrobotics · Feb 28, 2023 · f3d5835 · f3d5835
1 parent ebc4370
commit f3d5835
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/web/frontend/package.json b/web/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@viamrobotics/remote-control",
-  "version": "0.1.34",
+  "version": "0.1.35",
   "license": "Apache-2.0",
   "files": [
     "src/components/**/*.vue",

diff --git a/web/frontend/src/components/camera/camera.vue b/web/frontend/src/components/camera/camera.vue
@@ -49,6 +49,10 @@ const viewCamera = async (isOn: boolean) => {
     if (!eventStream) {
       throw new Error('expected event stream to exist');
     }
+    // Ignore event if received for the wrong stream, in the case of multiple cameras
+    if (eventStream.id !== props.cameraName) {
+      return;
+    }
     videoEl.srcObject = eventStream;
   });
 

diff --git a/web/runtime-shared/static/control.js b/web/runtime-shared/static/control.js
diff --git a/web/runtime-shared/static/control.js.map b/web/runtime-shared/static/control.js.map