Skip to content

Commit

Permalink
Revert "Fix waveform80#311"
Browse files Browse the repository at this point in the history
This reverts commit c4ffce9.
  • Loading branch information
Jim Knowler committed May 16, 2017
1 parent 974540f commit 93bf5a0
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions picamera/mmalobj.py
Original file line number Diff line number Diff line change
Expand Up @@ -1223,11 +1223,14 @@ def wrapper(port, buf):
self._stopped = True
finally:
buf.release()
try:
self._pool.send_buffer(block=False)
except PiCameraPortDisabled:
# The port was disabled, no point trying again
pass
while not self._stopped:
try:
self._pool.send_buffer(timeout=0.01)
except PiCameraMMALError as e:
if e.status != mmal.MMAL_EAGAIN:
raise
else:
break

# Workaround: There is a bug in the MJPEG encoder that causes a
# deadlock if the FIFO is full on shutdown. Increasing the encoder
Expand Down

0 comments on commit 93bf5a0

Please sign in to comment.