rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Start streamer on init and never time out

Browse source
This commit is contained in:
Joel Collins 2020-07-06 13:27:18 +01:00
parent ae8e55fcda
commit 6e22376d9e
1 changed files with 3 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
openflexure_microscope/camera/base.py
View file

@ -31,12 +31,14 @@ class BaseCamera(metaclass=ABCMeta):
self.stop = False # Used to indicate that the stream loop should break self.stop = False # Used to indicate that the stream loop should break
self.stream_timeout = 20 self.stream_timeout = 20
self.stream_timeout_enabled = False
self.stream_active = False self.stream_active = False
self.record_active = False self.record_active = False
self.preview_active = False self.preview_active = False
# Start the stream worker on init
self.start_worker()
@property @property
@abstractmethod @abstractmethod
def configuration(self): def configuration(self):
@ -154,17 +156,6 @@ class BaseCamera(metaclass=ABCMeta):
self.frame = frame self.frame = frame
self.event.set() # send signal to clients self.event.set() # send signal to clients
# Handle timeout
if (
self.stream_timeout_enabled
and ( # If using timeout
time.time() - self.last_access > self.stream_timeout
)
and not self.preview_active # And GPU preview is not active
):
self.frames_iterator.close()
break
try: try:
if self.stop is True: if self.stop is True:
logging.debug("Worker thread flagged for stop.") logging.debug("Worker thread flagged for stop.")