Browse Source

Add img/vid to gitignore; minor changes in video/image presence

master
Lennart Heimbs 2 years ago
parent
commit
cc9304365a
3 changed files with 10 additions and 5 deletions
  1. 3
    0
      .gitignore
  2. 4
    3
      camera/image_presence.py
  3. 3
    2
      camera/video_presence.py

+ 3
- 0
.gitignore View File

@@ -4,3 +4,6 @@ venv/
camera/venv
camera/images
camera/videos
*.jpg
*.h264
*.mp4

+ 4
- 3
camera/image_presence.py View File

@@ -49,6 +49,7 @@ for imagePath in paths.list_images(args["images"]):
print("[INFO] {}: {} original boxes, {} after suppression".format(filename, len(rects), len(pick)))

# show the output images
#cv2.imshow("Before NMS", orig)
#cv2.imshow("After NMS", image)
#cv2.waitKey(0)
if len(pick):
#cv2.imshow("Before NMS", orig)
cv2.imshow("After NMS", image)
cv2.waitKey(0)

+ 3
- 2
camera/video_presence.py View File

@@ -50,6 +50,7 @@ if args.get("video", None) is None:
# otherwise, we are reading from a video file
else:
vs = cv2.VideoCapture(args["video"])
#vs.set(cv2.CAP_PROP_FPS, 2)

"""" Analyzing video frames """
# loop over the frames of the video, and store corresponding information from each frame
@@ -92,7 +93,7 @@ while True:
# dilate the thresholded image to fill in holes, then find contours on thresholded image
thresh = cv2.dilate(thresh, None, iterations=2)
thresh = np.uint8(thresh)
cnts, im2 = cv2.findContours(thresh.copy(), cv2.RETR_EXTERNAL,cv2.CHAIN_APPROX_SIMPLE)
_, cnts, im2 = cv2.findContours(thresh.copy(), cv2.RETR_EXTERNAL,cv2.CHAIN_APPROX_SIMPLE)
#cnts = cnts if imutils.is_cv2() else im2
#print(len(cnts))
#if len(cnts) > 1:
@@ -120,7 +121,7 @@ while True:

trackbox = frame[y:y+h, x:x+w]
trackbox = cv2.resize(trackbox, (224, 224))
cv2.imshow('image',trackbox)
#cv2.imshow('image',trackbox)
blob = cv2.dnn.blobFromImage(cv2.resize(trackbox, (300, 300)),0.007843, (300, 300), 127.5)
net.setInput(blob)
detections = net.forward()

Loading…
Cancel
Save