X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=ffs;h=253b83b9ec41e1585139c94e78daa69f6faa5738;hb=refs%2Fheads%2Fmaster;hp=9efc9f0ebc75e454a076cd01bfa047200632b027;hpb=8de1e14e35d0ad62620a59f6e2ca4ba19ddcda3c;p=distro-setup

diff --git a/ffs b/ffs
index 9efc9f0..728b77d 100755
--- a/ffs
+++ b/ffs
@@ -143,12 +143,25 @@ fi
 
 ##### end command line parsing ########
 
-host=live.iankelling.org:443
-if ip n show 10.2.0.1 | grep . &>/dev/null && \
-    [[ $(dig +timeout=1 +short @10.2.0.1 -x 10.2.0.2 2>&1 ||:) == kd.b8.nz. ]]; then
+host=live.iankelling.org:8443
+live_host=$(dig +timeout=1 +short @iankelling.org live.iankelling.org)
+vps_host=$(dig +timeout=1 +short iankelling.org)
+if [[ $live_host != "$vps_host" ]] &&  ip n show 10.2.0.1 | grep . &>/dev/null && \
+     [[ $(dig +timeout=1 +short @10.2.0.1 -x 10.2.0.2 2>&1 ||:) == kd.b8.nz. ]]; then
   host=127.0.0.1:8000
+  if ! pgrep '^icecast2$' >/dev/null; then
+    sudo systemctl start icecast2
+  fi
+else
+  find_prefix="ssh live.iankelling.org"
 fi
 
+if $find_prefix find /var/icecast -type f | grep .; then
+  echo "warning: suggest clearing /var/icecast with icrmr or moving files. sleeping for 4 seconds"
+  sleep 4
+fi
+
+
 pass=$(sed -n 's/ *<source-password>\([^<]*\).*/\1/p' /p/c/icecast.xml)
 
 
@@ -176,11 +189,44 @@ else
   stream_res=$primary_res
 fi
 
-# for 1080p, default 256k is poor quality. 500 is ok. 1500 is a bit
-# better, so go with that.  Also, that is about 2x what is recommended
-# in https://livekit.io/webrtc/bitrate-guide (our framerate is lower).
+stream_x=${stream_res%x*}
+stream_y=${stream_res#*x}
+
+# leave out our i3 window borders
+stream_res=$(( stream_x - 4 ))x$(( stream_y - 4))
+
+
+# if hardware acceleration exists, use it to save power & cpu.
+if vainfo |& grep -i VAProfileVP9Profile &>/dev/null; then
+  # 1500 seems almost flawless
+  bitrate_1080=1500
+
+  encode_settings=(
+    -c:v vp9_vaapi
+    # these options increase compression based on random internet reference.
+    -bsf:v vp9_raw_reorder,vp9_superframe
+  )
+  # https://trac.ffmpeg.org/wiki/Hardware/VAAPI
+  global_extra_args=(
+    -vaapi_device /dev/dri/renderD128
+  )
+  extra_filter_arg=",format=nv12|vaapi,hwupload"
+else
+  # 1000 is a bit blury, 1500 is pretty clear, 2000 makes scrolling
+  # adjust much faster, 2500 has marginal improvement on that.
+  #
+  # note https://livekit.io/webrtc/bitrate-guide (our framerate is lower)
+  bitrate_1080=2000
+
+  encode_settings=(
+    -vcodec libvpx
+    -quality realtime
+    -error-resilient 1
+  )
+fi
+
+bitrate=$(( ( stream_x * stream_y ) / ( (1920*1080) / bitrate_1080 ) ))
 
-bitrate=$(( ( ${stream_res/x/*} ) / 1380 ))
 
 # 8 seems fine. be conservative by going a bit higher.
 framerate=10
@@ -202,6 +248,8 @@ opts=(
   -hide_banner
   -nostats
 
+  ${global_extra_args[@]}
+
   # tested for decreasing latency: did not help.
   # -probesize 32
   # tested for warning "Queue input is backward in time". did not help.
@@ -250,7 +298,7 @@ opts=(
   -filter_complex "[0]azmq,volume=precision=fixed: volume=$volume [vol0];
 [1]azmq='b=tcp\://127.0.0.1\:5556',volume=precision=fixed: volume=0 [vol1];
 [vol0][vol1] amerge=inputs=2;
-[2]zmq='b=tcp\://127.0.0.1\:5557',drawbox=color=0x262626,drawtext=fontsize=90: fontcolor=beige: x=40: y=40: text=''${delay_arg}[out]"
+[2]zmq='b=tcp\://127.0.0.1\:5557',drawbox=color=0x262626,drawtext=fontsize=90: fontcolor=beige: x=40: y=40: text=''${delay_arg}${extra_filter_arg}[out]"
 
   # An online source says to match a 5 second vid delay, we can do an
   # audio delay filter: "adelay=5000|5000". However, we already get
@@ -267,12 +315,10 @@ opts=(
   -map '[out]'
 
   # video output options
-  -vcodec libvpx
   -g $keyframe_interval
-  -quality realtime
+  ${encode_settings[@]}
   -b:v ${bitrate}k
-  -threads 2
-  -error-resilient 1
+
 
   ## audio output options
   -c:a libvorbis
@@ -296,7 +342,7 @@ if pkill -f ^ffmpeg.\*icecast://source.\*/fsf; then
   sleep 1
 fi
 
-#echo executing: ffmpeg ${opts[@]}
+echo executing: ffmpeg ${opts[@]}
 
 #{ sleep 1; ffp &>/dev/null & }
 
@@ -360,8 +406,6 @@ if $watch; then
   rm -f $HOME/.iank-stream-on
 fi
 
-
-
 ### begin background/development docs ###
 
 # zmq vs stdin commands:
@@ -447,4 +491,9 @@ fi
 # ./configure --enable-libzmq --enable-libpulse --enable-libvorbis --enable-gpl --enable-version3
 #
 
+# note: when playing back, text is going to look aliased unless you
+# watch it in a window that is exactly as bit or bigger than the
+# recording: tabbed i3 window shrinks things. or, use: mpv
+# --video-unscaled
+
 ### end background/development docs ###