Bugfix camera streams (#5306)

* fix mjpeg streams

* fix trow error on close by frontend

* fix ffmpeg
This commit is contained in:
Pascal Vizeli authored and Paulus Schoutsen committed 2017-01-13 15:57:38 -08:00
1 parent 6abad6b76e
commit 4b43537801
3 files changed
+18 -4

No files matched your search

+8 -2
View File
@@ -84,9 +84,15 @@ class FFmpegCamera(Camera):
if not data:
break
response.write(data)
except asyncio.CancelledError:
_LOGGER.debug("Close stream by browser.")
response = None
finally:
self.hass.async_add_job(stream.close())
yield from response.write_eof()
yield from stream.close()
if response is not None:
yield from response.write_eof()
@property
def name(self):
+5 -1
View File
@@ -124,9 +124,13 @@ class MjpegCamera(Camera):
except asyncio.TimeoutError:
raise HTTPGatewayTimeout()
except asyncio.CancelledError:
_LOGGER.debug("Close stream by browser.")
response = None
finally:
if stream is not None:
yield from stream.close()
stream.close()
if response is not None:
yield from response.write_eof()
+5 -1
View File
@@ -276,9 +276,13 @@ class SynologyCamera(Camera):
_LOGGER.exception("Error on %s", streaming_url)
raise HTTPGatewayTimeout()
except asyncio.CancelledError:
_LOGGER.debug("Close stream by browser.")
response = None
finally:
if stream is not None:
self.hass.async_add_job(stream.release())
stream.close()
if response is not None:
yield from response.write_eof()