From afe04651916bc72c2edc76476267dc4dbcaf732c Mon Sep 17 00:00:00 2001 From: Joo Aun Saw Date: Mon, 28 Oct 2019 10:18:49 +1100 Subject: [PATCH] fnc rtsp: do not use mjpeg resolution config when in rtsp mode --- board/raspberrypi/overlay/usr/bin/streameye.sh | 2 +- board/raspberrypi2/overlay/usr/bin/streameye.sh | 2 +- board/raspberrypi3/overlay/usr/bin/streameye.sh | 2 +- board/raspberrypi4/overlay/usr/bin/streameye.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/raspberrypi/overlay/usr/bin/streameye.sh b/board/raspberrypi/overlay/usr/bin/streameye.sh index 9dc9992776..bc13ae2a45 100755 --- a/board/raspberrypi/overlay/usr/bin/streameye.sh +++ b/board/raspberrypi/overlay/usr/bin/streameye.sh @@ -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) diff --git a/board/raspberrypi2/overlay/usr/bin/streameye.sh b/board/raspberrypi2/overlay/usr/bin/streameye.sh index 9dc9992776..bc13ae2a45 100755 --- a/board/raspberrypi2/overlay/usr/bin/streameye.sh +++ b/board/raspberrypi2/overlay/usr/bin/streameye.sh @@ -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) diff --git a/board/raspberrypi3/overlay/usr/bin/streameye.sh b/board/raspberrypi3/overlay/usr/bin/streameye.sh index 9dc9992776..bc13ae2a45 100755 --- a/board/raspberrypi3/overlay/usr/bin/streameye.sh +++ b/board/raspberrypi3/overlay/usr/bin/streameye.sh @@ -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) diff --git a/board/raspberrypi4/overlay/usr/bin/streameye.sh b/board/raspberrypi4/overlay/usr/bin/streameye.sh index 9dc9992776..bc13ae2a45 100755 --- a/board/raspberrypi4/overlay/usr/bin/streameye.sh +++ b/board/raspberrypi4/overlay/usr/bin/streameye.sh @@ -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)