From 64fc07b58032b7b3020fbc07a8221374343d008d Mon Sep 17 00:00:00 2001 From: Cosmin Tanislav Date: Mon, 28 Oct 2024 15:31:15 +0200 Subject: [PATCH 1/2] cam: allow configuring tx host and port --- utils/cam.py | 5 ++++- utils/cam_helpers.py | 6 ++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/utils/cam.py b/utils/cam.py index 2fa7156..7149d93 100755 --- a/utils/cam.py +++ b/utils/cam.py @@ -59,6 +59,8 @@ def parse_args(ctx: Context): parser.add_argument('-S', '--script', help='User script') parser.add_argument('-D', '--delay', type=int, help='Delay in secs after the initial KMS modeset') parser.add_argument('-v', '--verbose', action='store_true', default=False, help='Verbose output') + parser.add_argument('-H', '--host', default='192.168.88.20', type=str) + parser.add_argument('-P', '--port', default=43242, type=int) parser.add_argument('config_name', help='Configuration name') parser.add_argument('params', nargs='*', help='Parameters to the configuration') args = parser.parse_args() @@ -88,7 +90,8 @@ def parse_args(ctx: Context): if args.tx: ctx.tx = args.tx.split(',') - ctx.net_tx = NetTX() + ctx.net_tx = NetTX(host=args.host, port=args.port) + print(f'Network transfer on {args.host}:{args.port}') else: ctx.tx = None ctx.net_tx = None diff --git a/utils/cam_helpers.py b/utils/cam_helpers.py index 498e460..e09ae63 100644 --- a/utils/cam_helpers.py +++ b/utils/cam_helpers.py @@ -63,11 +63,9 @@ class NetTX: # ctx-idx, width, height, strides[4], format[16], num-planes, plane[4] struct_fmt = struct.Struct(' None: - HOST, PORT = '192.168.88.20', 43242 - + def __init__(self, host: str, port: int) -> None: self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - self.sock.connect((HOST, PORT)) + self.sock.connect((host, port)) def tx(self, stream, vbuf, is_drm): cap = stream['cap'] From 55edf1555bc71f89e034647b8e0b54990b57a13e Mon Sep 17 00:00:00 2001 From: Cosmin Tanislav Date: Mon, 28 Oct 2024 15:31:24 +0200 Subject: [PATCH 2/2] cam-rx: allow configuring host and port --- utils/cam-rx.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/utils/cam-rx.py b/utils/cam-rx.py index 8f62f23..eedfb11 100755 --- a/utils/cam-rx.py +++ b/utils/cam-rx.py @@ -3,6 +3,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright (C) 2023, Tomi Valkeinen +import argparse import struct import sys import traceback @@ -13,7 +14,6 @@ from PyQt6.QtCore import Qt import PyQt6.QtNetwork -PORT = 43242 receivers = [] # ctx-idx, width, height, strides[4], format[16], num-planes, plane[4] @@ -195,6 +195,11 @@ def readkey(): qApp.quit() def main(): + parser = argparse.ArgumentParser(description='Camera RX server') + parser.add_argument('-H', '--host', default='0.0.0.0') + parser.add_argument('-P', '--port', default=43242, type=int) + args = parser.parse_args() + qApp = QtWidgets.QApplication(sys.argv) qApp.setQuitOnLastWindowClosed(False) @@ -202,8 +207,9 @@ def main(): keynotif.activated.connect(readkey) tcpServer = PyQt6.QtNetwork.QTcpServer(qApp) - tcpServer.listen(PyQt6.QtNetwork.QHostAddress('0.0.0.0'), PORT) + tcpServer.listen(PyQt6.QtNetwork.QHostAddress(args.host), args.port) tcpServer.newConnection.connect(lambda: new_connection(tcpServer)) + print(f'Network receive on {args.host}:{args.port}') return qApp.exec()