Bugfix camera streams (#5306)

* fix mjpeg streams * fix trow error on close by frontend * fix ffmpeg
home-assistant · Jan 13, 2017 · 4b43537 · 4b43537
1 parent 6abad6b
commit 4b43537
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/homeassistant/components/camera/ffmpeg.py b/homeassistant/components/camera/ffmpeg.py
@@ -84,9 +84,15 @@ def handle_async_mjpeg_stream(self, request):
                 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):

diff --git a/homeassistant/components/camera/mjpeg.py b/homeassistant/components/camera/mjpeg.py
@@ -124,9 +124,13 @@ def handle_async_mjpeg_stream(self, request):
         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()
 

diff --git a/homeassistant/components/camera/synology.py b/homeassistant/components/camera/synology.py
@@ -276,9 +276,13 @@ def handle_async_mjpeg_stream(self, request):
             _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()