From 7202c5acb8ed5cc1b7aee5217a9f7a8953a5448c Mon Sep 17 00:00:00 2001
From: Jason Young <46612682+jyoung8607@users.noreply.github.com>
Date: Wed, 11 Dec 2024 17:03:40 -0500
Subject: [PATCH] Webcam fixes (#34211)

* follow VIPC API change, add logging

* use full path for video devices
---
 tools/webcam/camerad.py       | 7 ++++---
 tools/webcam/start_camerad.sh | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/tools/webcam/camerad.py b/tools/webcam/camerad.py
index 47dddfce98..778fefb834 100755
--- a/tools/webcam/camerad.py
+++ b/tools/webcam/camerad.py
@@ -12,8 +12,8 @@ from openpilot.common.realtime import Ratekeeper
 DUAL_CAM = os.getenv("DUAL_CAMERA")
 CameraType = namedtuple("CameraType", ["msg_name", "stream_type", "cam_id"])
 CAMERAS = [
-  CameraType("roadCameraState", VisionStreamType.VISION_STREAM_ROAD, os.getenv("CAMERA_ROAD_ID", "0")),
-  CameraType("driverCameraState", VisionStreamType.VISION_STREAM_DRIVER, os.getenv("CAMERA_DRIVER_ID", "1")),
+  CameraType("roadCameraState", VisionStreamType.VISION_STREAM_ROAD, os.getenv("CAMERA_ROAD_ID", "/dev/video0")),
+  CameraType("driverCameraState", VisionStreamType.VISION_STREAM_DRIVER, os.getenv("CAMERA_DRIVER_ID", "/dev/video1")),
 ]
 if DUAL_CAM:
   CAMERAS.append(CameraType("wideRoadCameraState", VisionStreamType.VISION_STREAM_WIDE_ROAD, DUAL_CAM))
@@ -25,9 +25,10 @@ class Camerad:
 
     self.cameras = []
     for c in CAMERAS:
+      print(f"opening {c.msg_name} at {c.cam_id}")
       cam = Camera(c.msg_name, c.stream_type, c.cam_id)
       self.cameras.append(cam)
-      self.vipc_server.create_buffers(c.stream_type, 20, False, cam.W, cam.H)
+      self.vipc_server.create_buffers(c.stream_type, 20, cam.W, cam.H)
 
     self.vipc_server.start_listener()
 
diff --git a/tools/webcam/start_camerad.sh b/tools/webcam/start_camerad.sh
index d4828b3e25..aefc4c062a 100755
--- a/tools/webcam/start_camerad.sh
+++ b/tools/webcam/start_camerad.sh
@@ -5,9 +5,9 @@ export BLOCK="${BLOCK},camerad"
 export USE_WEBCAM="1"
 
 # Change camera index according to your setting
-export CAMERA_ROAD_ID="0"
-export CAMERA_DRIVER_ID="1"
-export DUAL_CAMERA="2" # camera index for wide road camera
+export CAMERA_ROAD_ID="/dev/video0"
+export CAMERA_DRIVER_ID="/dev/video1"
+#export DUAL_CAMERA="/dev/video2" # optional, camera index for wide road camera
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"