From 16c3efba13fe1283a93abe510c0680d3267119e4 Mon Sep 17 00:00:00 2001 From: Lennart Heimbs Date: Mon, 5 Aug 2019 10:17:40 +0200 Subject: [PATCH 1/3] minor changes --- camera/video_presence.py | 7 ------- camera/video_stream/zmq_video_client_file.py | 7 +++++-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/camera/video_presence.py b/camera/video_presence.py index c1a1434..5de4caf 100755 --- a/camera/video_presence.py +++ b/camera/video_presence.py @@ -62,15 +62,8 @@ differ = None now = '' framecounter = 0 trackeron = 0 -people_count_total = 0 - -cv2.namedWindow('Video stream', cv2.WINDOW_NORMAL) -if VISUAL_DEBUG: - cv2.namedWindow('debug image', cv2.WINDOW_NORMAL) while True: - if VISUAL_DEBUG: - print("Frame {}".format(framecounter)) people_count_per_frame = 0 frame = vs.read() frame = frame if args.get("video", None) is None else frame[1] diff --git a/camera/video_stream/zmq_video_client_file.py b/camera/video_stream/zmq_video_client_file.py index baa4738..4f9b2a8 100644 --- a/camera/video_stream/zmq_video_client_file.py +++ b/camera/video_stream/zmq_video_client_file.py @@ -16,8 +16,11 @@ sender = imagezmq.ImageSender(connect_to="tcp://{}:5555".format( args["server_ip"])) rpi_name = socket.gethostname() # send RPi hostname with each image -video_file = FileVideoStream("../run.mp4").start() +video_file = FileVideoStream("run.mp4").start() time.sleep(2.0) # allow camera sensor to warm up -while video_file.more(): + +while True: image = video_file.read() + if image is None: + break sender.send_image(rpi_name, image) \ No newline at end of file From 37c47bab6632c77c697b5f0808f4bac90689c154 Mon Sep 17 00:00:00 2001 From: Lennart Heimbs Date: Mon, 5 Aug 2019 12:08:31 +0200 Subject: [PATCH 2/3] change port in imagezmq --- camera/video_stream/imagezmq.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/camera/video_stream/imagezmq.py b/camera/video_stream/imagezmq.py index f05e6db..c73959d 100644 --- a/camera/video_stream/imagezmq.py +++ b/camera/video_stream/imagezmq.py @@ -26,7 +26,7 @@ class ImageSender(): connect_to: the tcp address:port of the hub computer. """ - def __init__(self, connect_to='tcp://127.0.0.1:5555'): + def __init__(self, connect_to='tcp://127.0.0.1:63128'): """Initializes zmq socket for sending images to the hub. Expects an open socket at the connect_to tcp address; it will @@ -86,7 +86,7 @@ class ImageHub(): open_port: (optional) the socket to open for receiving REQ requests. """ - def __init__(self, open_port='tcp://*:5555'): + def __init__(self, open_port='tcp://*:63128'): """Initializes zmq REP socket to receive images and text. """ From efa03a17a111e4634342378944b81852925868b9 Mon Sep 17 00:00:00 2001 From: Lennart Heimbs Date: Mon, 5 Aug 2019 12:32:42 +0200 Subject: [PATCH 3/3] change port in client --- camera/video_stream/zmq_video_client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/camera/video_stream/zmq_video_client.py b/camera/video_stream/zmq_video_client.py index 700cc93..00b8795 100644 --- a/camera/video_stream/zmq_video_client.py +++ b/camera/video_stream/zmq_video_client.py @@ -12,7 +12,7 @@ args = vars(ap.parse_args()) # initialize the ImageSender object with the socket address of the # server -sender = imagezmq.ImageSender(connect_to="tcp://{}:5555".format( +sender = imagezmq.ImageSender(connect_to="tcp://{}:63128".format( args["server_ip"])) rpi_name = socket.gethostname() # send RPi hostname with each image