Skip to content

Commit

Permalink
revert change
Browse files Browse the repository at this point in the history
  • Loading branch information
mkassner committed Mar 31, 2014
1 parent 539ec60 commit dc3a8a6
Showing 1 changed file with 11 additions and 13 deletions.
24 changes: 11 additions & 13 deletions pupil_src/capture/world.py
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,17 @@ def reset_timebase():
# Event loop
while not g_pool.quit.value:

# Get an image from the grabber
try:
frame = cap.get_frame()
except CameraCaptureError:
logger.error("Capture from Camera Failed. Stopping.")
break
except EndofVideoFileError:
logger.warning("Video File is done. Stopping")
break

update_fps()

#a container that allows plugins to post and read events
events = []
Expand All @@ -313,19 +324,6 @@ def reset_timebase():
p['norm_gaze'] = g_pool.map_pupil(p['norm_pupil'])
recent_pupil_positions.append(p)

# Get an image from the grabber
try:
frame = cap.get_frame()
except CameraCaptureError:
logger.error("Capture from Camera Failed. Stopping.")
break
except EndofVideoFileError:
logger.warning("Video File is done. Stopping")
break

update_fps()



# allow each Plugin to do its work.
for p in g_pool.plugins:
Expand Down

0 comments on commit dc3a8a6

Please sign in to comment.