Merge branch 'master' of https://github.com/F-WuTS/compLIB

build_deb.sh

@@ -27,7 +27,8 @@ fpm -s python --python-bin python3 --python-pip pip3 --python-package-name-prefi
     -d "opencv-main" \
     -d "opencv-python" \
     -d "opencv-scripts" \
-    -v 0.0.3-3 -t deb setup.py
+    -d "libatlas-base-dev" \
+    -v 0.0.3-4 -t deb setup.py
 
 #    --deb-changelog changelog \
 #    --deb-upstream-changelog changelog \

compLib/VisionDaemon.py

@@ -5,7 +5,7 @@ import LogstashLogging
 from LogstashLogging import logstash_logger
 import logging
 
-__run = """raspivid -t 0 -b 10000000 -w 1920 -h 1080 -fps 30 -n -o - | gst-launch-1.0 fdsrc ! video/x-h264,width=1280,height=720,framerate=30/1,noise-reduction=1,profile=high,stream-format=byte-stream  ! h264parse ! queue ! flvmux streamable=true ! rtmpsink location=\"rtmp://localhost/live/stream\""""
+__run = """raspivid -t 0 -b 5000000 -w 1280 -h 720 -fps 30 -n -o - | gst-launch-1.0 fdsrc ! video/x-h264,width=1280,height=720,framerate=30/1,noise-reduction=1,profile=high,stream-format=byte-stream  ! h264parse ! queue ! flvmux streamable=true ! rtmpsink location=\"rtmp://localhost/live/stream\""""
 
 
 if __name__ == '__main__':

postinstall.sh

@@ -11,6 +11,7 @@ install_package() {
 
 install_package "smbus"
 install_package "requests"
+install_package "flask"
 install_package "python-logstash-async"
 
 echo "Setting up opencv4"
@@ -19,20 +20,19 @@ pkg-config --modversion opencv4
 echo "Setting up nginx rtmp server"
 sudo /etc/init.d/nginx start
 
-sudo tee /etc/nginx/nginx.conf > /dev/null <<EOT
+{
-load_module "modules/ngx_rtmp_module.so";
+  echo 'load_module "modules/ngx_rtmp_module.so";'
-worker_processes auto;
+  echo 'worker_processes auto;'
-rtmp_auto_push on;
+  echo 'rtmp_auto_push on;'
-events {}
+  echo 'events {}'
-rtmp {
+  echo 'rtmp {'
-    server {
+  echo '    server {'
-        listen 1935;
+  echo '        listen 1935;'
-        listen [::]:1935 ipv6only=on;
+  echo '        listen [::]:1935 ipv6only=on;'
-
+  echo '        application live {'
-        application live {
+  echo '            live on;'
-            live on;
+  echo '            record off;'
-            record off;
+  echo '        }'
-        }
+  echo '    }'
-    }
+  echo '}'
-}
+} >> /etc/nginx/nginx.conf
-EOT