Change folder structure, finish the multithreading example to improve fps on low performance machines.

Author: datitran

README.md

@@ -12,6 +12,11 @@ A real-time object recognition application using [Google's TensorFlow Object Det
  * Number of workers `--num-workers=2`
  * Size of the queue `--queue-size=5`
 
+## Tests
+```
+pytest -vs utils/
+```
+
 ## Requirements
 - [Anaconda / Python 3.5](https://www.continuum.io/downloads)
 - [TensorFlow 1.2](https://www.tensorflow.org/)

object_detection_app.py

@@ -6,7 +6,7 @@
 import numpy as np
 import tensorflow as tf
 
-from utils import FPS, WebcamVideoStream
+from utils.app_utils import FPS, WebcamVideoStream
 from multiprocessing import Queue, Pool
 from object_detection.utils import label_map_util
 from object_detection.utils import visualization_utils as vis_util

object_detection_multilayer.py

@@ -6,7 +6,7 @@
 import numpy as np
 import tensorflow as tf
 
-from utils import FPS
+from utils.app_utils import FPS
 from object_detection.utils import label_map_util
 from object_detection.utils import visualization_utils as vis_util
 

object_detection_multithreading.py

@@ -7,7 +7,7 @@
 
 from queue import Queue
 from threading import Thread
-from utils import FPS, WebcamVideoStream, draw_boxes_and_labels
+from utils.app_utils import FPS, WebcamVideoStream, draw_boxes_and_labels
 from object_detection.utils import label_map_util
 
 CWD_PATH = os.getcwd()
@@ -49,10 +49,12 @@ def detect_objects(image_np, sess, detection_graph):
 
  # Visualization of the results of a detection.
  rect_points, class_names, class_colors = draw_boxes_and_labels(
- np.squeeze(boxes),
- np.squeeze(classes).astype(np.int32),
- np.squeeze(scores),
- category_index)
+ boxes=np.squeeze(boxes),
+ classes=np.squeeze(classes).astype(np.int32),
+ scores=np.squeeze(scores),
+ category_index=category_index,
+ min_score_thresh=.5
+ )
  return dict(rect_points=rect_points, class_names=class_names, class_colors=class_colors)
 
 
@@ -88,7 +90,7 @@ def worker(input_q, output_q):
  default=360, help='Height of the frames in the video stream.')
  args = parser.parse_args()
 
- input_q = Queue(30)
+ input_q = Queue(5) # fps is better if queue is higher but then more lags
  output_q = Queue()
  for i in range(1):
  t = Thread(target=worker, args=(input_q, output_q))
@@ -107,19 +109,21 @@ def worker(input_q, output_q):
  t = time.time()
 
  if output_q.empty():
- cv2.imshow('Video', frame)
+ pass # fill up queue
  else:
- # TO-DO need to draw the boxes here
  font = cv2.FONT_HERSHEY_SIMPLEX
  data = output_q.get()
  rec_points = data['rect_points']
  class_names = data['class_names']
  class_colors = data['class_colors']
  for point, name, color in zip(rec_points, class_names, class_colors):
- cv2.rectangle(frame, (int(point[1] * args.width), int(point[0] * args.height)),
- (int(point[3] * args.width), int(point[2] * args.height)), color, 3)
- cv2.putText(frame, name[0], (int(point[1] * args.width), int(point[0] * args.height)), font, 0.5,
- (0, 0, 0), 1)
+ cv2.rectangle(frame, (int(point['xmin'] * args.width), int(point['ymin'] * args.height)),
+ (int(point['xmax'] * args.width), int(point['ymax'] * args.height)), color, 3)
+ cv2.rectangle(frame, (int(point['xmin'] * args.width), int(point['ymin'] * args.height)),
+ (int(point['xmin'] * args.width) + len(name[0]) * 6,
+ int(point['ymin'] * args.height) - 10), color, -1, cv2.LINE_AA)
+ cv2.putText(frame, name[0], (int(point['xmin'] * args.width), int(point['ymin'] * args.height)), font,
+ 0.3, (0, 0, 0), 1)
  cv2.imshow('Video', frame)
 
  fps.update()

utils/__init__.py

@@ -78,31 +78,33 @@ def stop(self):
  self.stopped = True
 
 
-STANDARD_COLORS = [
- 'AliceBlue', 'Chartreuse', 'Aqua', 'Aquamarine', 'Azure', 'Beige', 'Bisque',
- 'BlanchedAlmond', 'BlueViolet', 'BurlyWood', 'CadetBlue', 'AntiqueWhite',
- 'Chocolate', 'Coral', 'CornflowerBlue', 'Cornsilk', 'Crimson', 'Cyan',
- 'DarkCyan', 'DarkGoldenRod', 'DarkGrey', 'DarkKhaki', 'DarkOrange',
- 'DarkOrchid', 'DarkSalmon', 'DarkSeaGreen', 'DarkTurquoise', 'DarkViolet',
- 'DeepPink', 'DeepSkyBlue', 'DodgerBlue', 'FireBrick', 'FloralWhite',
- 'ForestGreen', 'Fuchsia', 'Gainsboro', 'GhostWhite', 'Gold', 'GoldenRod',
- 'Salmon', 'Tan', 'HoneyDew', 'HotPink', 'IndianRed', 'Ivory', 'Khaki',
- 'Lavender', 'LavenderBlush', 'LawnGreen', 'LemonChiffon', 'LightBlue',
- 'LightCoral', 'LightCyan', 'LightGoldenRodYellow', 'LightGray', 'LightGrey',
- 'LightGreen', 'LightPink', 'LightSalmon', 'LightSeaGreen', 'LightSkyBlue',
- 'LightSlateGray', 'LightSlateGrey', 'LightSteelBlue', 'LightYellow', 'Lime',
- 'LimeGreen', 'Linen', 'Magenta', 'MediumAquaMarine', 'MediumOrchid',
- 'MediumPurple', 'MediumSeaGreen', 'MediumSlateBlue', 'MediumSpringGreen',
- 'MediumTurquoise', 'MediumVioletRed', 'MintCream', 'MistyRose', 'Moccasin',
- 'NavajoWhite', 'OldLace', 'Olive', 'OliveDrab', 'Orange', 'OrangeRed',
- 'Orchid', 'PaleGoldenRod', 'PaleGreen', 'PaleTurquoise', 'PaleVioletRed',
- 'PapayaWhip', 'PeachPuff', 'Peru', 'Pink', 'Plum', 'PowderBlue', 'Purple',
- 'Red', 'RosyBrown', 'RoyalBlue', 'SaddleBrown', 'Green', 'SandyBrown',
- 'SeaGreen', 'SeaShell', 'Sienna', 'Silver', 'SkyBlue', 'SlateBlue',
- 'SlateGray', 'SlateGrey', 'Snow', 'SpringGreen', 'SteelBlue', 'GreenYellow',
- 'Teal', 'Thistle', 'Tomato', 'Turquoise', 'Violet', 'Wheat', 'White',
- 'WhiteSmoke', 'Yellow', 'YellowGreen'
-]
+def standard_colors():
+ colors = [
+ 'AliceBlue', 'Chartreuse', 'Aqua', 'Aquamarine', 'Azure', 'Beige', 'Bisque',
+ 'BlanchedAlmond', 'BlueViolet', 'BurlyWood', 'CadetBlue', 'AntiqueWhite',
+ 'Chocolate', 'Coral', 'CornflowerBlue', 'Cornsilk', 'Crimson', 'Cyan',
+ 'DarkCyan', 'DarkGoldenRod', 'DarkGrey', 'DarkKhaki', 'DarkOrange',
+ 'DarkOrchid', 'DarkSalmon', 'DarkSeaGreen', 'DarkTurquoise', 'DarkViolet',
+ 'DeepPink', 'DeepSkyBlue', 'DodgerBlue', 'FireBrick', 'FloralWhite',
+ 'ForestGreen', 'Fuchsia', 'Gainsboro', 'GhostWhite', 'Gold', 'GoldenRod',
+ 'Salmon', 'Tan', 'HoneyDew', 'HotPink', 'IndianRed', 'Ivory', 'Khaki',
+ 'Lavender', 'LavenderBlush', 'LawnGreen', 'LemonChiffon', 'LightBlue',
+ 'LightCoral', 'LightCyan', 'LightGoldenRodYellow', 'LightGray', 'LightGrey',
+ 'LightGreen', 'LightPink', 'LightSalmon', 'LightSeaGreen', 'LightSkyBlue',
+ 'LightSlateGray', 'LightSlateGrey', 'LightSteelBlue', 'LightYellow', 'Lime',
+ 'LimeGreen', 'Linen', 'Magenta', 'MediumAquaMarine', 'MediumOrchid',
+ 'MediumPurple', 'MediumSeaGreen', 'MediumSlateBlue', 'MediumSpringGreen',
+ 'MediumTurquoise', 'MediumVioletRed', 'MintCream', 'MistyRose', 'Moccasin',
+ 'NavajoWhite', 'OldLace', 'Olive', 'OliveDrab', 'Orange', 'OrangeRed',
+ 'Orchid', 'PaleGoldenRod', 'PaleGreen', 'PaleTurquoise', 'PaleVioletRed',
+ 'PapayaWhip', 'PeachPuff', 'Peru', 'Pink', 'Plum', 'PowderBlue', 'Purple',
+ 'Red', 'RosyBrown', 'RoyalBlue', 'SaddleBrown', 'Green', 'SandyBrown',
+ 'SeaGreen', 'SeaShell', 'Sienna', 'Silver', 'SkyBlue', 'SlateBlue',
+ 'SlateGray', 'SlateGrey', 'Snow', 'SpringGreen', 'SteelBlue', 'GreenYellow',
+ 'Teal', 'Thistle', 'Tomato', 'Turquoise', 'Violet', 'Wheat', 'White',
+ 'WhiteSmoke', 'Yellow', 'YellowGreen'
+ ]
+ return colors
 
 
 def color_name_to_rgb():
@@ -122,7 +124,7 @@ def draw_boxes_and_labels(
  max_boxes_to_draw=20,
  min_score_thresh=.5,
  agnostic_mode=False):
- """Returns boxes coordinates of the boxes, class names and colors
+ """Returns boxes coordinates, class names and colors
 
  Args:
  boxes: a numpy array of shape [N, 4]
@@ -175,8 +177,8 @@ def draw_boxes_and_labels(
  if agnostic_mode:
  box_to_color_map[box] = 'DarkOrange'
  else:
- box_to_color_map[box] = STANDARD_COLORS[
- classes[i] % len(STANDARD_COLORS)]
+ box_to_color_map[box] = standard_colors()[
+ classes[i] % len(standard_colors())]
 
  # Store all the coordinates of the boxes, class names and colors
  color_rgb = color_name_to_rgb()
@@ -185,7 +187,7 @@ def draw_boxes_and_labels(
  class_colors = []
  for box, color in six.iteritems(box_to_color_map):
  ymin, xmin, ymax, xmax = box
- rect_points.append((ymin, xmin, ymax, xmax))
+ rect_points.append(dict(ymin=ymin, xmin=xmin, ymax=ymax, xmax=xmax))
  class_names.append(box_to_display_str_map[box])
  class_colors.append(color_rgb[color.lower()])
  return rect_points, class_names, class_colors

utils.py renamed to utils/app_utils.py

@@ -0,0 +1,15 @@
+import unittest
+from object_detector_app.utils.app_utils import color_name_to_rgb, standard_colors
+
+
+class TestUtils(unittest.TestCase):
+ def setUp(self):
+ self.colors = color_name_to_rgb()
+ self.standard_colors = standard_colors()
+
+ def test_all_colors(self):
+ """Test that manual defined colors are also in the matplotlib color name space."""
+ color_list = set(sorted(list(self.colors.keys())))
+ standard_color_list = set(sorted([color.lower() for color in self.standard_colors]))
+ color_common = standard_color_list.intersection(color_list)
+ self.assertEqual(len(color_common), len(standard_color_list))