Skip to content

More camera support #373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
scardoso-lu wants to merge 1 commit into
base: main
Choose a base branch
from
Open

More camera support #373

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions runtime/python/common/toolbox.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ def resolve_input_arg(app: str, input_arg: str | None) -> str:
sys.exit(1)

# "camera" stays as is
if input_arg == "camera":
if input_arg == "camera" or input_arg.startswith(("http://", "https://", "rtsp://")):
return input_arg

path_candidate = Path(input_arg)
Expand Down Expand Up @@ -529,17 +529,19 @@ def init_input_source(input_path, batch_size, camera_resolution):
cap = None
images = None

if input_path == "camera":

if not is_valid_camera_index(CAMERA_INDEX):
logger.error(f"CAMERA_INDEX {CAMERA_INDEX} not found.")
available = list_available_cameras()
logger.warning(f"Available camera indices: {available}")
exit(1)

resolution = None
# Open camera at its native resolution; don't force sd/hd/fhd here.
cap = cv2.VideoCapture(CAMERA_INDEX)
if input_path == "camera" or input_path.startswith(("http://", "https://", "rtsp://")):
if input_path.startswith(("http://", "https://", "rtsp://")):
cap = cv2.VideoCapture(input_path)
else:
if not is_valid_camera_index(CAMERA_INDEX):
logger.error(f"CAMERA_INDEX {CAMERA_INDEX} not found.")
available = list_available_cameras()
logger.warning(f"Available camera indices: {available}")
exit(1)

resolution = None
# Open camera at its native resolution; don't force sd/hd/fhd here.
cap = cv2.VideoCapture(CAMERA_INDEX)
cap.set(cv2.CAP_PROP_FOURCC, cv2.VideoWriter_fourcc(*'YUYV'))
if camera_resolution in RESOLUTION_MAP:
CAMERA_CAP_WIDTH, CAMERA_CAP_HEIGHT = RESOLUTION_MAP.get(camera_resolution)
Expand Down