jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 14:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add streamEye protocol selection UI support

Browse Source
This commit is contained in:
Calin Crisan 2019-05-10 22:59:38 +03:00
parent 4a0a745d82
commit 3c56bc2d75
3 changed files with 93 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
board/raspberrypi/motioneye-modules/streameyectl.py
View File

@ -130,6 +130,11 @@ ROTATION_CHOICES = [
('270', '270°')
]
PROTO_CHOICES = [
('mjpeg', 'MJPEG'),
('rtsp', 'RTSP'),
]
AUTH_CHOICES = [
('disabled', 'Disabled'),
('basic', 'Basic'),
@ -402,6 +407,7 @@ def _set_raspimjpeg_settings(camera_id, s):
def _get_streameye_settings(camera_id):
s = {
'seProto': 'mjpeg',
'seAuthMode': 'disabled',
'sePort': 8081,
}
@ -424,6 +430,10 @@ def _get_streameye_settings(camera_id):
if m:
s['seAuthMode'] = m[0]
m = re.findall('PROTO="?(\w+)"?', line)
if m:
s['seProto'] = m[0]
return s
@ -440,6 +450,7 @@ def _set_streameye_settings(camera_id, s):
logging.debug('writing streameye settings to %s' % STREAMEYE_CONF)
lines = [
'PROTO="%s"' % s['seProto'],
'PORT="%s"' % s['sePort'],
'AUTH="%s"' % s['seAuthMode'],
'CREDENTIALS="%s:%s:%s"' % (username, password, realm)
@ -1130,6 +1141,26 @@ def seImxfx():
}
@additional_config
def seProto():
if not _get_streameye_enabled():
return None
return {
'label': 'Streaming Protocol',
'description': 'the desired streaming protocol (keep in mind that RTSP is experimental)',
'type': 'choices',
'choices': PROTO_CHOICES,
'section': 'streaming',
'advanced': True,
'camera': True,
'required': True,
'get': _get_streameye_settings,
'set': _set_streameye_settings,
'get_set_dict': True
}
@additional_config
def sePort():
if not _get_streameye_enabled():

31
board/raspberrypi2/motioneye-modules/streameyectl.py
View File

@ -130,6 +130,11 @@ ROTATION_CHOICES = [
('270', '270°')
]
PROTO_CHOICES = [
('mjpeg', 'MJPEG'),
('rtsp', 'RTSP'),
]
AUTH_CHOICES = [
('disabled', 'Disabled'),
('basic', 'Basic'),
@ -402,6 +407,7 @@ def _set_raspimjpeg_settings(camera_id, s):
def _get_streameye_settings(camera_id):
s = {
'seProto': 'mjpeg',
'seAuthMode': 'disabled',
'sePort': 8081,
}
@ -424,6 +430,10 @@ def _get_streameye_settings(camera_id):
if m:
s['seAuthMode'] = m[0]
m = re.findall('PROTO="?(\w+)"?', line)
if m:
s['seProto'] = m[0]
return s
@ -440,6 +450,7 @@ def _set_streameye_settings(camera_id, s):
logging.debug('writing streameye settings to %s' % STREAMEYE_CONF)
lines = [
'PROTO="%s"' % s['seProto'],
'PORT="%s"' % s['sePort'],
'AUTH="%s"' % s['seAuthMode'],
'CREDENTIALS="%s:%s:%s"' % (username, password, realm)
@ -1130,6 +1141,26 @@ def seImxfx():
}
@additional_config
def seProto():
if not _get_streameye_enabled():
return None
return {
'label': 'Streaming Protocol',
'description': 'the desired streaming protocol (keep in mind that RTSP is experimental)',
'type': 'choices',
'choices': PROTO_CHOICES,
'section': 'streaming',
'advanced': True,
'camera': True,
'required': True,
'get': _get_streameye_settings,
'set': _set_streameye_settings,
'get_set_dict': True
}
@additional_config
def sePort():
if not _get_streameye_enabled():

31
board/raspberrypi3/motioneye-modules/streameyectl.py
View File

@ -130,6 +130,11 @@ ROTATION_CHOICES = [
('270', '270°')
]
PROTO_CHOICES = [
('mjpeg', 'MJPEG'),
('rtsp', 'RTSP'),
]
AUTH_CHOICES = [
('disabled', 'Disabled'),
('basic', 'Basic'),
@ -402,6 +407,7 @@ def _set_raspimjpeg_settings(camera_id, s):
def _get_streameye_settings(camera_id):
s = {
'seProto': 'mjpeg',
'seAuthMode': 'disabled',
'sePort': 8081,
}
@ -424,6 +430,10 @@ def _get_streameye_settings(camera_id):
if m:
s['seAuthMode'] = m[0]
m = re.findall('PROTO="?(\w+)"?', line)
if m:
s['seProto'] = m[0]
return s
@ -440,6 +450,7 @@ def _set_streameye_settings(camera_id, s):
logging.debug('writing streameye settings to %s' % STREAMEYE_CONF)
lines = [
'PROTO="%s"' % s['seProto'],
'PORT="%s"' % s['sePort'],
'AUTH="%s"' % s['seAuthMode'],
'CREDENTIALS="%s:%s:%s"' % (username, password, realm)
@ -1130,6 +1141,26 @@ def seImxfx():
}
@additional_config
def seProto():
if not _get_streameye_enabled():
return None
return {
'label': 'Streaming Protocol',
'description': 'the desired streaming protocol (keep in mind that RTSP is experimental)',
'type': 'choices',
'choices': PROTO_CHOICES,
'section': 'streaming',
'advanced': True,
'camera': True,
'required': True,
'get': _get_streameye_settings,
'set': _set_streameye_settings,
'get_set_dict': True
}
@additional_config
def sePort():
if not _get_streameye_enabled():