Skip to content

Commit

Permalink
Merge pull request #1123 from papr/non_hw_ts
Browse files Browse the repository at this point in the history
UVC Source: Only use hardware timestamps for Pupil Labs cameras
  • Loading branch information
mkassner authored Mar 16, 2018
2 parents b51d1bd + 13d72cd commit ae0c792
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions pupil_src/shared_modules/video_capture/uvc_backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,11 @@ def verify_drivers(self):

def configure_capture(self, frame_size, frame_rate, uvc_controls):
# Set camera defaults. Override with previous settings afterwards
if 'C930e' in self.uvc_capture.name:
logger.debug('Timestamp offset for c930 applied: -0.1sec')
self.ts_offset = -0.1
else:
if 'Pupil Cam' in self.uvc_capture.name:
self.ts_offset = 0.0
else:
logger.info('Hardware timestamps not supported for {}. Using software timestamps.'.format(self.uvc_capture.name))
self.ts_offset = -0.1

# UVC setting quirks:
controls_dict = dict([(c.display_name, c) for c in self.uvc_capture.controls])
Expand Down

0 comments on commit ae0c792

Please sign in to comment.