mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-24 11:46:30 +00:00
Merge branch 'dev' of github.com:ccrisan/motioneyeos into dev
This commit is contained in:
Calin Crisan
commit
167f4b03ca
@ -124,6 +124,27 @@ RESOLUTION_CHOICES = [
|
||||
('3280x2464', '3280x2464')
|
||||
]
|
||||
|
||||
RTSP_RESOLUTION_CHOICES = [
|
||||
('320x200', '320x200'),
|
||||
('320x240', '320x240'),
|
||||
('640x480', '640x480'),
|
||||
('800x480', '800x480'),
|
||||
('800x600', '800x600'),
|
||||
('1024x576', '1024x576'),
|
||||
('1024x768', '1024x768'),
|
||||
('1280x720', '1280x720'),
|
||||
('1280x800', '1280x800'),
|
||||
('1280x960', '1280x960'),
|
||||
('1280x1024', '1280x1024'),
|
||||
('1296x972', '1296x972'),
|
||||
('1440x960', '1440x960'),
|
||||
('1440x1024', '1440x1024'),
|
||||
('1600x1200', '1600x1200'),
|
||||
('1640x922', '1640x922'),
|
||||
('1640x1232', '1640x1232'),
|
||||
('1920x1080', '1920x1080')
|
||||
]
|
||||
|
||||
ROTATION_CHOICES = [
|
||||
('0', '0°'),
|
||||
('90', '90°'),
|
||||
@ -311,6 +332,8 @@ def _get_raspimjpeg_settings(camera_id):
|
||||
'imxfx': 'none',
|
||||
'width': 640,
|
||||
'height': 480,
|
||||
'rtspWidth': 640,
|
||||
'rtspHeight': 480,
|
||||
'rotation': 0,
|
||||
'vflip': False,
|
||||
'hflip': False,
|
||||
@ -372,6 +395,7 @@ def _get_raspimjpeg_settings(camera_id):
|
||||
s['sharpness'] = (s['sharpness'] + 100) / 2
|
||||
|
||||
s['resolution'] = '%sx%s' % (s.pop('width'), s.pop('height'))
|
||||
s['rtspResolution'] = '%sx%s' % (s.pop('rtspWidth'), s.pop('rtspHeight'))
|
||||
|
||||
s = dict(('se' + n[0].upper() + n[1:], v) for (n, v) in s.items())
|
||||
|
||||
@ -383,6 +407,8 @@ def _set_raspimjpeg_settings(camera_id, s):
|
||||
|
||||
s['width'] = int(s['resolution'].split('x')[0])
|
||||
s['height'] = int(s.pop('resolution').split('x')[1])
|
||||
s['rtspWidth'] = int(s['rtspResolution'].split('x')[0])
|
||||
s['rtspHeight'] = int(s.pop('rtspResolution').split('x')[1])
|
||||
|
||||
s['zoom'] = '%.2f,%.2f,%.2f,%.2f' % (
|
||||
s.pop('zoomx') / 100.0, s.pop('zoomy') / 100.0,
|
||||
@ -705,13 +731,33 @@ def seResolution():
|
||||
return None
|
||||
|
||||
return {
|
||||
'label': 'Video Resolution',
|
||||
'label': 'MJPEG Video Resolution',
|
||||
'description': 'the video resolution (larger values produce better quality but require more CPU power, larger storage space and bandwidth)',
|
||||
'type': 'choices',
|
||||
'choices': RESOLUTION_CHOICES,
|
||||
'section': 'device',
|
||||
'camera': True,
|
||||
'required': True,
|
||||
'depends': ['seProto==mjpeg'],
|
||||
'get': _get_raspimjpeg_settings,
|
||||
'set': _set_raspimjpeg_settings,
|
||||
'get_set_dict': True
|
||||
}
|
||||
|
||||
@additional_config
|
||||
def seRtspResolution():
|
||||
if not _get_streameye_enabled():
|
||||
return None
|
||||
|
||||
return {
|
||||
'label': 'RTSP Video Resolution',
|
||||
'description': 'the video resolution (larger values produce better quality but require more CPU power, larger storage space and bandwidth)',
|
||||
'type': 'choices',
|
||||
'choices': RTSP_RESOLUTION_CHOICES,
|
||||
'section': 'device',
|
||||
'camera': True,
|
||||
'required': True,
|
||||
'depends': ['seProto==rtsp'],
|
||||
'get': _get_raspimjpeg_settings,
|
||||
'set': _set_raspimjpeg_settings,
|
||||
'get_set_dict': True
|
||||
|
||||
@ -114,7 +114,7 @@ function start() {
|
||||
fi
|
||||
modprobe v4l2loopback video_nr=${vidid}
|
||||
if [ -e "${video_path}" ]; then
|
||||
valid_opts=("analoggain" "awb" "awbgains" "bitrate" "brightness" "colfx" "contrast" "denoise" "digitalgain" "drc" "ev" "exposure" "flicker" "framerate" "height" "hflip" "imxfx" "intra" "irefresh" "level" "metering" "profile" "roi" "rotation" "saturation" "sharpness" "shutter" "vflip" "vstab" "width" "mjpegbitrate" "mjpegframerate" "mjpegwidth" "mjpegheight")
|
||||
valid_opts=("analoggain" "awb" "awbgains" "bitrate" "brightness" "colfx" "contrast" "denoise" "digitalgain" "drc" "ev" "exposure" "flicker" "framerate" "hflip" "imxfx" "intra" "irefresh" "level" "metering" "profile" "roi" "rotation" "saturation" "sharpness" "shutter" "vflip" "vstab" "mjpegbitrate" "mjpegframerate" "mjpegwidth" "mjpegheight")
|
||||
raspimjpeg_opts="--videoout ${video_path}"
|
||||
while read line; do
|
||||
key=$(echo ${line} | cut -d ' ' -f 1)
|
||||
@ -130,6 +130,14 @@ function start() {
|
||||
raspimjpeg_opts="${raspimjpeg_opts} --${line}"
|
||||
done < ${RASPIMJPEG_CONF}
|
||||
|
||||
video_height=$(grep -e ^rtspHeight ${RASPIMJPEG_CONF} | cut -d ' ' -f 2)
|
||||
if [ -n "${video_height}" ]; then
|
||||
raspimjpeg_opts="${raspimjpeg_opts} --height ${video_height}"
|
||||
fi
|
||||
video_width=$(grep -e ^rtspWidth ${RASPIMJPEG_CONF} | cut -d ' ' -f 2)
|
||||
if [ -n "${video_width}" ]; then
|
||||
raspimjpeg_opts="${raspimjpeg_opts} --width ${video_width}"
|
||||
fi
|
||||
video_iso=$(grep -e ^iso ${RASPIMJPEG_CONF} | cut -d ' ' -f 2)
|
||||
if [ -n "${video_iso}" ]; then
|
||||
raspimjpeg_opts="${raspimjpeg_opts} --ISO ${video_iso}"
|
||||
|
||||
@ -124,6 +124,27 @@ RESOLUTION_CHOICES = [
|
||||
('3280x2464', '3280x2464')
|
||||
]
|
||||
|
||||
RTSP_RESOLUTION_CHOICES = [
|
||||
('320x200', '320x200'),
|
||||
('320x240', '320x240'),
|
||||
('640x480', '640x480'),
|
||||
('800x480', '800x480'),
|
||||
('800x600', '800x600'),
|
||||
('1024x576', '1024x576'),
|
||||
('1024x768', '1024x768'),
|
||||
('1280x720', '1280x720'),
|
||||
('1280x800', '1280x800'),
|
||||
('1280x960', '1280x960'),
|
||||
('1280x1024', '1280x1024'),
|
||||
('1296x972', '1296x972'),
|
||||
('1440x960', '1440x960'),
|
||||
('1440x1024', '1440x1024'),
|
||||
('1600x1200', '1600x1200'),
|
||||
('1640x922', '1640x922'),
|
||||
('1640x1232', '1640x1232'),
|
||||
('1920x1080', '1920x1080')
|
||||
]
|
||||
|
||||
ROTATION_CHOICES = [
|
||||
('0', '0°'),
|
||||
('90', '90°'),
|
||||
@ -311,6 +332,8 @@ def _get_raspimjpeg_settings(camera_id):
|
||||
'imxfx': 'none',
|
||||
'width': 640,
|
||||
'height': 480,
|
||||
'rtspWidth': 640,
|
||||
'rtspHeight': 480,
|
||||
'rotation': 0,
|
||||
'vflip': False,
|
||||
'hflip': False,
|
||||
@ -372,6 +395,7 @@ def _get_raspimjpeg_settings(camera_id):
|
||||
s['sharpness'] = (s['sharpness'] + 100) / 2
|
||||
|
||||
s['resolution'] = '%sx%s' % (s.pop('width'), s.pop('height'))
|
||||
s['rtspResolution'] = '%sx%s' % (s.pop('rtspWidth'), s.pop('rtspHeight'))
|
||||
|
||||
s = dict(('se' + n[0].upper() + n[1:], v) for (n, v) in s.items())
|
||||
|
||||
@ -383,6 +407,8 @@ def _set_raspimjpeg_settings(camera_id, s):
|
||||
|
||||
s['width'] = int(s['resolution'].split('x')[0])
|
||||
s['height'] = int(s.pop('resolution').split('x')[1])
|
||||
s['rtspWidth'] = int(s['rtspResolution'].split('x')[0])
|
||||
s['rtspHeight'] = int(s.pop('rtspResolution').split('x')[1])
|
||||
|
||||
s['zoom'] = '%.2f,%.2f,%.2f,%.2f' % (
|
||||
s.pop('zoomx') / 100.0, s.pop('zoomy') / 100.0,
|
||||
@ -705,13 +731,33 @@ def seResolution():
|
||||
return None
|
||||
|
||||
return {
|
||||
'label': 'Video Resolution',
|
||||
'label': 'MJPEG Video Resolution',
|
||||
'description': 'the video resolution (larger values produce better quality but require more CPU power, larger storage space and bandwidth)',
|
||||
'type': 'choices',
|
||||
'choices': RESOLUTION_CHOICES,
|
||||
'section': 'device',
|
||||
'camera': True,
|
||||
'required': True,
|
||||
'depends': ['seProto==mjpeg'],
|
||||
'get': _get_raspimjpeg_settings,
|
||||
'set': _set_raspimjpeg_settings,
|
||||
'get_set_dict': True
|
||||
}
|
||||
|
||||
@additional_config
|
||||
def seRtspResolution():
|
||||
if not _get_streameye_enabled():
|
||||
return None
|
||||
|
||||
return {
|
||||
'label': 'RTSP Video Resolution',
|
||||
'description': 'the video resolution (larger values produce better quality but require more CPU power, larger storage space and bandwidth)',
|
||||
'type': 'choices',
|
||||
'choices': RTSP_RESOLUTION_CHOICES,
|
||||
'section': 'device',
|
||||
'camera': True,
|
||||
'required': True,
|
||||
'depends': ['seProto==rtsp'],
|
||||
'get': _get_raspimjpeg_settings,
|
||||
'set': _set_raspimjpeg_settings,
|
||||
'get_set_dict': True
|
||||
|
||||
@ -114,7 +114,7 @@ function start() {
|
||||
fi
|
||||
modprobe v4l2loopback video_nr=${vidid}
|
||||
if [ -e "${video_path}" ]; then
|
||||
valid_opts=("analoggain" "awb" "awbgains" "bitrate" "brightness" "colfx" "contrast" "denoise" "digitalgain" "drc" "ev" "exposure" "flicker" "framerate" "height" "hflip" "imxfx" "intra" "irefresh" "level" "metering" "profile" "roi" "rotation" "saturation" "sharpness" "shutter" "vflip" "vstab" "width" "mjpegbitrate" "mjpegframerate" "mjpegwidth" "mjpegheight")
|
||||
valid_opts=("analoggain" "awb" "awbgains" "bitrate" "brightness" "colfx" "contrast" "denoise" "digitalgain" "drc" "ev" "exposure" "flicker" "framerate" "hflip" "imxfx" "intra" "irefresh" "level" "metering" "profile" "roi" "rotation" "saturation" "sharpness" "shutter" "vflip" "vstab" "mjpegbitrate" "mjpegframerate" "mjpegwidth" "mjpegheight")
|
||||
raspimjpeg_opts="--videoout ${video_path}"
|
||||
while read line; do
|
||||
key=$(echo ${line} | cut -d ' ' -f 1)
|
||||
@ -130,6 +130,14 @@ function start() {
|
||||
raspimjpeg_opts="${raspimjpeg_opts} --${line}"
|
||||
done < ${RASPIMJPEG_CONF}
|
||||
|
||||
video_height=$(grep -e ^rtspHeight ${RASPIMJPEG_CONF} | cut -d ' ' -f 2)
|
||||
if [ -n "${video_height}" ]; then
|
||||
raspimjpeg_opts="${raspimjpeg_opts} --height ${video_height}"
|
||||
fi
|
||||
video_width=$(grep -e ^rtspWidth ${RASPIMJPEG_CONF} | cut -d ' ' -f 2)
|
||||
if [ -n "${video_width}" ]; then
|
||||
raspimjpeg_opts="${raspimjpeg_opts} --width ${video_width}"
|
||||
fi
|
||||
video_iso=$(grep -e ^iso ${RASPIMJPEG_CONF} | cut -d ' ' -f 2)
|
||||
if [ -n "${video_iso}" ]; then
|
||||
raspimjpeg_opts="${raspimjpeg_opts} --ISO ${video_iso}"
|
||||
|
||||
@ -124,6 +124,27 @@ RESOLUTION_CHOICES = [
|
||||
('3280x2464', '3280x2464')
|
||||
]
|
||||
|
||||
RTSP_RESOLUTION_CHOICES = [
|
||||
('320x200', '320x200'),
|
||||
('320x240', '320x240'),
|
||||
('640x480', '640x480'),
|
||||
('800x480', '800x480'),
|
||||
('800x600', '800x600'),
|
||||
('1024x576', '1024x576'),
|
||||
('1024x768', '1024x768'),
|
||||
('1280x720', '1280x720'),
|
||||
('1280x800', '1280x800'),
|
||||
('1280x960', '1280x960'),
|
||||
('1280x1024', '1280x1024'),
|
||||
('1296x972', '1296x972'),
|
||||
('1440x960', '1440x960'),
|
||||
('1440x1024', '1440x1024'),
|
||||
('1600x1200', '1600x1200'),
|
||||
('1640x922', '1640x922'),
|
||||
('1640x1232', '1640x1232'),
|
||||
('1920x1080', '1920x1080')
|
||||
]
|
||||
|
||||
ROTATION_CHOICES = [
|
||||
('0', '0°'),
|
||||
('90', '90°'),
|
||||
@ -311,6 +332,8 @@ def _get_raspimjpeg_settings(camera_id):
|
||||
'imxfx': 'none',
|
||||
'width': 640,
|
||||
'height': 480,
|
||||
'rtspWidth': 640,
|
||||
'rtspHeight': 480,
|
||||
'rotation': 0,
|
||||
'vflip': False,
|
||||
'hflip': False,
|
||||
@ -372,6 +395,7 @@ def _get_raspimjpeg_settings(camera_id):
|
||||
s['sharpness'] = (s['sharpness'] + 100) / 2
|
||||
|
||||
s['resolution'] = '%sx%s' % (s.pop('width'), s.pop('height'))
|
||||
s['rtspResolution'] = '%sx%s' % (s.pop('rtspWidth'), s.pop('rtspHeight'))
|
||||
|
||||
s = dict(('se' + n[0].upper() + n[1:], v) for (n, v) in s.items())
|
||||
|
||||
@ -383,6 +407,8 @@ def _set_raspimjpeg_settings(camera_id, s):
|
||||
|
||||
s['width'] = int(s['resolution'].split('x')[0])
|
||||
s['height'] = int(s.pop('resolution').split('x')[1])
|
||||
s['rtspWidth'] = int(s['rtspResolution'].split('x')[0])
|
||||
s['rtspHeight'] = int(s.pop('rtspResolution').split('x')[1])
|
||||
|
||||
s['zoom'] = '%.2f,%.2f,%.2f,%.2f' % (
|
||||
s.pop('zoomx') / 100.0, s.pop('zoomy') / 100.0,
|
||||
@ -705,13 +731,33 @@ def seResolution():
|
||||
return None
|
||||
|
||||
return {
|
||||
'label': 'Video Resolution',
|
||||
'label': 'MJPEG Video Resolution',
|
||||
'description': 'the video resolution (larger values produce better quality but require more CPU power, larger storage space and bandwidth)',
|
||||
'type': 'choices',
|
||||
'choices': RESOLUTION_CHOICES,
|
||||
'section': 'device',
|
||||
'camera': True,
|
||||
'required': True,
|
||||
'depends': ['seProto==mjpeg'],
|
||||
'get': _get_raspimjpeg_settings,
|
||||
'set': _set_raspimjpeg_settings,
|
||||
'get_set_dict': True
|
||||
}
|
||||
|
||||
@additional_config
|
||||
def seRtspResolution():
|
||||
if not _get_streameye_enabled():
|
||||
return None
|
||||
|
||||
return {
|
||||
'label': 'RTSP Video Resolution',
|
||||
'description': 'the video resolution (larger values produce better quality but require more CPU power, larger storage space and bandwidth)',
|
||||
'type': 'choices',
|
||||
'choices': RTSP_RESOLUTION_CHOICES,
|
||||
'section': 'device',
|
||||
'camera': True,
|
||||
'required': True,
|
||||
'depends': ['seProto==rtsp'],
|
||||
'get': _get_raspimjpeg_settings,
|
||||
'set': _set_raspimjpeg_settings,
|
||||
'get_set_dict': True
|
||||
|
||||
@ -114,7 +114,7 @@ function start() {
|
||||
fi
|
||||
modprobe v4l2loopback video_nr=${vidid}
|
||||
if [ -e "${video_path}" ]; then
|
||||
valid_opts=("analoggain" "awb" "awbgains" "bitrate" "brightness" "colfx" "contrast" "denoise" "digitalgain" "drc" "ev" "exposure" "flicker" "framerate" "height" "hflip" "imxfx" "intra" "irefresh" "level" "metering" "profile" "roi" "rotation" "saturation" "sharpness" "shutter" "vflip" "vstab" "width" "mjpegbitrate" "mjpegframerate" "mjpegwidth" "mjpegheight")
|
||||
valid_opts=("analoggain" "awb" "awbgains" "bitrate" "brightness" "colfx" "contrast" "denoise" "digitalgain" "drc" "ev" "exposure" "flicker" "framerate" "hflip" "imxfx" "intra" "irefresh" "level" "metering" "profile" "roi" "rotation" "saturation" "sharpness" "shutter" "vflip" "vstab" "mjpegbitrate" "mjpegframerate" "mjpegwidth" "mjpegheight")
|
||||
raspimjpeg_opts="--videoout ${video_path}"
|
||||
while read line; do
|
||||
key=$(echo ${line} | cut -d ' ' -f 1)
|
||||
@ -130,6 +130,14 @@ function start() {
|
||||
raspimjpeg_opts="${raspimjpeg_opts} --${line}"
|
||||
done < ${RASPIMJPEG_CONF}
|
||||
|
||||
video_height=$(grep -e ^rtspHeight ${RASPIMJPEG_CONF} | cut -d ' ' -f 2)
|
||||
if [ -n "${video_height}" ]; then
|
||||
raspimjpeg_opts="${raspimjpeg_opts} --height ${video_height}"
|
||||
fi
|
||||
video_width=$(grep -e ^rtspWidth ${RASPIMJPEG_CONF} | cut -d ' ' -f 2)
|
||||
if [ -n "${video_width}" ]; then
|
||||
raspimjpeg_opts="${raspimjpeg_opts} --width ${video_width}"
|
||||
fi
|
||||
video_iso=$(grep -e ^iso ${RASPIMJPEG_CONF} | cut -d ' ' -f 2)
|
||||
if [ -n "${video_iso}" ]; then
|
||||
raspimjpeg_opts="${raspimjpeg_opts} --ISO ${video_iso}"
|
||||
|
||||
@ -124,6 +124,27 @@ RESOLUTION_CHOICES = [
|
||||
('3280x2464', '3280x2464')
|
||||
]
|
||||
|
||||
RTSP_RESOLUTION_CHOICES = [
|
||||
('320x200', '320x200'),
|
||||
('320x240', '320x240'),
|
||||
('640x480', '640x480'),
|
||||
('800x480', '800x480'),
|
||||
('800x600', '800x600'),
|
||||
('1024x576', '1024x576'),
|
||||
('1024x768', '1024x768'),
|
||||
('1280x720', '1280x720'),
|
||||
('1280x800', '1280x800'),
|
||||
('1280x960', '1280x960'),
|
||||
('1280x1024', '1280x1024'),
|
||||
('1296x972', '1296x972'),
|
||||
('1440x960', '1440x960'),
|
||||
('1440x1024', '1440x1024'),
|
||||
('1600x1200', '1600x1200'),
|
||||
('1640x922', '1640x922'),
|
||||
('1640x1232', '1640x1232'),
|
||||
('1920x1080', '1920x1080')
|
||||
]
|
||||
|
||||
ROTATION_CHOICES = [
|
||||
('0', '0°'),
|
||||
('90', '90°'),
|
||||
@ -311,6 +332,8 @@ def _get_raspimjpeg_settings(camera_id):
|
||||
'imxfx': 'none',
|
||||
'width': 640,
|
||||
'height': 480,
|
||||
'rtspWidth': 640,
|
||||
'rtspHeight': 480,
|
||||
'rotation': 0,
|
||||
'vflip': False,
|
||||
'hflip': False,
|
||||
@ -372,6 +395,7 @@ def _get_raspimjpeg_settings(camera_id):
|
||||
s['sharpness'] = (s['sharpness'] + 100) / 2
|
||||
|
||||
s['resolution'] = '%sx%s' % (s.pop('width'), s.pop('height'))
|
||||
s['rtspResolution'] = '%sx%s' % (s.pop('rtspWidth'), s.pop('rtspHeight'))
|
||||
|
||||
s = dict(('se' + n[0].upper() + n[1:], v) for (n, v) in s.items())
|
||||
|
||||
@ -383,6 +407,8 @@ def _set_raspimjpeg_settings(camera_id, s):
|
||||
|
||||
s['width'] = int(s['resolution'].split('x')[0])
|
||||
s['height'] = int(s.pop('resolution').split('x')[1])
|
||||
s['rtspWidth'] = int(s['rtspResolution'].split('x')[0])
|
||||
s['rtspHeight'] = int(s.pop('rtspResolution').split('x')[1])
|
||||
|
||||
s['zoom'] = '%.2f,%.2f,%.2f,%.2f' % (
|
||||
s.pop('zoomx') / 100.0, s.pop('zoomy') / 100.0,
|
||||
@ -705,13 +731,33 @@ def seResolution():
|
||||
return None
|
||||
|
||||
return {
|
||||
'label': 'Video Resolution',
|
||||
'label': 'MJPEG Video Resolution',
|
||||
'description': 'the video resolution (larger values produce better quality but require more CPU power, larger storage space and bandwidth)',
|
||||
'type': 'choices',
|
||||
'choices': RESOLUTION_CHOICES,
|
||||
'section': 'device',
|
||||
'camera': True,
|
||||
'required': True,
|
||||
'depends': ['seProto==mjpeg'],
|
||||
'get': _get_raspimjpeg_settings,
|
||||
'set': _set_raspimjpeg_settings,
|
||||
'get_set_dict': True
|
||||
}
|
||||
|
||||
@additional_config
|
||||
def seRtspResolution():
|
||||
if not _get_streameye_enabled():
|
||||
return None
|
||||
|
||||
return {
|
||||
'label': 'RTSP Video Resolution',
|
||||
'description': 'the video resolution (larger values produce better quality but require more CPU power, larger storage space and bandwidth)',
|
||||
'type': 'choices',
|
||||
'choices': RTSP_RESOLUTION_CHOICES,
|
||||
'section': 'device',
|
||||
'camera': True,
|
||||
'required': True,
|
||||
'depends': ['seProto==rtsp'],
|
||||
'get': _get_raspimjpeg_settings,
|
||||
'set': _set_raspimjpeg_settings,
|
||||
'get_set_dict': True
|
||||
|
||||
@ -114,7 +114,7 @@ function start() {
|
||||
fi
|
||||
modprobe v4l2loopback video_nr=${vidid}
|
||||
if [ -e "${video_path}" ]; then
|
||||
valid_opts=("analoggain" "awb" "awbgains" "bitrate" "brightness" "colfx" "contrast" "denoise" "digitalgain" "drc" "ev" "exposure" "flicker" "framerate" "height" "hflip" "imxfx" "intra" "irefresh" "level" "metering" "profile" "roi" "rotation" "saturation" "sharpness" "shutter" "vflip" "vstab" "width" "mjpegbitrate" "mjpegframerate" "mjpegwidth" "mjpegheight")
|
||||
valid_opts=("analoggain" "awb" "awbgains" "bitrate" "brightness" "colfx" "contrast" "denoise" "digitalgain" "drc" "ev" "exposure" "flicker" "framerate" "hflip" "imxfx" "intra" "irefresh" "level" "metering" "profile" "roi" "rotation" "saturation" "sharpness" "shutter" "vflip" "vstab" "mjpegbitrate" "mjpegframerate" "mjpegwidth" "mjpegheight")
|
||||
raspimjpeg_opts="--videoout ${video_path}"
|
||||
while read line; do
|
||||
key=$(echo ${line} | cut -d ' ' -f 1)
|
||||
@ -130,6 +130,14 @@ function start() {
|
||||
raspimjpeg_opts="${raspimjpeg_opts} --${line}"
|
||||
done < ${RASPIMJPEG_CONF}
|
||||
|
||||
video_height=$(grep -e ^rtspHeight ${RASPIMJPEG_CONF} | cut -d ' ' -f 2)
|
||||
if [ -n "${video_height}" ]; then
|
||||
raspimjpeg_opts="${raspimjpeg_opts} --height ${video_height}"
|
||||
fi
|
||||
video_width=$(grep -e ^rtspWidth ${RASPIMJPEG_CONF} | cut -d ' ' -f 2)
|
||||
if [ -n "${video_width}" ]; then
|
||||
raspimjpeg_opts="${raspimjpeg_opts} --width ${video_width}"
|
||||
fi
|
||||
video_iso=$(grep -e ^iso ${RASPIMJPEG_CONF} | cut -d ' ' -f 2)
|
||||
if [ -n "${video_iso}" ]; then
|
||||
raspimjpeg_opts="${raspimjpeg_opts} --ISO ${video_iso}"
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# locally computed hash
|
||||
sha256 2074b935bdfe28f84c2c3233274b06908336778f303bb13530d4299c3f8aa4e2 motion-release-4.1.1.tar.gz
|
||||
sha256 c8d40976b41da8eb9f9f7128599403a312fc26b7226bf3787d75f78cb5a6cc6e motion-release-4.2.2.tar.gz
|
||||
sha256 dba1d32c9a777f4e822d26ded25f24072b7234c70dc9850f8ea61564c0a8eca5 motion-5c8ac5282b3e980270555c1d2c6f710829a2856e.tar.gz
|
||||
sha256 3cd3492701f8a097ac9f594e4235417c10e0a5f92d591cd2a8f3f86efca4c64c motion-8f18946261ebee45a33ce423c9154b0f94997b51.tar.gz
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
MOTION_VERSION = 5c8ac5282b3e980270555c1d2c6f710829a2856e
|
||||
MOTION_VERSION = 8f18946261ebee45a33ce423c9154b0f94997b51
|
||||
MOTION_SITE = $(call github,Motion-Project,motion,$(MOTION_VERSION))
|
||||
MOTION_AUTORECONF = YES
|
||||
MOTION_DEPENDENCIES = host-pkgconf ffmpeg jpeg libmicrohttpd
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user