summaryrefslogtreecommitdiff
path: root/voctocore/lib/videomix.py
diff options
context:
space:
mode:
authorMaZderMind <github@mazdermind.de>2015-05-14 19:59:16 +0200
committerMaZderMind <github@mazdermind.de>2015-05-14 19:59:16 +0200
commit038bc89367f26fe9be8bff135c8c0eca3f9faaaf (patch)
tree692306fb3bb14b75b09056711b4fe4bfd74d2860 /voctocore/lib/videomix.py
parent51ac59343673286cc4c5d1d9b484b1e3a8f657a5 (diff)
implement switchable preview source in mjpg coding for the GUI
Diffstat (limited to 'voctocore/lib/videomix.py')
-rw-r--r--voctocore/lib/videomix.py14
1 files changed, 11 insertions, 3 deletions
diff --git a/voctocore/lib/videomix.py b/voctocore/lib/videomix.py
index 77bea42..147b1ba 100644
--- a/voctocore/lib/videomix.py
+++ b/voctocore/lib/videomix.py
@@ -30,13 +30,21 @@ class VideoMix(object):
pipeline = """
videomixer name=mix !
{caps} !
- textoverlay halignment=left valignment=top ypad=175 text=VideoMix !
- timeoverlay halignment=left valignment=top ypad=175 xpad=400 !
- intervideosink channel=video_mix
+ textoverlay halignment=left valignment=top ypad=125 text=VideoMix !
+ timeoverlay halignment=left valignment=top ypad=125 xpad=400 !
+ queue !
+ tee name=tee
+
+ tee. ! queue ! intervideosink channel=video_mix_out
""".format(
caps=self.caps
)
+ if Config.getboolean('previews', 'enabled'):
+ pipeline += """
+ tee. ! queue ! intervideosink channel=video_mix_preview
+ """
+
for idx, name in enumerate(self.names):
pipeline += """
intervideosrc channel=video_{name}_mixer !