Skip to content

Minor change to still image on mjpeg #18602

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
balloob merged 2 commits into from
Nov 21, 2018
Merged

Minor change to still image on mjpeg #18602

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2182db
Update mjpeg.py
nragon Nov 20, 2018
68be03c
Lint
balloob Nov 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions homeassistant/components/camera/mjpeg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,15 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):

def extract_image_from_mjpeg(stream):
"""Take in a MJPEG stream object, return the jpg from it."""
data = b''
data = bytes()
data_start = b"\xff\xd8"
data_end = b"\xff\xd9"
for chunk in stream:
end_idx = chunk.find(data_end)
if end_idx != -1:
return data[data.find(data_start):] + chunk[:end_idx + 2]

data += chunk
jpg_start = data.find(b'\xff\xd8')
jpg_end = data.find(b'\xff\xd9')
if jpg_start != -1 and jpg_end != -1:
jpg = data[jpg_start:jpg_end + 2]
return jpg


class MjpegCamera(Camera):
Expand Down