Update 2021-01-21T18:33:10Z

1 files changed, 55 insertions, 20 deletions

diff --git a/bin/wfez b/bin/wfez
index 50f485d..eac1b55 100755
--- a/bin/wfez
+++ b/bin/wfez
@@ -2,37 +2,68 @@
 set -e
 [ -n "$DEBUG" ] && set -x
 
-if [ "$1" = "-h" ]; then
-	printf "usage: %s [FILE]\n" "$(basename "$0")"
-	printf "\n"
-	printf "Launches wf-recorder(1) with optimized settings.\n"
-	printf "If FILE is omitted, \$HOME/Videos/rec_TIMESTAMP.mkv is used.\n"
-	printf "Optionally environment vars can be used to tune things:\n"
-	printf "  WF_AOUT - defaults to default pulseaudio sink\n"
-	printf "  WF_AIN - defaults to default pulseaudio source\n"
-	printf "  WF_AMUX - override creation of an pulseaudio sink for muxing\n"
-	printf "  WF_VOUT - limit to output, defaults to focused output (swq current output)\n"
-	printf "  WF_KEYS - launches wshowkeys(1)\n"
-	exit 2
-fi
+# check requirements
+for tool in wf-recorder wshowkeys pactl swq; do
+	if ! command -v "$tool" >/dev/null; then
+		printf "%s: %s not installed but required\n" "$(basename "$0")" "$tool" >&2
+		exit 1
+	fi
+done
+
+
 
-output_file=${1:-"${HOME}/Videos/rec_$(now).mkv"}
 audio_output=${WF_AOUT}
 audio_input=${WF_AIN}
 video_output=${WF_VOUT}
 showkeys=${WF_KEYS}
 mux_sink=${WF_AMUX}
+no_mux=
+
+while getopts i:o:m:v:kMh opt; do
+	case "$opt" in
+	i)	# audio in
+		audio_input="${OPTARG}" ;;
+	o)	# audio out
+		audio_output="${OPTARG}" ;;
+	m)	# mux
+		mux_sink="${OPTARG}" ;;
+	v)	# output to record
+		video_output="${OPTARG}" ;;
+	k)	# showkeys
+		showkeys=1 ;;
+	M)	# no mux
+		no_mux=1 ;;
+	h|?)
+		printf "usage: %s [-iomvkM] [FILE]\n" "$(basename "$0")"
+		printf "\n"
+		printf " Launches wf-recorder(1) with optimized settings.\n"
+		printf " When FILE is omitted, \$HOME/Videos/rec_TIMESTAMP.mkv is used.\n"
+		printf "\n"
+		printf " -o \t\taudio output; defaults to default pulseaudio sink\n"
+		printf " -i \t\taudio input; defaults to default pulseaudio source, can be 'none'\n"
+		printf " -m \t\taudio mux sink; override creation of an pulseaudio sink for muxing\n"
+		printf " -v \t\toutput to record; limit to output, defaults to focused output (swq current output)\n"
+		printf " -k \t\tlaunches wshowkeys(1)\n"
+		printf " -M \t\tdon't create a audio mux sink\n"
+		printf "\n"
+		exit 2 ;;
+	esac
+done
+shift $((OPTIND - 1))
 
-[ -z "${audio_output}" ] && audio_output=$(pacmd dump | grep "set-default-sink" | cut -d' ' -f2)
-[ -z "${audio_input}" ] && audio_input=$(pacmd dump | grep "set-default-source" | cut -d' ' -f2)
+output_file=${1:-"${HOME}/Videos/rec_$(now).mkv"}
+
+# setup defaults
+[ -z "${audio_output}" ] && audio_output=$(pactl info | grep "Default Sink" | cut -d':' -f2 | xargs -L1)
+[ -z "${audio_input}" ] && audio_input=$(pactl info | grep "Default Source" | cut -d':' -f2 | xargs -L1)
 [ -z "${video_output}" ] && video_output=$(swq current output)
 
-if [ "${WF_AIN}" = "none" ] && [ -z "${WF_AMUX}" ]; then
+if [ "${audio_input}" = "none" ] && [ -z "${mux_sink}" ]; then
 	echo "mux: ${audio_output}"
 	mux_sink="${audio_output}"
 fi
 
-if [ -z "${mux_sink}" ]; then
+if [ -z "${mux_sink}" ] && [ -z "${no_mux}" ]; then
 	mux_sink=wf-mux
 	mux_sink_id=
 	output_loopback_id=
@@ -40,7 +71,7 @@ if [ -z "${mux_sink}" ]; then
 	prepare_mux_sink() {
 		mux_sink_id=$(pactl load-module module-null-sink sink_name="${mux_sink}" channels=2)
 		output_loopback_id=$(pactl load-module module-loopback sink="${mux_sink}" source="${audio_output}.monitor" remix=true)
-		input_loopback_id=$(pactl load-module module-loopback sink="${mux_sink}" source="${audio_input}" remix=true)
+		input_loopback_id=$(pactl load-module module-loopback sink="${mux_sink}" source="${audio_input}" channels=1 remix=true)
 	}
 	teardown_mux_sink() {
 		pactl unload-module "${mux_sink_id}"
@@ -52,6 +83,10 @@ if [ -z "${mux_sink}" ]; then
 	echo "mux: ${mux_sink}"
 fi
 
+if [ -n "${no_mux}" ]; then
+	mux_sink="${audio_output}.monitor"
+fi
+
 if [ -n "${showkeys}" ]; then
 	echo "Starting wshowkeys on ${video_output}"
 	echo "WARNING: currently the -o flag to force display to a specific output is not implemented" >&2
@@ -61,4 +96,4 @@ if [ -n "${showkeys}" ]; then
 fi
 
 set -x
-wf-recorder -c h264_vaapi -d /dev/dri/renderD128 -o "${video_output}" -a "${mux_sink}.monitor" -f "${output_file}"
+wf-recorder -c h264_vaapi -d /dev/dri/renderD128 -x nv12 -o "${video_output}" -a "${mux_sink}.monitor" -f "${output_file}"