From c40d84705f5b5c0c1d591fae3dc824ef933e8188 Mon Sep 17 00:00:00 2001
From: Cole Deck <cd109876@gmail.com>
Date: Fri, 13 Dec 2019 09:21:41 -0600
Subject: [PATCH] stuff

---
 __pycache__/detect.cpython-38.pyc | Bin 5898 -> 5881 bytes
 detect.py                         |   8 ++++----
 run_detect.py                     |   7 +++++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/__pycache__/detect.cpython-38.pyc b/__pycache__/detect.cpython-38.pyc
index 6424b2e56fc38e3c219fe27a1e0c1ae65cfa3110..66e3f488ae2a59ad824f700ec596ea04a2e576d9 100644
GIT binary patch
delta 184
zcmeCu`>D$t%FD~e00efcKgYh?$oqpwS|f#VAv+^Oo<RxA0{a@C62=<MX2ufs8kZE4
z$qKyU%24?f@mjYU&04J*%@nb0rU@KHcT!9jIM(PcWK1!e9L1~3Xg;}tSDMju@*G}U
zTMKc9X2vw85|%876w4Hi6jrbeIuILb+#sfd)BstoDQK!Ei}9H<T5a~>Tfw-QRe+Tp
E0G9bNt^fc4

delta 202
zcmeyV+oi`F%FD~e00hD_KF9vs$oqpw+9ZW>Av+^Oo<RxA0{a@C62=<MX2ufs8kZE)
z$qKyU%24?f@mjYU&04J*%@nb0rU@KHcT&t2IM(PcWK1!i9L1~3Xfe5gSDMjm@*G}U
zTT5|<X2vw85|%876sr`I6jrbeIuILb+#sfd)BstoDQK!Ei}9H<T5tB@Tfr!($y_7{
NbS;9|{Dq&D9RMGwG?oAW

diff --git a/detect.py b/detect.py
index 353a6e0..4f62c97 100644
--- a/detect.py
+++ b/detect.py
@@ -332,12 +332,12 @@ def detect(calibration_width, img_file, show, quick):
                     cv2.putText(orig, str(objtype),
                                 (int(x - 25), int(y + radius + 20)
                                  ), cv2.FONT_HERSHEY_SIMPLEX,
-                                0.55, (255, 255, 255), 2)
+                                0.55, (0, 0, 255), 2)
                 else:
                     cv2.putText(orig, str(objtype),
                                 (int(xpos2 + 10), int(ypos2 + 20)
                                  ), cv2.FONT_HERSHEY_SIMPLEX,
-                                0.55, (255, 255, 255), 2)
+                                0.55, (0, 0, 255), 2)
                 output = ""
                 objname = objtype;
                 if objtype == "Unknown":
@@ -353,12 +353,12 @@ def detect(calibration_width, img_file, show, quick):
                     cv2.putText(orig, output,  # print data
                                 (int(x - 25), int(y + radius + 35)
                                  ), cv2.FONT_HERSHEY_SIMPLEX,
-                                0.5, (255, 255, 255), 1)
+                                0.5, (0, 0, 255), 1)
                 else:
                     cv2.putText(orig, output,  # print data
                                 (int(xpos2 + 10), int(ypos2 + 35)
                                  ), cv2.FONT_HERSHEY_SIMPLEX,
-                                0.5, (255, 255, 255), 1)
+                                0.5, (0, 0, 255), 1)
 
         # show the output image
                 if show:
diff --git a/run_detect.py b/run_detect.py
index 378e5ce..72301a6 100644
--- a/run_detect.py
+++ b/run_detect.py
@@ -15,8 +15,11 @@ if not video:
 	elapsed_time = timeit.timeit(go, number=3)/3
 	print(elapsed_time)
 else :
-    capture = cv2.VideoCapture('udpclientsrc host=192.168.43.152 port=5001  ! gdpdepay !  rtph264depay ! avdec_h264 ! videoconvert ! videorate ! video/x-raw,framerate=5/1 ! appsink', cv2.CAP_GSTREAMER)
+    #tcp capture = cv2.VideoCapture('udpsrc port=5001  ! gdpdepay !  rtph264depay ! avdec_h264 ! videoconvert ! videorate ! video/x-raw,framerate=5/1 ! appsink', cv2.CAP_GSTREAMER)
+    capture = cv2.VideoCapture('udpsrc port=9000 caps="application/x-rtp, media=(string)video, clock-rate=(int)90000, encoding-name=(string)H264" ! rtph264depay ! avdec_h264 ! videoconvert ! appsink sync=false', cv2.CAP_GSTREAMER)
+    
     # server command for imx135 camera ./video2stdout | gst-launch-1.0 -v fdsrc ! h264parse !  rtph264pay config-interval=1 pt=96 ! gdppay ! tcpserversink host=192.168.43.152 port=5001
+    # server command for udp: ./video2stdout | gst-launch-1.0 -v fdsrc !  h264parse ! rtph264pay config-interval=10 pt=96 ! udpsink host=192.168.43.40 port=9000
     #ret,frame = capture.read()
     #detect.detect(calibration_width, "img7.jpg", True, False)
     #detect.detect(calibration_width, frame, True, True)
@@ -28,7 +31,7 @@ else :
             print('empty frame')
             break
         #print('frame')
-        if x > 0:
+        if x > 1:
             ret,frame = capture.retrieve()
             cv2.imshow('Item Sorter', detect.detect(calibration_width, frame, True, True))
             x = 0