diff --git a/.dockerignore b/.dockerignore index 1097e68..74bde9e 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1 +1,3 @@ frontend +frontend-old +ui diff --git a/config/ini/videomixer.ini b/config/ini/videomixer.ini index ef808e0..7bb9299 100644 --- a/config/ini/videomixer.ini +++ b/config/ini/videomixer.ini @@ -33,11 +33,17 @@ system output buffers 60 # Set output control socket system socket /run/snowmix/mixer1 -image load 1 images/streaming_background.png +image load 1 /assets/images/base-background.png image name 1 Background HSWAW Logo Right -#image load 2 images/panel.png -#image name 2 Event panel +image load 2 /assets/images/overlay-dim.png +image name 2 Overlay (dim) + +image load 3 /assets/images/overlay.png +image name 3 Overlay (full) + +image load 4 /assets/images/panel.png +image name 4 Event panel # Commands to be executed at every frame interval # PreShow must end with a loop statement @@ -65,12 +71,12 @@ include slib/radar.slib include slib/texts.slib include slib/clocks2.slib -tcl eval FeedCreate "Feed #1" 1 1920 1080 /run/snowmix/feed1-control-pipe -tcl eval FeedCreate "Feed #2" 2 1920 1080 /run/snowmix/feed2-control-pipe +tcl eval FeedCreate "Camera" 1 1920 1080 /run/snowmix/feed1-control-pipe +tcl eval FeedCreate "Capture" 2 1920 1080 /run/snowmix/feed2-control-pipe tcl eval FeedCreate "Feed #3" 3 1920 1080 /run/snowmix/feed3-control-pipe -tcl eval FeedDeadImage 1 100 images/dead-stream.bgra -tcl eval FeedDeadImage 2 100 images/dead-stream.bgra -tcl eval FeedDeadImage 3 100 images/dead-stream.bgra +tcl eval FeedDeadImage 1 100 /assets/images/dead-stream.bgra +tcl eval FeedDeadImage 2 100 /assets/images/dead-stream.bgra +tcl eval FeedDeadImage 3 100 /assets/images/dead-stream.bgra #include ini/streaming-feeds #include ini/streaming-scenes @@ -81,11 +87,10 @@ tcl eval SceneSetBackground 0 1 # Scene 1 tcl eval SceneCreate "Fullscreen" 1 #tcl eval SceneAddFrame 1 1 0 0 1280 720 -tcl eval SceneAddFrame 1 2 940 20 320 180 +tcl eval SceneAddFrame 1 2 1410 20 480 270 tcl eval SceneSetFrameSource 1 1 feed 2 0 1 tcl eval SceneSetFrameSource 1 1 feed 1 1 1 tcl eval SceneSetFrameSource 1 2 feed 2 1 1 -tcl eval SceneAlpha 1 2 0.8 0.8 tcl eval SceneSetBackground 1 1 tcl eval SceneSetState 0 1 diff --git a/config/janus/janus.cfg b/config/janus/janus.cfg index a06000f..9c07265 100644 --- a/config/janus/janus.cfg +++ b/config/janus/janus.cfg @@ -76,8 +76,8 @@ cert_key = /opt/janus/share/janus/certs/mycert.key ; be used for gathering candidates, and enable or disable the ; internal libnice debugging, if needed. [nat] -stun_server = stun.voip.eutelia.it -stun_port = 3478 +;stun_server = stun.voip.eutelia.it +;stun_port = 3478 ;stun_server = stun.l.google.com ;stun_port = 19302 diff --git a/config/janus/janus.plugin.streaming.cfg b/config/janus/janus.plugin.streaming.cfg index 1220976..1493188 100644 --- a/config/janus/janus.plugin.streaming.cfg +++ b/config/janus/janus.plugin.streaming.cfg @@ -53,25 +53,7 @@ audiortpmap = opus/48000/2 videoport = 5004 videopt = 100 videortpmap = VP8/90000 -secret = adminpwd - -[file-live-sample] -type = live -id = 2 -description = a-law file source (radio broadcast) -filename = /opt/janus/share/janus/streams/radio.alaw ; See install.sh -audio = yes -video = no -secret = adminpwd - -[file-ondemand-sample] -type = ondemand -id = 3 -description = mu-law file source (music) -filename = /opt/janus/share/janus/streams/music.mulaw ; See install.sh -audio = yes -video = no -secret = adminpwd +; secret = adminpwd ; ; Firefox Nightly supports H.264 through Cisco's OpenH264 plugin. The only diff --git a/docker-compose.yml b/docker-compose.yml index 874e1d2..9b7c7d7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,6 +8,7 @@ services: #- /home/informatic/Projects/snowmix-tools-streamboxback/snowconfig:/config - sockets:/run/snowmix - ./config:/config:ro + - ./assets:/assets:ro ports: - 9999:9999 ipc: host @@ -45,7 +46,7 @@ services: build: frontend restart: unless-stopped ports: - - 8080:80 + - 80:80 extra_hosts: - "janus:172.17.0.1" diff --git a/tools/lenkengaudio2feed b/tools/lenkengaudio2feed index e6d73e6..939748a 100755 --- a/tools/lenkengaudio2feed +++ b/tools/lenkengaudio2feed @@ -77,6 +77,6 @@ VIDEOFORMAT=$VIDEOBGRA', width='$feed_width', height='$feed_height echo 'audio feed ctr isaudio '$feed_id /tools/de-ip-hdmi/de-ip-hdmi -output audio $moreargs $* | \ $gstlaunch -v fdsrc ! audio/x-raw,rate=48000,channels=2,format=S32BE ! \ - queue ! audioconvert ! audioresample ! \ + queue ! audioconvert ! audioresample ! audiorate ! \ $AUDIOFORMAT ! fdsink fd=3 sync=true 3>&1 1>&2 ) | nc -N $SNOWMIX_IP $SNOWMIX_PORT