diff --git a/darkflow/defaults.py b/darkflow/defaults.py index a54b2ec27..ebb7e26ae 100644 --- a/darkflow/defaults.py +++ b/darkflow/defaults.py @@ -29,10 +29,11 @@ def setDefaults(self): self.define('batch', 16, 'batch size') self.define('epoch', 1000, 'number of epoch') self.define('save', 2000, 'save checkpoint every ? training examples') - self.define('demo', '', 'demo on webcam') + self.define('demo', '', 'path to video source or type camera for webcam') self.define('queue', 1, 'process demo in batch') self.define('json', False, 'Outputs bounding box information in json format.') self.define('saveVideo', False, 'Records video from input video or camera') + self.define('display', False, 'Displays the post processed video') self.define('pbLoad', '', 'path to .pb protobuf file (metaLoad must also be specified)') self.define('metaLoad', '', 'path to .meta file generated during --savepb that corresponds to .pb file') diff --git a/darkflow/net/help.py b/darkflow/net/help.py index 616e85bf6..d0bffb318 100644 --- a/darkflow/net/help.py +++ b/darkflow/net/help.py @@ -68,30 +68,30 @@ def _get_fps(self, frame): def camera(self): file = self.FLAGS.demo SaveVideo = self.FLAGS.saveVideo + display = self.FLAGS.display if file == 'camera': file = 0 + display = True else: assert os.path.isfile(file), \ 'file {} does not exist'.format(file) camera = cv2.VideoCapture(file) - if file == 0: + if display: self.say('Press [ESC] to quit demo') assert camera.isOpened(), \ 'Cannot capture source' - if file == 0:#camera window + _, frame = camera.read() + height, width, _ = frame.shape + + if display:#camera window cv2.namedWindow('', 0) - _, frame = camera.read() - height, width, _ = frame.shape cv2.resizeWindow('', width, height) - else: - _, frame = camera.read() - height, width, _ = frame.shape - + if SaveVideo: fourcc = cv2.VideoWriter_fourcc(*'XVID') if file == 0:#camera window @@ -130,7 +130,7 @@ def camera(self): single_out, img, False) if SaveVideo: videoWriter.write(postprocessed) - if file == 0: #camera window + if display: #camera window cv2.imshow('', postprocessed) # Clear Buffers buffer_inp = list() @@ -141,7 +141,7 @@ def camera(self): sys.stdout.write('{0:3.3f} FPS'.format( elapsed / (timer() - start))) sys.stdout.flush() - if file == 0: #camera window + if display: #camera window choice = cv2.waitKey(1) if choice == 27: break @@ -149,7 +149,7 @@ def camera(self): if SaveVideo: videoWriter.release() camera.release() - if file == 0: #camera window + if display: #camera window cv2.destroyAllWindows() def to_darknet(self):