From 37c4108d146fd4649510fd3e3fcc3760caa8d4f7 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Mon, 29 Jan 2024 13:17:15 +0100 Subject: [PATCH] reorder, cleanup everything.. --- .../bin/py => bin/mastering}/create_thumbs.py | 0 .../bin/remux => bin/mastering/remux.sh | 0 .../py => bin/mastering}/remux_fix_media.py | 0 .../bin/py => bin/mastering}/transcode-pro.py | 0 .../py => bin/mastering}/transcode-vaapi.py | 0 .../bin/py => bin/mastering}/transcode.py | 0 .../py => bin/mastering}/transcode_nonv.py | 0 .../py => bin/mastering}/transcode_nv-pro.py | 0 .../bin/py => bin/mastering}/transcode_nv.py | 0 .../py => bin/mastering}/transcode_old.py.bak | 0 .../py => bin/mastering}/transcode_pro_old.py | 0 .../monitoring}/monitor_check.py | 0 .../bin => bin/publishing}/backup_nile.sh | 0 .../bin => bin/publishing}/seafile_sync.sh | 0 .../publishing}/telecaster_master-ae.sh | 0 .../telecaster_master-crfpa-mp4-staging.sh | 0 .../telecaster_master-crfpa-mp4.sh | 0 .../publishing}/telecaster_master-pro.sh | 0 bin/{app.sh => streaming/docker/jackd.sh} | 2 - .../loopback}/launch-pa-virtual-mic.sh | 0 .../streaming/loopback}/launch-url2video.sh | 0 .../loopback}/launch-v4l2loopback.sh | 0 .../streaming/old}/tc_audio_mp3_icecast.sh | 0 .../old/tc_video_simple_webm_stream-2.sh | 56 +++++++++++ ...c_video_simple_webm_stream-gst1-flip180.sh | 0 .../old}/tc_video_simple_webm_stream.sh | 0 .../streaming}/tc_audio_mp3_icecast-gst1.sh | 0 bin/streaming/tc_start.sh | 55 +++++++++++ .../tc_video_simple_webm_stream-gst1.sh | 0 .../telecaster => env}/.fluxbox/autostart.sh | 0 {src/home/telecaster => env}/.fluxbox/init | 0 .../startup.ubuntu => env/.fluxbox/startup | 26 +++-- {src/home/telecaster => env}/.vnc/xstartup | 0 etc/default/jackd | 9 -- etc/default/telecaster | 12 --- etc/nginx/sites-available/telecaster.conf | 2 +- etc/telecaster/telecaster.conf | 3 + .../media => media}/mp3/silence.mp3 | Bin .../media => media}/ogg/silence.ogg | Bin src/home/telecaster/.fluxbox/init.ubuntu | 4 - .../telecaster/.fluxbox/scripts/tc_jackd.sh | 8 -- .../.fluxbox/scripts/telecaster-restart-full | 9 -- src/home/telecaster/.fluxbox/startup | 89 ------------------ src/home/telecaster/bin/reverse_ssh_tunnel | 29 ------ .../scripts => tests}/tc_audio_jack_test.sh | 0 tests/tc_video_simple_webm_stream-gst1-va.sh | 44 +++++++++ 46 files changed, 171 insertions(+), 177 deletions(-) rename {src/home/telecaster/bin/py => bin/mastering}/create_thumbs.py (100%) mode change 100644 => 100755 rename src/home/telecaster/bin/remux => bin/mastering/remux.sh (100%) rename {src/home/telecaster/bin/py => bin/mastering}/remux_fix_media.py (100%) mode change 100644 => 100755 rename {src/home/telecaster/bin/py => bin/mastering}/transcode-pro.py (100%) mode change 100644 => 100755 rename {src/home/telecaster/bin/py => bin/mastering}/transcode-vaapi.py (100%) mode change 100644 => 100755 rename {src/home/telecaster/bin/py => bin/mastering}/transcode.py (100%) mode change 100644 => 100755 rename {src/home/telecaster/bin/py => bin/mastering}/transcode_nonv.py (100%) mode change 100644 => 100755 rename {src/home/telecaster/bin/py => bin/mastering}/transcode_nv-pro.py (100%) mode change 100644 => 100755 rename {src/home/telecaster/bin/py => bin/mastering}/transcode_nv.py (100%) mode change 100644 => 100755 rename {src/home/telecaster/bin/py => bin/mastering}/transcode_old.py.bak (100%) mode change 100644 => 100755 rename {src/home/telecaster/bin/py => bin/mastering}/transcode_pro_old.py (100%) mode change 100644 => 100755 rename {src/home/telecaster/.fluxbox/scripts => bin/monitoring}/monitor_check.py (100%) rename {src/home/telecaster/bin => bin/publishing}/backup_nile.sh (100%) rename {src/home/telecaster/bin => bin/publishing}/seafile_sync.sh (100%) rename {src/home/telecaster/bin => bin/publishing}/telecaster_master-ae.sh (100%) rename {src/home/telecaster/bin => bin/publishing}/telecaster_master-crfpa-mp4-staging.sh (100%) rename {src/home/telecaster/bin => bin/publishing}/telecaster_master-crfpa-mp4.sh (100%) rename {src/home/telecaster/bin => bin/publishing}/telecaster_master-pro.sh (100%) rename bin/{app.sh => streaming/docker/jackd.sh} (94%) rename {src/home/telecaster/.fluxbox/scripts => bin/streaming/loopback}/launch-pa-virtual-mic.sh (100%) rename {src/home/telecaster/.fluxbox/scripts => bin/streaming/loopback}/launch-url2video.sh (100%) rename {src/home/telecaster/.fluxbox/scripts => bin/streaming/loopback}/launch-v4l2loopback.sh (100%) rename {src/home/telecaster/.fluxbox/scripts => bin/streaming/old}/tc_audio_mp3_icecast.sh (100%) create mode 100755 bin/streaming/old/tc_video_simple_webm_stream-2.sh rename {src/home/telecaster/.fluxbox/scripts => bin/streaming/old}/tc_video_simple_webm_stream-gst1-flip180.sh (100%) rename {src/home/telecaster/.fluxbox/scripts => bin/streaming/old}/tc_video_simple_webm_stream.sh (100%) rename {src/home/telecaster/.fluxbox/scripts => bin/streaming}/tc_audio_mp3_icecast-gst1.sh (100%) create mode 100755 bin/streaming/tc_start.sh rename {src/home/telecaster/.fluxbox/scripts => bin/streaming}/tc_video_simple_webm_stream-gst1.sh (100%) rename {src/home/telecaster => env}/.fluxbox/autostart.sh (100%) rename {src/home/telecaster => env}/.fluxbox/init (100%) rename src/home/telecaster/.fluxbox/startup.ubuntu => env/.fluxbox/startup (57%) rename {src/home/telecaster => env}/.vnc/xstartup (100%) delete mode 100644 etc/default/jackd delete mode 100644 etc/default/telecaster rename {src/home/telecaster/media => media}/mp3/silence.mp3 (100%) rename {src/home/telecaster/media => media}/ogg/silence.ogg (100%) delete mode 100644 src/home/telecaster/.fluxbox/init.ubuntu delete mode 100755 src/home/telecaster/.fluxbox/scripts/tc_jackd.sh delete mode 100755 src/home/telecaster/.fluxbox/scripts/telecaster-restart-full delete mode 100644 src/home/telecaster/.fluxbox/startup delete mode 100755 src/home/telecaster/bin/reverse_ssh_tunnel rename {src/home/telecaster/.fluxbox/scripts => tests}/tc_audio_jack_test.sh (100%) create mode 100755 tests/tc_video_simple_webm_stream-gst1-va.sh diff --git a/src/home/telecaster/bin/py/create_thumbs.py b/bin/mastering/create_thumbs.py old mode 100644 new mode 100755 similarity index 100% rename from src/home/telecaster/bin/py/create_thumbs.py rename to bin/mastering/create_thumbs.py diff --git a/src/home/telecaster/bin/remux b/bin/mastering/remux.sh similarity index 100% rename from src/home/telecaster/bin/remux rename to bin/mastering/remux.sh diff --git a/src/home/telecaster/bin/py/remux_fix_media.py b/bin/mastering/remux_fix_media.py old mode 100644 new mode 100755 similarity index 100% rename from src/home/telecaster/bin/py/remux_fix_media.py rename to bin/mastering/remux_fix_media.py diff --git a/src/home/telecaster/bin/py/transcode-pro.py b/bin/mastering/transcode-pro.py old mode 100644 new mode 100755 similarity index 100% rename from src/home/telecaster/bin/py/transcode-pro.py rename to bin/mastering/transcode-pro.py diff --git a/src/home/telecaster/bin/py/transcode-vaapi.py b/bin/mastering/transcode-vaapi.py old mode 100644 new mode 100755 similarity index 100% rename from src/home/telecaster/bin/py/transcode-vaapi.py rename to bin/mastering/transcode-vaapi.py diff --git a/src/home/telecaster/bin/py/transcode.py b/bin/mastering/transcode.py old mode 100644 new mode 100755 similarity index 100% rename from src/home/telecaster/bin/py/transcode.py rename to bin/mastering/transcode.py diff --git a/src/home/telecaster/bin/py/transcode_nonv.py b/bin/mastering/transcode_nonv.py old mode 100644 new mode 100755 similarity index 100% rename from src/home/telecaster/bin/py/transcode_nonv.py rename to bin/mastering/transcode_nonv.py diff --git a/src/home/telecaster/bin/py/transcode_nv-pro.py b/bin/mastering/transcode_nv-pro.py old mode 100644 new mode 100755 similarity index 100% rename from src/home/telecaster/bin/py/transcode_nv-pro.py rename to bin/mastering/transcode_nv-pro.py diff --git a/src/home/telecaster/bin/py/transcode_nv.py b/bin/mastering/transcode_nv.py old mode 100644 new mode 100755 similarity index 100% rename from src/home/telecaster/bin/py/transcode_nv.py rename to bin/mastering/transcode_nv.py diff --git a/src/home/telecaster/bin/py/transcode_old.py.bak b/bin/mastering/transcode_old.py.bak old mode 100644 new mode 100755 similarity index 100% rename from src/home/telecaster/bin/py/transcode_old.py.bak rename to bin/mastering/transcode_old.py.bak diff --git a/src/home/telecaster/bin/py/transcode_pro_old.py b/bin/mastering/transcode_pro_old.py old mode 100644 new mode 100755 similarity index 100% rename from src/home/telecaster/bin/py/transcode_pro_old.py rename to bin/mastering/transcode_pro_old.py diff --git a/src/home/telecaster/.fluxbox/scripts/monitor_check.py b/bin/monitoring/monitor_check.py similarity index 100% rename from src/home/telecaster/.fluxbox/scripts/monitor_check.py rename to bin/monitoring/monitor_check.py diff --git a/src/home/telecaster/bin/backup_nile.sh b/bin/publishing/backup_nile.sh similarity index 100% rename from src/home/telecaster/bin/backup_nile.sh rename to bin/publishing/backup_nile.sh diff --git a/src/home/telecaster/bin/seafile_sync.sh b/bin/publishing/seafile_sync.sh similarity index 100% rename from src/home/telecaster/bin/seafile_sync.sh rename to bin/publishing/seafile_sync.sh diff --git a/src/home/telecaster/bin/telecaster_master-ae.sh b/bin/publishing/telecaster_master-ae.sh similarity index 100% rename from src/home/telecaster/bin/telecaster_master-ae.sh rename to bin/publishing/telecaster_master-ae.sh diff --git a/src/home/telecaster/bin/telecaster_master-crfpa-mp4-staging.sh b/bin/publishing/telecaster_master-crfpa-mp4-staging.sh similarity index 100% rename from src/home/telecaster/bin/telecaster_master-crfpa-mp4-staging.sh rename to bin/publishing/telecaster_master-crfpa-mp4-staging.sh diff --git a/src/home/telecaster/bin/telecaster_master-crfpa-mp4.sh b/bin/publishing/telecaster_master-crfpa-mp4.sh similarity index 100% rename from src/home/telecaster/bin/telecaster_master-crfpa-mp4.sh rename to bin/publishing/telecaster_master-crfpa-mp4.sh diff --git a/src/home/telecaster/bin/telecaster_master-pro.sh b/bin/publishing/telecaster_master-pro.sh similarity index 100% rename from src/home/telecaster/bin/telecaster_master-pro.sh rename to bin/publishing/telecaster_master-pro.sh diff --git a/bin/app.sh b/bin/streaming/docker/jackd.sh similarity index 94% rename from bin/app.sh rename to bin/streaming/docker/jackd.sh index 79c2fde..38c80b8 100755 --- a/bin/app.sh +++ b/bin/streaming/docker/jackd.sh @@ -5,5 +5,3 @@ export `dbus-launch | grep ADDRESS` export `dbus-launch | grep PID` jackd -R -P70 -dalsa -dhw:0 -r44100 -p1024 -n2 & -sleep 5 - diff --git a/src/home/telecaster/.fluxbox/scripts/launch-pa-virtual-mic.sh b/bin/streaming/loopback/launch-pa-virtual-mic.sh similarity index 100% rename from src/home/telecaster/.fluxbox/scripts/launch-pa-virtual-mic.sh rename to bin/streaming/loopback/launch-pa-virtual-mic.sh diff --git a/src/home/telecaster/.fluxbox/scripts/launch-url2video.sh b/bin/streaming/loopback/launch-url2video.sh similarity index 100% rename from src/home/telecaster/.fluxbox/scripts/launch-url2video.sh rename to bin/streaming/loopback/launch-url2video.sh diff --git a/src/home/telecaster/.fluxbox/scripts/launch-v4l2loopback.sh b/bin/streaming/loopback/launch-v4l2loopback.sh similarity index 100% rename from src/home/telecaster/.fluxbox/scripts/launch-v4l2loopback.sh rename to bin/streaming/loopback/launch-v4l2loopback.sh diff --git a/src/home/telecaster/.fluxbox/scripts/tc_audio_mp3_icecast.sh b/bin/streaming/old/tc_audio_mp3_icecast.sh similarity index 100% rename from src/home/telecaster/.fluxbox/scripts/tc_audio_mp3_icecast.sh rename to bin/streaming/old/tc_audio_mp3_icecast.sh diff --git a/bin/streaming/old/tc_video_simple_webm_stream-2.sh b/bin/streaming/old/tc_video_simple_webm_stream-2.sh new file mode 100755 index 0000000..dd46d8a --- /dev/null +++ b/bin/streaming/old/tc_video_simple_webm_stream-2.sh @@ -0,0 +1,56 @@ +#!/bin/bash + +# Start TeleCaster video channel + +#WIDTH=640 +#HEIGHT=360 +WIDTH=864 +HEIGHT=480 +#WIDTH=1280 +#HEIGHT=720 + +# v4l2-ctl -d 0 -c power_line_frequency=1 +# v4l2-ctl -d 0 -c zoom_absolute=100 +# v4l2-ctl -d 0 -c focus_auto=0 +# v4l2-ctl -d 0 -c focus_absolute=1 + +# # ! queue ! videoflip method=rotate-180 \ + +# gst-launch v4l2src device=/dev/video0 ! video/x-raw-rgb, width=$WIDTH, height=$HEIGHT, framerate={30/1} \ +# ! queue ! ffmpegcolorspace \ +# ! queue ! vp8enc speed=2 threads=4 quality=10.0 max-latency=25 max-keyframe-distance=30 auto-alt-ref-frames=true ! queue ! muxout. \ +# jackaudiosrc connect=2 ! audio/x-raw-float, channels=2 \ +# ! queue ! audioconvert ! queue ! vorbisenc quality=0.4 ! queue ! muxout. \ +# webmmux streamable=true name=muxout \ +# ! queue ! tcpserversink host=127.0.0.1 port=9000 protocol=none blocksize=65536 sync-method=1 \ +# > /dev/null + + +gst-launch-1.0 \ + v4l2src device=/dev/video0 \ + ! queue \ + ! videoconvert \ + ! queue \ + ! vp8enc threads=4 deadline=2 \ + ! queue \ + ! mux. \ + jackaudiosrc connect=2 \ + ! audio/x-raw, channels=2 \ + ! queue \ + ! volume volume=3.0 \ + ! queue \ + ! audiocheblimit mode=low-pass cutoff=16000 poles=4 \ + ! queue \ + ! audiocheblimit mode=high-pass cutoff=80 poles=4 \ + ! queue \ + ! audiodynamic characteristics=hard-knee mode=compressor threshold=0.1 ratio=12.0 \ + ! queue \ + ! volume volume=2.5 \ + ! queue \ + ! audioconvert \ + ! queue \ + ! vorbisenc quality=0.4 \ + ! queue \ + ! mux. \ + webmmux name=mux streamable=true \ + ! shout2send ip=localhost port=8000 password=source2parisson mount=monitor.webm diff --git a/src/home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream-gst1-flip180.sh b/bin/streaming/old/tc_video_simple_webm_stream-gst1-flip180.sh similarity index 100% rename from src/home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream-gst1-flip180.sh rename to bin/streaming/old/tc_video_simple_webm_stream-gst1-flip180.sh diff --git a/src/home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream.sh b/bin/streaming/old/tc_video_simple_webm_stream.sh similarity index 100% rename from src/home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream.sh rename to bin/streaming/old/tc_video_simple_webm_stream.sh diff --git a/src/home/telecaster/.fluxbox/scripts/tc_audio_mp3_icecast-gst1.sh b/bin/streaming/tc_audio_mp3_icecast-gst1.sh similarity index 100% rename from src/home/telecaster/.fluxbox/scripts/tc_audio_mp3_icecast-gst1.sh rename to bin/streaming/tc_audio_mp3_icecast-gst1.sh diff --git a/bin/streaming/tc_start.sh b/bin/streaming/tc_start.sh new file mode 100755 index 0000000..ac12ded --- /dev/null +++ b/bin/streaming/tc_start.sh @@ -0,0 +1,55 @@ +set -e + +source /etc/telecaster/telecaster.conf + +# jackd + +jackd $JACK_OPTIONS & + +sleep 2 + +# telecaster + +konsole & + +qjackctl & + +sleep 1 + +./tc_audio_mp3_icecast-gst1.sh & + +sleep 1 + +./tc_video_simple_webm_stream-gst1.sh & + +sleep 1 + +# JACK ports setup + +# STEREO setup +# 1: L +# 2: R + +#jack_disconnect system:capture_1 gst-launch-1.0:in_jackaudiosrc0_1 +#jack_disconnect system:capture_2 gst-launch-1.0:in_jackaudiosrc0_2 + +#jack_disconnect system:capture_1 gst-launch-1.0-01:in_jackaudiosrc0_1 +#jack_disconnect system:capture_2 gst-launch-1.0-01:in_jackaudiosrc0_2 + +#jack_connect system:capture_1 gst-launch-1.0:in_jackaudiosrc0_1 +#jack_connect system:capture_2 gst-launch-1.0:in_jackaudiosrc0_2 + +# ADDITIONAL mics +# 3: C + +# jack_connect system:capture_3 gst-launch-1.0:in_jackaudiosrc0_1 +# jack_connect system:capture_3 gst-launch-1.0:in_jackaudiosrc0_2 + +# jack_connect system:capture_3 gst-launch-1.0-01:in_jackaudiosrc0_1 +# jack_connect system:capture_3 gst-launch-1.0-01:in_jackaudiosrc0_2 + +#Audio monitor +deefuzzer DEEFUZZER_AUDIO_CONF & + +#Video monitor +deefuzzer $DEEFUZZER_VIDEO_CONF & \ No newline at end of file diff --git a/src/home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream-gst1.sh b/bin/streaming/tc_video_simple_webm_stream-gst1.sh similarity index 100% rename from src/home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream-gst1.sh rename to bin/streaming/tc_video_simple_webm_stream-gst1.sh diff --git a/src/home/telecaster/.fluxbox/autostart.sh b/env/.fluxbox/autostart.sh similarity index 100% rename from src/home/telecaster/.fluxbox/autostart.sh rename to env/.fluxbox/autostart.sh diff --git a/src/home/telecaster/.fluxbox/init b/env/.fluxbox/init similarity index 100% rename from src/home/telecaster/.fluxbox/init rename to env/.fluxbox/init diff --git a/src/home/telecaster/.fluxbox/startup.ubuntu b/env/.fluxbox/startup similarity index 57% rename from src/home/telecaster/.fluxbox/startup.ubuntu rename to env/.fluxbox/startup index af2145a..a42557b 100644 --- a/src/home/telecaster/.fluxbox/startup.ubuntu +++ b/env/.fluxbox/startup @@ -14,22 +14,20 @@ xmodmap "/home/telecaster/.Xmodmap" # wmnd & # wmsmixer -w & # idesk & +# +# Debian-local change: +# - fbautostart has been added with a quick hack to check to see if it +# exists. If it does, we'll start it up by default. +which fbautostart > /dev/null +if [ $? -eq 0 ]; then + fbautostart +fi + +/srv/telecaster/telecaster-server/bin/streaming/tc_start.sh # And last but not least we start fluxbox. # Because it is the last app you have to run it with ''exec'' before it. -fluxbox & +exec fluxbox # or if you want to keep a log: -# exec fluxbox -log "/home/telecaster/.fluxbox/log" - -fbpid=$! - -sleep 1 - -{ - -sh ~/.fluxbox/autostart.sh - -} & - -wait $fbpid +# exec fluxbox -log "$$FLUXBOX_DIR/log" diff --git a/src/home/telecaster/.vnc/xstartup b/env/.vnc/xstartup similarity index 100% rename from src/home/telecaster/.vnc/xstartup rename to env/.vnc/xstartup diff --git a/etc/default/jackd b/etc/default/jackd deleted file mode 100644 index 1d05842..0000000 --- a/etc/default/jackd +++ /dev/null @@ -1,9 +0,0 @@ -# Set to "yes" to start jackd at boot -START_DAEMON=yes - -# The jackd process will run under this user -USER=telecaster - -# Options to pass to jackd -OPTIONS="-dalsa -r48000 -p1024 -n3 -Chw:3 -Phw:3" - diff --git a/etc/default/telecaster b/etc/default/telecaster deleted file mode 100644 index 1309100..0000000 --- a/etc/default/telecaster +++ /dev/null @@ -1,12 +0,0 @@ -# Set to "yes" to start vncserver at boot -START_DAEMON=yes - -# The vncserver process will run under this user -USER=telecaster - -# The vncserver port (i.e. 2 for 5902) -PORT="2" - -# Options to pass to vncserver -OPTIONS="-geometry 1024x768 -depth 8" - diff --git a/etc/nginx/sites-available/telecaster.conf b/etc/nginx/sites-available/telecaster.conf index d0e107d..e8592ed 100644 --- a/etc/nginx/sites-available/telecaster.conf +++ b/etc/nginx/sites-available/telecaster.conf @@ -8,7 +8,7 @@ server { # the port your site will be served on listen 80; # the domain name it will serve for - server_name telecasting.parisson.com; # substitute your machine's IP address or FQDN + server_name _; # substitute your machine's IP address or FQDN charset utf-8; # max upload size diff --git a/etc/telecaster/telecaster.conf b/etc/telecaster/telecaster.conf index 911a572..90044b2 100755 --- a/etc/telecaster/telecaster.conf +++ b/etc/telecaster/telecaster.conf @@ -33,3 +33,6 @@ AUDIO_MP3_QUALITY=4.0 AUDIO_GAIN=12.0 JACK_OPTIONS="-dalsa -r48000 -p1024 -n3 -Chw:3 -Phw:3" + +DEEFUZZER_AUDIO_CONF="/etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml" +DEEFUZZER_VIDEO_CONF="/etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml" diff --git a/src/home/telecaster/media/mp3/silence.mp3 b/media/mp3/silence.mp3 similarity index 100% rename from src/home/telecaster/media/mp3/silence.mp3 rename to media/mp3/silence.mp3 diff --git a/src/home/telecaster/media/ogg/silence.ogg b/media/ogg/silence.ogg similarity index 100% rename from src/home/telecaster/media/ogg/silence.ogg rename to media/ogg/silence.ogg diff --git a/src/home/telecaster/.fluxbox/init.ubuntu b/src/home/telecaster/.fluxbox/init.ubuntu deleted file mode 100644 index 86638e4..0000000 --- a/src/home/telecaster/.fluxbox/init.ubuntu +++ /dev/null @@ -1,4 +0,0 @@ -session.menuFile: ~/.fluxbox/menu -session.keyFile: ~/.fluxbox/keys -session.configVersion: 11 - diff --git a/src/home/telecaster/.fluxbox/scripts/tc_jackd.sh b/src/home/telecaster/.fluxbox/scripts/tc_jackd.sh deleted file mode 100755 index 5718236..0000000 --- a/src/home/telecaster/.fluxbox/scripts/tc_jackd.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -set -e - -source /etc/telecaster/telecaster.conf - -jackd $JACK_OPTIONS - diff --git a/src/home/telecaster/.fluxbox/scripts/telecaster-restart-full b/src/home/telecaster/.fluxbox/scripts/telecaster-restart-full deleted file mode 100755 index 8e71444..0000000 --- a/src/home/telecaster/.fluxbox/scripts/telecaster-restart-full +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -sudo /etc/init.d/telecaster stop -sudo /etc/init.d/jackd stop - -sleep 3 - -sudo /etc/init.d/jackd start -sudo /etc/init.d/telecaster start diff --git a/src/home/telecaster/.fluxbox/startup b/src/home/telecaster/.fluxbox/startup deleted file mode 100644 index 9ac6941..0000000 --- a/src/home/telecaster/.fluxbox/startup +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/sh -# -# fluxbox startup-script: -# -# Lines starting with a '#' are ignored. - -# Change your keymap: -xmodmap "/home/telecaster/.Xmodmap" - -# Applications you want to run with fluxbox. -# MAKE SURE THAT APPS THAT KEEP RUNNING HAVE AN ''&'' AT THE END. -# -# unclutter -idle 2 & -# wmnd & -# wmsmixer -w & -# idesk & -# -# Debian-local change: -# - fbautostart has been added with a quick hack to check to see if it -# exists. If it does, we'll start it up by default. -which fbautostart > /dev/null -if [ $? -eq 0 ]; then - fbautostart -fi - -FLUXBOX_DIR=/home/telecaster/.fluxbox - -# jackd - -$FLUXBOX_DIR/scripts/tc_jackd.sh & - -sleep 2 - -# telecaster - -konsole & - -qjackctl & - -sleep 1 - -$FLUXBOX_DIR/scripts/tc_audio_mp3_icecast-gst1.sh & - -sleep 1 - -$FLUXBOX_DIR/scripts/tc_video_simple_webm_stream-gst1.sh & - -sleep 1 - -# STEREO setup -# 1: L -# 2: R - -#jack_disconnect system:capture_1 gst-launch-1.0:in_jackaudiosrc0_1 -#jack_disconnect system:capture_2 gst-launch-1.0:in_jackaudiosrc0_2 - -#jack_disconnect system:capture_1 gst-launch-1.0-01:in_jackaudiosrc0_1 -#jack_disconnect system:capture_2 gst-launch-1.0-01:in_jackaudiosrc0_2 - -#jack_connect system:capture_1 gst-launch-1.0:in_jackaudiosrc0_1 -#jack_connect system:capture_2 gst-launch-1.0:in_jackaudiosrc0_2 - -# ADDITIONAL mics -# 3: C - -# jack_connect system:capture_3 gst-launch-1.0:in_jackaudiosrc0_1 -# jack_connect system:capture_3 gst-launch-1.0:in_jackaudiosrc0_2 - -# jack_connect system:capture_3 gst-launch-1.0-01:in_jackaudiosrc0_1 -# jack_connect system:capture_3 gst-launch-1.0-01:in_jackaudiosrc0_2 - -# Additional local bash scripts -if [ -f $FLUXBOX_DIR/startup.local ]; then - sh $FLUXBOX_DIR/startup.local -fi - -#Audio monitor -deefuzzer /etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml & - -#Video monitor -deefuzzer /etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml & - - -# And last but not least we start fluxbox. -# Because it is the last app you have to run it with ''exec'' before it. - -exec fluxbox -# or if you want to keep a log: -# exec fluxbox -log "$$FLUXBOX_DIR/log" diff --git a/src/home/telecaster/bin/reverse_ssh_tunnel b/src/home/telecaster/bin/reverse_ssh_tunnel deleted file mode 100755 index cd81fe6..0000000 --- a/src/home/telecaster/bin/reverse_ssh_tunnel +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# ------------------------------ -# autossh reverse tunnel on boot -# ------------------------------ -# See autossh and google for reverse ssh tunnels to see how this works - -# When this script runs it will allow you to ssh into this machine even if it is behind a firewall or has a NAT'd IP address. -# From any ssh capable machine you just type ssh -p $PORT_MIDDLEMAN_WILL_LISTEN_ON localusername@middleman - -# This is the username on your local server who has public key authentication setup at the middleman -USER_TO_SSH_IN_AS=telecaster - -# This is the username and hostname/IP address for the middleman (internet accessible server) -MIDDLEMAN_SERVER_AND_USERNAME=telecaster@jimi.parisson.com - -# The following two numbers can be whatever you want, but need to be unique if you have multiple reverse ssh tunnels -# Port that the middleman will listen on (use this value as the -p argument when sshing) -PORT_MIDDLEMAN_WILL_LISTEN_ON=22012 - -# Connection monitoring port, don't need to know this one -AUTOSSH_PORT=27012 - -# Ensures that autossh keeps trying to connect -AUTOSSH_GATETIME=0 - -export AUTOSSH_PORT AUTOSSH_GATETIME - -su -c "autossh -f -N -R *:${PORT_MIDDLEMAN_WILL_LISTEN_ON}:localhost:22 ${MIDDLEMAN_SERVER_AND_USERNAME} -oLogLevel=error -oUserKnownHostsFile=/dev/null -oStrictHostKeyChecking=no" $USER_TO_SSH_IN_AS - diff --git a/src/home/telecaster/.fluxbox/scripts/tc_audio_jack_test.sh b/tests/tc_audio_jack_test.sh similarity index 100% rename from src/home/telecaster/.fluxbox/scripts/tc_audio_jack_test.sh rename to tests/tc_audio_jack_test.sh diff --git a/tests/tc_video_simple_webm_stream-gst1-va.sh b/tests/tc_video_simple_webm_stream-gst1-va.sh new file mode 100755 index 0000000..709c685 --- /dev/null +++ b/tests/tc_video_simple_webm_stream-gst1-va.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +set -e + +# Default TeleCaster video parameters + +# v4l2 +V4L2_ID=0 +V4L2_ZOOM=140 +V4L2_SHARPNESS=128 + +# C920 +#VIDEO_WIDTH=864 +#VIDEO_HEIGHT=480 +#VIDEO_FRAMERATE=24 + +# C922 +VIDEO_WIDTH=1920 +VIDEO_HEIGHT=1080 +VIDEO_FRAMERATE=30 +VIDEO_FLIP=none + +# Audio +AUDIO_CHANNELS=2 +AUDIO_OPUS_BITRATE=96000 +AUDIO_GAIN_PRE=2.5 +AUDIO_GAIN_POST=1.5 + +# source /etc/telecaster/telecaster.conf + +# V4L2 setup +# 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=$V4L2_SHARPNESS + +# GST launch +gst-launch-1.0 v4l2src device=/dev/video$V4L2_ID \ + ! videoconvert \ + ! vaapih264enc \ + ! h264parse \ + ! mp4mux \ + ! filesink location=/tmp/test.mp4 -- 2.39.5