From 038bc89367f26fe9be8bff135c8c0eca3f9faaaf Mon Sep 17 00:00:00 2001 From: MaZderMind Date: Thu, 14 May 2015 19:59:16 +0200 Subject: implement switchable preview source in mjpg coding for the GUI --- voctocore/lib/videomix.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'voctocore/lib/videomix.py') 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 ! -- cgit v1.2.3