From c7421644087fc5d0344b925f2c2748d71aa257c0 Mon Sep 17 00:00:00 2001 From: livecam Date: Fri, 14 Aug 2020 13:37:50 +0200 Subject: [PATCH 1/4] Hinweis angepasst --- terminal1/start.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/terminal1/start.sh b/terminal1/start.sh index 4c4b5fd..2f5d774 100755 --- a/terminal1/start.sh +++ b/terminal1/start.sh @@ -23,7 +23,7 @@ export DISPLAY=:0 GSTPID=$! while true; do - # rename window (FIXME: possible race condition with window for cam 2) + # rename window (FIXME: using different players is a nasty hack) GSTXID="$(wmctrl -l | grep "OpenGL renderer" | cut -d" " -f1)" >/dev/null 2>&1 wmctrl -i -r "$GSTXID" -e 0,2000,0,1000,1000 >/dev/null 2>&1 wmctrl -i -r "$GSTXID" -b add,fullscreen >/dev/null 2>&1 @@ -68,7 +68,7 @@ PIDS="$PIDS $!" GSTPID=$! while true; do - # rename window (FIXME: possible race condition with window for cam 2) + # rename window (FIXME: using different players is a nasty hack) GSTXID="$(wmctrl -l | grep "gst-launch-1.0" | cut -d" " -f1)" >/dev/null 2>&1 wmctrl -i -r "$GSTXID" -e 0,0,0,1000,1000 >/dev/null 2>&1 wmctrl -i -r "$GSTXID" -b add,fullscreen >/dev/null 2>&1 From b2b3bc4ffb853dc3e98846225e8f73d3a10835cd Mon Sep 17 00:00:00 2001 From: Florian Schlegel Date: Fri, 14 Aug 2020 14:11:52 +0200 Subject: [PATCH 2/4] Doku erneuert --- README.md | 55 ++++++++++++++++++++++++++++++++++++++++---- readme_neu.txt | 62 -------------------------------------------------- 2 files changed, 50 insertions(+), 67 deletions(-) delete mode 100644 readme_neu.txt diff --git a/README.md b/README.md index 372acd7..d87b97f 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,54 @@ # LiveCam -live cam stuff +Kamera-Steaming-Setup auf Basis von ZOTAC ZBOX PRO PI335 pico. -# scan for AP -iwlist ath0 scanning +## Vorbereitung (debian 10) -# get Wifi status every Second -ssh ubnt@192.168.1.19 -C 'while true; do iwconfig ath0; sleep 1; done;' +`apt install htop git vim lshw sudo screen tmux` + +/etc/vim/vimrc.local erstellen +`autocmd BufEnter * set mouse=` + +/etc/apt/sources.list alle Zeilen erweitern auf +`… main contrib non-free` + +/etc/default/grub in Zeile `GRUB_CMDLINE_LINUX_DEFAULT=` einfügen: +`rootflags=data=journal` + +grub updaten +`update-grub2` + +Pakete nachinstallieren +``` +apt update +apt install firmware-linux firmware-iwlwifi firmware-realtek wpasupplicant wireless-tools iw gstreamer1.0-tools gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly gstreamer1.0-libav gstreamer1.0-alsa alsa-utils v4l-utils +``` + +in /etc/network/interfaces +``` +# Chaosnetz +allow-hotplug wlo2 +iface wlo2 inet dhcp + wpa-ssid LiveCam + wpa-psk xxxxxxx + up iw dev wlo2 set power_save off + +iface wlo2 inet6 static + address fd63:bb49:f2eb:1337::c1/64 +``` + +/etc/hosts ergänzen +``` +fd63:bb49:f2eb:1337::c1 cam1 +fd63:bb49:f2eb:1337::c2 cam2 +fd63:bb49:f2eb:1337::a1 terminal1 +fd63:bb49:f2eb:1337::a2 terminal2 +``` + +``` +useradd -m livecam -s /bin/bash -G video,audio,sudo +passwd livecam # set the usual password +su -l livecam + +reboot && exit +``` diff --git a/readme_neu.txt b/readme_neu.txt deleted file mode 100644 index c8ef00d..0000000 --- a/readme_neu.txt +++ /dev/null @@ -1,62 +0,0 @@ -neues Setup auf Basis von ZOTAC ZBOX PRO PI335 pico - -debian 10 vorbereiten ---------------------- -apt install htop git vim lshw sudo screen tmux - -# /etc/vim/vimrc.local erstellen -autocmd BufEnter * set mouse= - -# /etc/apt/sources.list alle Zeilen erweitern auf -... main contrib non-free - -# /etc/default/grub -# in Zeile GRUB_CMDLINE_LINUX_DEFAULT= einfügen: -rootflags=data=journal - -# grub updaten -update-grub2 - -# Pakete nachinstallieren -apt update -apt install firmware-linux firmware-iwlwifi firmware-realtek wpasupplicant wireless-tools iw gstreamer1.0-tools gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly gstreamer1.0-libav gstreamer1.0-alsa alsa-utils v4l-utils - -# vi /etc/network/interfaces -# Chaosnetz -allow-hotplug wlo2 -iface wlo2 inet dhcp - wpa-ssid LiveCam - wpa-psk xxxxxxx - up iw dev wlo2 set power_save off - -iface wlo2 inet6 static - address fd63:bb49:f2eb:1337::c1/64 - -# /etc/hosts ergänzen -fd63:bb49:f2eb:1337::c1 cam1 -fd63:bb49:f2eb:1337::c2 cam2 -fd63:bb49:f2eb:1337::a1 terminal1 -fd63:bb49:f2eb:1337::a2 terminal2 - -useradd -m livecam -s /bin/bash -G video,audio,sudo -passwd livecam # set the usual password -su -l livecam - -reboot && exit - -Videostream bereitstellen -------------------------- -v4l2-ctl -d /dev/video0 --set-ctrl=power_line_frequency=1 --set-ctrl=backlight_compensation=1 --stream-lossless --set-fmt-video=width=1920,height=1080,pixelformat=YUYV -gst-launch-1.0 -e rtpbin name=b rtp-profile=avpf uvch264src device=/dev/video0 name=src auto-start=true \ -src.vidsrc ! video/x-raw,framerate=30/1,profile=high ! videoscale ! video/x-raw,width=1920,height=1080 ! videoconvert ! x264enc tune=zerolatency bitrate=5000 speed-preset=superfast key-int-max=15 ! rtph264pay ! rtpulpfecenc percentage=50 percentage-important=75 ! rtprtxqueue max-size-packets=1000 ! b.send_rtp_sink_0 \ -b.send_rtp_src_0 ! udpsink host=terminal1 port=5001 \ -udpsrc address=:: port=5002 ! b.recv_rtcp_sink_0 \ -b.send_rtcp_src_0 ! udpsink host=terminal1 port=5003 sync=false async=false - -Videostream empfangen ---------------------- -gst-launch-1.0 -e rtpbin name=b rtp-profile=avpf do-retransmission=true \ -udpsrc address=:: port=5001 caps="application/x-rtp, media=(string)video, clock-rate=(int)90000, encoding-name=(string)H264, payload=(int)96" ! b.recv_rtp_sink_0 b. ! rtpulpfecdec ! rtph264depay ! decodebin ! videoconvert ! fbdevsink device=/dev/fb0 \ -udpsrc address=:: port=5003 ! b.recv_rtcp_sink_0 \ -b.send_rtcp_src_0 ! udpsink host=cam1 port=5002 sync=false async=false - From 8a38e65e9b2d0d2e8f2cd2d5b1121bbeb23fc00d Mon Sep 17 00:00:00 2001 From: Florian Schlegel Date: Fri, 14 Aug 2020 14:17:45 +0200 Subject: [PATCH 3/4] Formatierung verbessert --- README.md | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index d87b97f..66ecc8a 100644 --- a/README.md +++ b/README.md @@ -6,25 +6,29 @@ Kamera-Steaming-Setup auf Basis von ZOTAC ZBOX PRO PI335 pico. `apt install htop git vim lshw sudo screen tmux` -/etc/vim/vimrc.local erstellen +* /etc/vim/vimrc.local erstellen: + `autocmd BufEnter * set mouse=` -/etc/apt/sources.list alle Zeilen erweitern auf +* /etc/apt/sources.list alle Zeilen erweitern auf: + `… main contrib non-free` -/etc/default/grub in Zeile `GRUB_CMDLINE_LINUX_DEFAULT=` einfügen: +* /etc/default/grub in Zeile `GRUB_CMDLINE_LINUX_DEFAULT=` einfügen: + `rootflags=data=journal` -grub updaten +* grub updaten: + `update-grub2` -Pakete nachinstallieren +* Pakete nachinstallieren: ``` apt update apt install firmware-linux firmware-iwlwifi firmware-realtek wpasupplicant wireless-tools iw gstreamer1.0-tools gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly gstreamer1.0-libav gstreamer1.0-alsa alsa-utils v4l-utils ``` -in /etc/network/interfaces +* in /etc/network/interfaces ``` # Chaosnetz allow-hotplug wlo2 @@ -37,7 +41,7 @@ iface wlo2 inet6 static address fd63:bb49:f2eb:1337::c1/64 ``` -/etc/hosts ergänzen +/etc/hosts ergänzen: ``` fd63:bb49:f2eb:1337::c1 cam1 fd63:bb49:f2eb:1337::c2 cam2 From aa22d44690dcd404a661f794f8abaa2f0ce3ebea Mon Sep 17 00:00:00 2001 From: Florian Schlegel Date: Fri, 14 Aug 2020 14:24:20 +0200 Subject: [PATCH 4/4] Anstrich vergessen --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 66ecc8a..24c064f 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ iface wlo2 inet6 static address fd63:bb49:f2eb:1337::c1/64 ``` -/etc/hosts ergänzen: +* /etc/hosts ergänzen: ``` fd63:bb49:f2eb:1337::c1 cam1 fd63:bb49:f2eb:1337::c2 cam2