diff --git a/client.py b/client.py index d9dc69b..704475c 100644 --- a/client.py +++ b/client.py @@ -1,6 +1,9 @@ import cv2 import socket import numpy as np +import uuid + +uuid = uuid.uuid4() from common import StdPacket, InterlacedPacket @@ -26,7 +29,7 @@ def breakdown_image_norm(frame): for i in range(0, cols, 16): for j in range(0, rows, 16): # print("Sending frame segment (%d, %d)", i, j) - pkt = StdPacket(j, i, frame[i:i + 16, j:j + 16]) + pkt = StdPacket(uuid, j, i, frame[i:i + 16, j:j + 16]) send_packet(sock, pkt.to_bytestr()) def breakdown_image_interlaced(frame): @@ -36,13 +39,13 @@ def breakdown_image_interlaced(frame): for i in range(0, cols, 32): for j in range(0, rows, 16): # print("Sending frame segment (%d, %d)", i, j) - pkt = InterlacedPacket(j, i, False, frame[i:i + 32:2, j:j + 16]) + pkt = InterlacedPacket(uuid, j, i, False, frame[i:i + 32:2, j:j + 16]) send_packet(sock, pkt.to_bytestr()) for i in range(0, cols, 32): for j in range(0, rows, 16): # print("Sending frame segment (%d, %d)", i, j) - pkt = InterlacedPacket(j, i, True, frame[i + 1:i + 32:2, j:j + 16]) + pkt = InterlacedPacket(uuid, j, i, True, frame[i + 1:i + 32:2, j:j + 16]) send_packet(sock, pkt.to_bytestr()) while True: diff --git a/common.py b/common.py index daec585..b8bbef4 100644 --- a/common.py +++ b/common.py @@ -1,29 +1,35 @@ import numpy as np - +from uuid import UUID class StdPacket: - def __init__(self, x: int, y: int, array: np.ndarray): + size = 16 + 4 + 4 + 768 + def __init__(self, uuid: UUID, x: int, y: int, array: np.ndarray): + self.uuid = uuid self.x = x self.y = y self.array = array def to_bytestr(self) -> bytes: bytestr = b"" + bytestr += self.uuid.bytes bytestr += self.x.to_bytes(length=4, signed = False) bytestr += self.y.to_bytes(length=4, signed = False) bytestr += self.array.tobytes() return bytestr def from_bytes_std(b: bytes) -> StdPacket: - x = int.from_bytes(b[0:4], signed = False) - y = int.from_bytes(b[4:8], signed = False) - array = np.frombuffer(b[8:], np.uint8).reshape(16, 16, 3) + uuid = UUID(bytes = b[0:16]) + x = int.from_bytes(b[16:20], signed = False) + y = int.from_bytes(b[20:24], signed = False) + array = np.frombuffer(b[24:], np.uint8).reshape(16, 16, 3) - return StdPacket(x, y, array) + return StdPacket(uuid, x, y, array) class InterlacedPacket: - def __init__(self, x: int, y: int, even: bool, array: np.ndarray): + size = 16 + 4 + 4 + 4 + 768 + def __init__(self, uuid: UUID, x: int, y: int, even: bool, array: np.ndarray): + self.uuid = uuid self.x = x self.y = y self.even = even @@ -31,6 +37,7 @@ class InterlacedPacket: def to_bytestr(self) -> bytes: bytestr = b"" + bytestr += self.uuid.bytes bytestr += self.x.to_bytes(length=4, signed=False) bytestr += self.y.to_bytes(length=4, signed=False) bytestr += self.even.to_bytes(length=4) @@ -39,9 +46,10 @@ class InterlacedPacket: def from_bytes_int(b: bytes) -> InterlacedPacket: - x = int.from_bytes(b[0:4], signed=False) - y = int.from_bytes(b[4:8], signed=False) - even = bool.from_bytes(b[8:12]) - array = np.frombuffer(b[12:], np.uint8).reshape(16, 16, 3) + uuid = UUID(bytes=b[0:16]) + x = int.from_bytes(b[16:20], signed=False) + y = int.from_bytes(b[20:24], signed=False) + even = bool.from_bytes(b[24:28]) + array = np.frombuffer(b[28:], np.uint8).reshape(16, 16, 3) - return InterlacedPacket(x, y, even, array) \ No newline at end of file + return InterlacedPacket(uuid, x, y, even, array) \ No newline at end of file diff --git a/server.py b/server.py index 85e1fb5..6290464 100644 --- a/server.py +++ b/server.py @@ -1,3 +1,5 @@ +from typing import Dict + import cv2 import socket import numpy as np @@ -15,27 +17,32 @@ sock.bind((UDP_IP, UDP_PORT)) HEIGHT = 480 WIDTH = 640 -frame = np.ndarray((HEIGHT, WIDTH, 3), dtype=np.uint8) +frames: Dict[str, np.ndarray] = {} while True: # break the array down into 16-bit chunks, then transmit them as UDP packets for i in range(0, HEIGHT, 16): for j in range(0, WIDTH, 16): - data, addr = sock.recvfrom(780) # buffer size is 768 bytes + data, addr = sock.recvfrom(InterlacedPacket.size) # buffer size is 768 bytes # print("received packet from", addr) pkt = from_bytes_int(data) + uuid = str(pkt.uuid) x = pkt.x y = pkt.y arr = pkt.array + if uuid not in frames.keys(): + frames[uuid] = frame = np.ndarray((HEIGHT, WIDTH, 3), dtype=np.uint8) + if pkt.even: - frame[y+1:y+32:2, x:x+16] = arr + frames[uuid][y+1:y+32:2, x:x+16] = arr else: - frame[y:y + 32:2, x:x + 16] = arr + frames[uuid][y:y + 32:2, x:x + 16] = arr # Display the resulting frame - cv2.imshow('Frame', frame) + for id in frames.keys(): + cv2.imshow(id, frames[id]) # Break the loop if 'q' key is pressed if cv2.waitKey(1) == ord('q'):