Skip to content

Home assistant camera #231

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
ikalchev merged 5 commits into from
Apr 5, 2020
Merged

Home assistant camera #231

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6f3422f
Fix typo in camera method
xdissent Mar 22, 2020
ce394c0
Use random ssrcs in camera
xdissent Mar 22, 2020
52f70bd
Add v_ssrc to camera session
xdissent Mar 22, 2020
2d725b2
Unpack v_ssrc in camera start stream
xdissent Mar 22, 2020
02b422b
Rename audio_srtp_key in camera session
xdissent Mar 22, 2020
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
15 changes: 7 additions & 8 deletions pyhap/camera.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ def __init__(self, options, *args, **kwargs):
self.add_preload_service('Microphone')
management = self.add_preload_service('CameraRTPStreamManagement')
management.configure_char('StreamingStatus',
getter_callback=self._get_streaimg_status)
getter_callback=self._get_streaming_status)
management.configure_char('SupportedRTPConfiguration',
value=self.get_supported_rtp_config(
options.get('srtp', False)))
Expand Down Expand Up @@ -484,7 +484,7 @@ async def _start_stream(self, objs, reconfigure): # pylint: disable=unused-argu
if video_rtp_param:
video_rtp_param_objs = tlv.decode(video_rtp_param)
# TODO: Optionals, handle the case where they are missing
opts['v_ssrc'] = 1 or struct.unpack('<I',
opts['v_ssrc'] = struct.unpack('<I',
video_rtp_param_objs.get(
RTP_PARAM_TYPES['SYNCHRONIZATION_SOURCE']))[0]
opts['v_payload_type'] = \
Expand Down Expand Up @@ -539,7 +539,7 @@ async def _start_stream(self, objs, reconfigure): # pylint: disable=unused-argu
del self.sessions[session_id]
self.streaming_status = STREAMING_STATUS['AVAILABLE']

def _get_streaimg_status(self):
def _get_streaming_status(self):
"""Get the streaming status in TLV format.

Called when iOS reads the StreaminStatus ``Characteristic``.
Expand Down Expand Up @@ -667,9 +667,8 @@ def set_endpoints(self, value):
video_srtp_tlv = NO_SRTP
audio_srtp_tlv = NO_SRTP

# TODO: Use os.urandom(4) but within the allowed value bounds
video_ssrc = b'\x01'
audio_ssrc = b'\x01'
video_ssrc = int.from_bytes(os.urandom(3), byteorder="big")
audio_ssrc = int.from_bytes(os.urandom(3), byteorder="big")

res_address_tlv = tlv.encode(
SETUP_ADDR_INFO['ADDRESS_VER'], self.stream_address_isv6,
Expand All @@ -692,9 +691,9 @@ def set_endpoints(self, value):
'address': address,
'v_port': target_video_port,
'v_srtp_key': to_base64_str(video_master_key + video_master_salt),
# TODO: 'v_ssrc': video_ssrc,
'v_ssrc': video_ssrc,
'a_port': target_audio_port,
'audio_srtp_key': to_base64_str(audio_master_key + audio_master_salt),
'a_srtp_key': to_base64_str(audio_master_key + audio_master_salt),
'a_ssrc': audio_ssrc
}

Expand Down