mawei/StarPilot
1
0
Fork 0
mirror of https://github.com/firestar5683/StarPilot.git synced 2026-09-28 18:33:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Webcam fixes (#34211)

Browse Source 
* follow VIPC API change, add logging

* use full path for video devices
This commit is contained in:
Jason Young
2024-12-11 17:03:40 -05:00
committed by GitHub
parent 216ebcaa50
commit 7202c5acb8
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/webcam/camerad.py
+4 -3
View File
@@ -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()
tools/webcam/start_camerad.sh
+3 -3
View File
@@ -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 )"