jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-24 19:56:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

consolidate mjpeg defaults

Browse Source
This commit is contained in:
popoviciri 2019-10-07 06:59:23 +02:00
parent c27b8a9f51
commit 1cecd8f75d
8 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -416,7 +416,7 @@ def _get_streameye_settings(camera_id):
'seMJPEGWidth': 640, 'seMJPEGWidth': 640,
'seMJPEGHeight': 480, 'seMJPEGHeight': 480,
'seMJPEGFramerate': 5, 'seMJPEGFramerate': 5,
'seMJPEGBitrate': 1000000 'seMJPEGBitrate': 800000
} }
if os.path.exists(STREAMEYE_CONF): if os.path.exists(STREAMEYE_CONF):
@ -478,7 +478,7 @@ def _set_streameye_settings(camera_id, s):
s.setdefault('seMJPEGWidth', 640) s.setdefault('seMJPEGWidth', 640)
s.setdefault('seMJPEGHeight', 480) s.setdefault('seMJPEGHeight', 480)
s.setdefault('seMJPEGFramerate', 5) s.setdefault('seMJPEGFramerate', 5)
s.setdefault('seMJPEGBitrate', 2000000) s.setdefault('seMJPEGBitrate', 800000)
main_config = config.get_main() main_config = config.get_main()
username = main_config['@normal_username'] username = main_config['@normal_username']
@ -1283,9 +1283,9 @@ def seMJPEGBitrate():
return { return {
'label': 'MJPEG Bitrate', 'label': 'MJPEG Bitrate',
'description': 'the MJPEG Bitrate fed to the frontend and used for motion detection on remote machines when streaming RTSP; for motion detection, 2000000 works good', 'description': 'the MJPEG Bitrate fed to the frontend and used for motion detection on remote machines when streaming RTSP; for motion detection, 800000 works good',
'type': 'number', 'type': 'number',
'min': 1000000, 'min': 0,
'max': 25000000, 'max': 25000000,
'section': 'streaming', 'section': 'streaming',
'camera': True, 'camera': True,

4
board/raspberrypi/overlay/usr/bin/streameye.sh
View File

@ -61,8 +61,8 @@ function start() {
RTSP_PORT=${RTSP_PORT:-554} RTSP_PORT=${RTSP_PORT:-554}
MJPEG_WIDTH=${MJPEG_WIDTH:-640} MJPEG_WIDTH=${MJPEG_WIDTH:-640}
MJPEG_HEIGHT=${MJPEG_HEIGHT:-480} MJPEG_HEIGHT=${MJPEG_HEIGHT:-480}
MJPEG_FRAMERATE=${MJPEG_FRAMERATE:-2} MJPEG_FRAMERATE=${MJPEG_FRAMERATE:-5}
MJPEG_BITRATE=${MJPEG_BITRATE:-2000000} MJPEG_BITRATE=${MJPEG_BITRATE:-800000}
audio_path="" audio_path=""
audio_opts="" audio_opts=""

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

@ -416,7 +416,7 @@ def _get_streameye_settings(camera_id):
'seMJPEGWidth': 640, 'seMJPEGWidth': 640,
'seMJPEGHeight': 480, 'seMJPEGHeight': 480,
'seMJPEGFramerate': 5, 'seMJPEGFramerate': 5,
'seMJPEGBitrate': 1000000 'seMJPEGBitrate': 800000
} }
if os.path.exists(STREAMEYE_CONF): if os.path.exists(STREAMEYE_CONF):
@ -478,7 +478,7 @@ def _set_streameye_settings(camera_id, s):
s.setdefault('seMJPEGWidth', 640) s.setdefault('seMJPEGWidth', 640)
s.setdefault('seMJPEGHeight', 480) s.setdefault('seMJPEGHeight', 480)
s.setdefault('seMJPEGFramerate', 5) s.setdefault('seMJPEGFramerate', 5)
s.setdefault('seMJPEGBitrate', 2000000) s.setdefault('seMJPEGBitrate', 800000)
main_config = config.get_main() main_config = config.get_main()
username = main_config['@normal_username'] username = main_config['@normal_username']
@ -1283,9 +1283,9 @@ def seMJPEGBitrate():
return { return {
'label': 'MJPEG Bitrate', 'label': 'MJPEG Bitrate',
'description': 'the MJPEG Bitrate fed to the frontend and used for motion detection on remote machines when streaming RTSP; for motion detection, 2000000 works good', 'description': 'the MJPEG Bitrate fed to the frontend and used for motion detection on remote machines when streaming RTSP; for motion detection, 800000 works good',
'type': 'number', 'type': 'number',
'min': 1000000, 'min': 0,
'max': 25000000, 'max': 25000000,
'section': 'streaming', 'section': 'streaming',
'camera': True, 'camera': True,

4
board/raspberrypi2/overlay/usr/bin/streameye.sh
View File

@ -61,8 +61,8 @@ function start() {
RTSP_PORT=${RTSP_PORT:-554} RTSP_PORT=${RTSP_PORT:-554}
MJPEG_WIDTH=${MJPEG_WIDTH:-640} MJPEG_WIDTH=${MJPEG_WIDTH:-640}
MJPEG_HEIGHT=${MJPEG_HEIGHT:-480} MJPEG_HEIGHT=${MJPEG_HEIGHT:-480}
MJPEG_FRAMERATE=${MJPEG_FRAMERATE:-2} MJPEG_FRAMERATE=${MJPEG_FRAMERATE:-5}
MJPEG_BITRATE=${MJPEG_BITRATE:-2000000} MJPEG_BITRATE=${MJPEG_BITRATE:-800000}
audio_path="" audio_path=""
audio_opts="" audio_opts=""

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

@ -416,7 +416,7 @@ def _get_streameye_settings(camera_id):
'seMJPEGWidth': 640, 'seMJPEGWidth': 640,
'seMJPEGHeight': 480, 'seMJPEGHeight': 480,
'seMJPEGFramerate': 5, 'seMJPEGFramerate': 5,
'seMJPEGBitrate': 1000000 'seMJPEGBitrate': 800000
} }
if os.path.exists(STREAMEYE_CONF): if os.path.exists(STREAMEYE_CONF):
@ -478,7 +478,7 @@ def _set_streameye_settings(camera_id, s):
s.setdefault('seMJPEGWidth', 640) s.setdefault('seMJPEGWidth', 640)
s.setdefault('seMJPEGHeight', 480) s.setdefault('seMJPEGHeight', 480)
s.setdefault('seMJPEGFramerate', 5) s.setdefault('seMJPEGFramerate', 5)
s.setdefault('seMJPEGBitrate', 2000000) s.setdefault('seMJPEGBitrate', 800000)
main_config = config.get_main() main_config = config.get_main()
username = main_config['@normal_username'] username = main_config['@normal_username']
@ -1283,9 +1283,9 @@ def seMJPEGBitrate():
return { return {
'label': 'MJPEG Bitrate', 'label': 'MJPEG Bitrate',
'description': 'the MJPEG Bitrate fed to the frontend and used for motion detection on remote machines when streaming RTSP; for motion detection, 2000000 works good', 'description': 'the MJPEG Bitrate fed to the frontend and used for motion detection on remote machines when streaming RTSP; for motion detection, 800000 works good',
'type': 'number', 'type': 'number',
'min': 1000000, 'min': 0,
'max': 25000000, 'max': 25000000,
'section': 'streaming', 'section': 'streaming',
'camera': True, 'camera': True,

4
board/raspberrypi3/overlay/usr/bin/streameye.sh
View File

@ -61,8 +61,8 @@ function start() {
RTSP_PORT=${RTSP_PORT:-554} RTSP_PORT=${RTSP_PORT:-554}
MJPEG_WIDTH=${MJPEG_WIDTH:-640} MJPEG_WIDTH=${MJPEG_WIDTH:-640}
MJPEG_HEIGHT=${MJPEG_HEIGHT:-480} MJPEG_HEIGHT=${MJPEG_HEIGHT:-480}
MJPEG_FRAMERATE=${MJPEG_FRAMERATE:-2} MJPEG_FRAMERATE=${MJPEG_FRAMERATE:-5}
MJPEG_BITRATE=${MJPEG_BITRATE:-2000000} MJPEG_BITRATE=${MJPEG_BITRATE:-800000}
audio_path="" audio_path=""
audio_opts="" audio_opts=""

8
board/raspberrypi4/motioneye-modules/streameyectl.py
View File

@ -416,7 +416,7 @@ def _get_streameye_settings(camera_id):
'seMJPEGWidth': 640, 'seMJPEGWidth': 640,
'seMJPEGHeight': 480, 'seMJPEGHeight': 480,
'seMJPEGFramerate': 5, 'seMJPEGFramerate': 5,
'seMJPEGBitrate': 1000000 'seMJPEGBitrate': 800000
} }
if os.path.exists(STREAMEYE_CONF): if os.path.exists(STREAMEYE_CONF):
@ -478,7 +478,7 @@ def _set_streameye_settings(camera_id, s):
s.setdefault('seMJPEGWidth', 640) s.setdefault('seMJPEGWidth', 640)
s.setdefault('seMJPEGHeight', 480) s.setdefault('seMJPEGHeight', 480)
s.setdefault('seMJPEGFramerate', 5) s.setdefault('seMJPEGFramerate', 5)
s.setdefault('seMJPEGBitrate', 2000000) s.setdefault('seMJPEGBitrate', 800000)
main_config = config.get_main() main_config = config.get_main()
username = main_config['@normal_username'] username = main_config['@normal_username']
@ -1283,9 +1283,9 @@ def seMJPEGBitrate():
return { return {
'label': 'MJPEG Bitrate', 'label': 'MJPEG Bitrate',
'description': 'the MJPEG Bitrate fed to the frontend and used for motion detection on remote machines when streaming RTSP; for motion detection, 2000000 works good', 'description': 'the MJPEG Bitrate fed to the frontend and used for motion detection on remote machines when streaming RTSP; for motion detection, 800000 works good',
'type': 'number', 'type': 'number',
'min': 1000000, 'min': 0,
'max': 25000000, 'max': 25000000,
'section': 'streaming', 'section': 'streaming',
'camera': True, 'camera': True,

4
board/raspberrypi4/overlay/usr/bin/streameye.sh
View File

@ -61,8 +61,8 @@ function start() {
RTSP_PORT=${RTSP_PORT:-554} RTSP_PORT=${RTSP_PORT:-554}
MJPEG_WIDTH=${MJPEG_WIDTH:-640} MJPEG_WIDTH=${MJPEG_WIDTH:-640}
MJPEG_HEIGHT=${MJPEG_HEIGHT:-480} MJPEG_HEIGHT=${MJPEG_HEIGHT:-480}
MJPEG_FRAMERATE=${MJPEG_FRAMERATE:-2} MJPEG_FRAMERATE=${MJPEG_FRAMERATE:-5}
MJPEG_BITRATE=${MJPEG_BITRATE:-2000000} MJPEG_BITRATE=${MJPEG_BITRATE:-800000}
audio_path="" audio_path=""
audio_opts="" audio_opts=""