Add composition Matrix Two-by-two.

11 files changed, 102 insertions, 0 deletions

diff --git a/example-scripts/control-server/demo-cycle-modes.sh b/example-scripts/control-server/demo-cycle-modes.sh
index 7440cf1..ab9cdbd 100755
--- a/example-scripts/control-server/demo-cycle-modes.sh
+++ b/example-scripts/control-server/demo-cycle-modes.sh
@@ -35,6 +35,9 @@ while true; do
 	./set-video-cam2.sh
 	./set-audio-cam2.sh
 	sleep 10
+	echo "composite-matrix-two-by-two"
+	./set-composite-matrix-two-by-two.sh
+	sleep 10
 	echo "composite-picture-in-picture"
 	./set-composite-picture-in-picture.sh
 	sleep 10
diff --git a/example-scripts/control-server/set-audio-cam3.sh b/example-scripts/control-server/set-audio-cam3.sh
new file mode 100755
index 0000000..b591879
--- /dev/null
+++ b/example-scripts/control-server/set-audio-cam3.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+confdir="`dirname "$0"`/../"
+. $confdir/default-config.sh
+if [ -f $confdir/config.sh ]; then
+	. $confdir/config.sh
+fi
+
+echo set_audio cam3 | nc -q0 $MIXHOST 9999
diff --git a/example-scripts/control-server/set-audio-cam4.sh b/example-scripts/control-server/set-audio-cam4.sh
new file mode 100755
index 0000000..2dd26a8
--- /dev/null
+++ b/example-scripts/control-server/set-audio-cam4.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+confdir="`dirname "$0"`/../"
+. $confdir/default-config.sh
+if [ -f $confdir/config.sh ]; then
+	. $confdir/config.sh
+fi
+
+echo set_audio cam4 | nc -q0 $MIXHOST 9999
diff --git a/example-scripts/control-server/set-composite-matrix-two-by-two.sh b/example-scripts/control-server/set-composite-matrix-two-by-two.sh
new file mode 100755
index 0000000..1ea81c6
--- /dev/null
+++ b/example-scripts/control-server/set-composite-matrix-two-by-two.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+confdir="`dirname "$0"`/../"
+. $confdir/default-config.sh
+if [ -f $confdir/config.sh ]; then
+	. $confdir/config.sh
+fi
+
+echo set_composite_mode matrix_two_by_two | nc -q0 $MIXHOST 9999
diff --git a/example-scripts/gstreamer/source-videotestsrc-as-cam3.sh b/example-scripts/gstreamer/source-videotestsrc-as-cam3.sh
new file mode 100755
index 0000000..85787b2
--- /dev/null
+++ b/example-scripts/gstreamer/source-videotestsrc-as-cam3.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+confdir="`dirname "$0"`/../"
+. $confdir/default-config.sh
+if [ -f $confdir/config.sh ]; then
+	. $confdir/config.sh
+fi
+
+gst-launch-1.0 \
+	videotestsrc pattern=ball foreground-color=0x000000ff background-color=0x00000044 !\
+		video/x-raw,format=I420,width=$WIDTH,height=$HEIGHT,framerate=$FRAMERATE/1,pixel-aspect-ratio=1/1 ! \
+		mux. \
+	\
+	audiotestsrc freq=660 !\
+		audio/x-raw,format=S16LE,channels=2,layout=interleaved,rate=$AUDIORATE !\
+		mux. \
+	\
+	matroskamux name=mux !\
+		tcpclientsink host=$MIXHOST port=10002
diff --git a/example-scripts/gstreamer/source-videotestsrc-as-cam4.sh b/example-scripts/gstreamer/source-videotestsrc-as-cam4.sh
new file mode 100755
index 0000000..6bee2f3
--- /dev/null
+++ b/example-scripts/gstreamer/source-videotestsrc-as-cam4.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+confdir="`dirname "$0"`/../"
+. $confdir/default-config.sh
+if [ -f $confdir/config.sh ]; then
+	. $confdir/config.sh
+fi
+
+gst-launch-1.0 \
+	videotestsrc pattern=ball foreground-color=0x00ffff00 background-color=0x00444400 !\
+		video/x-raw,format=I420,width=$WIDTH,height=$HEIGHT,framerate=$FRAMERATE/1,pixel-aspect-ratio=1/1 ! \
+		mux. \
+	\
+	audiotestsrc freq=770 !\
+		audio/x-raw,format=S16LE,channels=2,layout=interleaved,rate=$AUDIORATE !\
+		mux. \
+	\
+	matroskamux name=mux !\
+		tcpclientsink host=$MIXHOST port=10003
diff --git a/example-scripts/misc/benchmark.sh b/example-scripts/misc/benchmark.sh
index c60f897..2ca879c 100755
--- a/example-scripts/misc/benchmark.sh
+++ b/example-scripts/misc/benchmark.sh
@@ -7,6 +7,8 @@ sleep 1
 ../control-server/set-composite-side-by-side-equal.sh >/dev/null 2>/dev/null
 ../gstreamer/source-videotestsrc-as-cam1.sh >/dev/null 2>/dev/null &
 ../gstreamer/source-videotestsrc-as-cam2.sh >/dev/null 2>/dev/null &
+../gstreamer/source-videotestsrc-as-cam3.sh >/dev/null 2>/dev/null &
+../gstreamer/source-videotestsrc-as-cam4.sh >/dev/null 2>/dev/null &
 ../gstreamer/source-videotestsrc-as-grabber.sh >/dev/null 2>/dev/null &
 ../gstreamer/source-videotestsrc-as-background-loop.sh >/dev/null 2>/dev/null &
 pidstat -p $PID 1 &
diff --git a/example-scripts/misc/demo-local.sh b/example-scripts/misc/demo-local.sh
index f985fb1..95a97ce 100755
--- a/example-scripts/misc/demo-local.sh
+++ b/example-scripts/misc/demo-local.sh
@@ -12,6 +12,8 @@ echo "PID=$PID"
 sleep 1
 ../ffmpeg/source-testvideo-as-cam1.sh >/dev/null 2>/dev/null &
 ../ffmpeg/source-testvideo-as-cam2.sh >/dev/null 2>/dev/null &
+../ffmpeg/source-testvideo-as-cam3.sh >/dev/null 2>/dev/null &
+../ffmpeg/source-testvideo-as-cam4.sh >/dev/null 2>/dev/null &
 ../ffmpeg/source-background-loop.sh &
 ../ffmpeg/av-record-output-ffmpeg.sh &
 #../ffmpeg/stream-hd.sh &
diff --git a/example-scripts/misc/perf.sh b/example-scripts/misc/perf.sh
index c20f10b..9a03c19 100755
--- a/example-scripts/misc/perf.sh
+++ b/example-scripts/misc/perf.sh
@@ -7,6 +7,8 @@ sleep 1
 ../control-server/set-composite-side-by-side-equal.sh >/dev/null 2>/dev/null
 ../gstreamer/source-videotestsrc-as-cam1.sh >/dev/null 2>/dev/null &
 ../gstreamer/source-videotestsrc-as-cam2.sh >/dev/null 2>/dev/null &
+../gstreamer/source-videotestsrc-as-cam3.sh >/dev/null 2>/dev/null &
+../gstreamer/source-videotestsrc-as-cam4.sh >/dev/null 2>/dev/null &
 ../gstreamer/source-videotestsrc-as-grabber.sh >/dev/null 2>/dev/null &
 ../gstreamer/source-videotestsrc-as-background-loop.sh >/dev/null 2>/dev/null &
 sudo perf top -g -p $PID
diff --git a/example-scripts/systemd-units/voctomix-cam3-source.service b/example-scripts/systemd-units/voctomix-cam3-source.service
new file mode 100644
index 0000000..3d941bc
--- /dev/null
+++ b/example-scripts/systemd-units/voctomix-cam3-source.service
@@ -0,0 +1,14 @@
+[Unit]
+Description = voctomix test-video-source cam3
+After = voctomix-voctocore.service
+Requires = voctomix-voctocore.service
+
+[Service]
+Type = simple
+ExecStart = /usr/share/doc/voctomix/example-scripts/gstreamer/source-videotestsrc-as-cam3.sh
+Restart = always
+RestartSec = 1s
+StartLimitInterval = 0
+
+[Install]
+WantedBy = voctomix-voctocore.service
diff --git a/example-scripts/systemd-units/voctomix-cam4-source.service b/example-scripts/systemd-units/voctomix-cam4-source.service
new file mode 100644
index 0000000..202c111
--- /dev/null
+++ b/example-scripts/systemd-units/voctomix-cam4-source.service
@@ -0,0 +1,14 @@
+[Unit]
+Description = voctomix test-video-source cam4
+After = voctomix-voctocore.service
+Requires = voctomix-voctocore.service
+
+[Service]
+Type = simple
+ExecStart = /usr/share/doc/voctomix/example-scripts/gstreamer/source-videotestsrc-as-cam4.sh
+Restart = always
+RestartSec = 1s
+StartLimitInterval = 0
+
+[Install]
+WantedBy = voctomix-voctocore.service