evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix HLS idle timer in stream (#51372)

Browse source
This commit is contained in:
uvjustin 2021-06-03 12:31:39 +08:00 • committed by GitHub
parent 2c9e6bd927
commit 55f158cf78
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
homeassistant/components/stream/core.py
View file

@ -84,7 +84,7 @@ class StreamOutput:
) -> None: ) -> None:
"""Initialize a stream output.""" """Initialize a stream output."""
self._hass = hass self._hass = hass
self._idle_timer = idle_timer self.idle_timer = idle_timer
self._event = asyncio.Event() self._event = asyncio.Event()
self._segments: deque[Segment] = deque(maxlen=deque_maxlen) self._segments: deque[Segment] = deque(maxlen=deque_maxlen)
@ -96,7 +96,7 @@ class StreamOutput:
@property @property
def idle(self) -> bool: def idle(self) -> bool:
"""Return True if the output is idle.""" """Return True if the output is idle."""
return self._idle_timer.idle return self.idle_timer.idle
@property @property
def last_sequence(self) -> int: def last_sequence(self) -> int:
@ -139,7 +139,6 @@ class StreamOutput:
async def recv(self) -> bool: async def recv(self) -> bool:
"""Wait for and retrieve the latest segment.""" """Wait for and retrieve the latest segment."""
self._idle_timer.awake()
await self._event.wait() await self._event.wait()
return self.last_segment is not None return self.last_segment is not None
@ -151,7 +150,7 @@ class StreamOutput:
def _async_put(self, segment: Segment) -> None: def _async_put(self, segment: Segment) -> None:
"""Store output from event loop.""" """Store output from event loop."""
# Start idle timeout when we start receiving data # Start idle timeout when we start receiving data
self._idle_timer.start() self.idle_timer.start()
self._segments.append(segment) self._segments.append(segment)
self._event.set() self._event.set()
self._event.clear() self._event.clear()
@ -159,7 +158,7 @@ class StreamOutput:
def cleanup(self): def cleanup(self):
"""Handle cleanup.""" """Handle cleanup."""
self._event.set() self._event.set()
self._idle_timer.clear() self.idle_timer.clear()
self._segments = deque(maxlen=self._segments.maxlen) self._segments = deque(maxlen=self._segments.maxlen)

1
homeassistant/components/stream/hls.py
View file

@ -165,6 +165,7 @@ class HlsSegmentView(StreamView):
async def handle(self, request, stream, sequence): async def handle(self, request, stream, sequence):
"""Return fmp4 segment.""" """Return fmp4 segment."""
track = stream.add_provider(HLS_PROVIDER) track = stream.add_provider(HLS_PROVIDER)
track.idle_timer.awake()
if not (segment := track.get_segment(int(sequence))): if not (segment := track.get_segment(int(sequence))):
return web.HTTPNotFound() return web.HTTPNotFound()
headers = {"Content-Type": "video/iso.segment"} headers = {"Content-Type": "video/iso.segment"}