add a .env environment file with parameters, add more parameters

diff --git a/.gitignore b/.gitignore
index eec5c2106d3ce8cc51dd9dc6a249117e26f07ab3..c2f98e67b445193a5b9b9ad056de7f54384f3f96 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,4 @@
 build
 dist
 *.egg
-
+.env

diff --git a/src/home/telecaster/.fluxbox/scripts/.env.sample b/src/home/telecaster/.fluxbox/scripts/.env.sample
new file mode 100644 (file)
index 0000000..a61e427
--- /dev/null
+++ b/src/home/telecaster/.fluxbox/scripts/.env.sample
@@ -0,0 +1,17 @@
+# v4l2
+V4L2_ID=0
+V4L2_ZOOM=140
+
+# C920
+#VIDEO_WIDTH=864
+#VIDEO_HEIGHT=480
+#VIDEO_FRAMERATE=24
+
+# C922
+VIDEO_WIDTH=848
+VIDEO_HEIGHT=480
+VIDEO_FRAMERATE=24
+
+# Audio
+AUDIO_CHANNELS=2
+AUDIO_OPUS_BITRATE=96000

diff --git a/src/home/telecaster/.fluxbox/scripts/tc_audio_mp3_icecast-gst1.sh b/src/home/telecaster/.fluxbox/scripts/tc_audio_mp3_icecast-gst1.sh
index d77d5496b0ba19462dfd26a08955392956ee4fe6..f0515901bdf7756fea25768b574514817d251aa4 100755 (executable)
--- a/src/home/telecaster/.fluxbox/scripts/tc_audio_mp3_icecast-gst1.sh
+++ b/src/home/telecaster/.fluxbox/scripts/tc_audio_mp3_icecast-gst1.sh
@@ -2,6 +2,10 @@
 
 AUDIO_CHANNELS=2
 
+if [ -f .env ]; then
+       source .env
+fi
+
 gst-launch-1.0 jackaudiosrc connect=$AUDIO_CHANNELS ! audio/x-raw, format=F32LE, channels=$AUDIO_CHANNELS \
        ! queue ! audioconvert \
        ! queue ! rgvolume pre-amp=12.0 \

diff --git a/src/home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream-gst1.sh b/src/home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream-gst1.sh
index ad6b1f485c6304ce8ffa011e27e3cd47819c8dc1..2784ed9f2f5df45844052452a7543f3941914fe7 100755 (executable)
--- a/src/home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream-gst1.sh
+++ b/src/home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream-gst1.sh
@@ -1,32 +1,40 @@
-#!/bin/sh
+#:/usr/bin/env bash
 
-# Start TeleCaster video channel
+set -e
 
-VIDEO_ID=0
-AUDIO_CHANNELS=2
+# Default TeleCaster video parameters
+
+# v4l2
+V4L2_ID=0
+V4L2_ZOOM=140
 
 # C920
-#WIDTH=864
-#HEIGHT=480
+#VIDEO_WIDTH=864
+#VIDEO_HEIGHT=480
+#VIDEO_FRAMERATE=24
 
 # C922
-WIDTH=848
-HEIGHT=480
+VIDEO_WIDTH=848
+VIDEO_HEIGHT=480
+VIDEO_FRAMERATE=24
 
-#WIDTH=1280
-#HEIGHT=720
+# Audio
+AUDIO_CHANNELS=2
+AUDIO_OPUS_BITRATE=96000
 
-FRAMERATE=24
+if [ -f .env ]; then
+       source .env
+fi
 
-v4l2-ctl -d $VIDEO_ID -c power_line_frequency=1
-v4l2-ctl -d $VIDEO_ID -c zoom_absolute=140
-v4l2-ctl -d $VIDEO_ID -c focus_auto=0
-v4l2-ctl -d $VIDEO_ID -c focus_absolute=1
-v4l2-ctl -d $VIDEO_ID -c sharpness=128
+v4l2-ctl -d $V4L2_ID -c power_line_frequency=1
+v4l2-ctl -d $V4L2_ID -c zoom_absolute=$V4L2_ZOOM
+v4l2-ctl -d $V4L2_ID -c focus_auto=0
+v4l2-ctl -d $V4L2_ID -c focus_absolute=1
+v4l2-ctl -d $V4L2_ID -c sharpness=128
 
 # ! queue ! videoflip method=rotate-180 \
 
-gst-launch-1.0 v4l2src device=/dev/video$VIDEO_ID ! video/x-raw, format=YUY2, width=$WIDTH, height=$HEIGHT, framerate=$FRAMERATE/1  \
+gst-launch-1.0 v4l2src device=/dev/video$V4L2_ID ! video/x-raw, format=YUY2, width=$VIDEO_WIDTH, height=$VIDEO_HEIGHT, framerate=$VIDEO_FRAMERATE/1  \
        ! queue ! videoflip method=rotate-180 \
        ! queue ! videoconvert \
        ! queue ! vp8enc threads=4 deadline=2 \
@@ -38,7 +46,7 @@ gst-launch-1.0 v4l2src device=/dev/video$VIDEO_ID ! video/x-raw, format=YUY2, wi
         ! queue ! rgvolume pre-amp=12.0 \
        ! queue ! rglimiter \
        ! queue ! audioconvert \
-       ! queue ! opusenc bitrate=96000 \
+       ! queue ! opusenc bitrate=$AUDIO_OPUS_BITRATE \
        ! queue ! muxout. \
        webmmux streamable=true name=muxout \
        ! queue ! tcpserversink host=127.0.0.1 port=9000 blocksize=65536 sync-method=1 \