From 58706980c493676bb60db016e4d195124abb648d Mon Sep 17 00:00:00 2001 From: MaZderMind Date: Wed, 17 Aug 2016 13:40:33 +0200 Subject: make deinterlacer configurable --- voctocore/default-config.ini | 1 + voctocore/lib/avpreviewoutput.py | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'voctocore') diff --git a/voctocore/default-config.ini b/voctocore/default-config.ini index d5d89fa..31a49ff 100644 --- a/voctocore/default-config.ini +++ b/voctocore/default-config.ini @@ -60,6 +60,7 @@ mix_out=10000 [previews] ; disable if ui & server run on the same computer and can exchange uncompressed video frames enabled=false +deinterlace=false ; default to mix-videocaps, only applicable if enabled=true ; you can change the framerate and the width/height, but nothing else diff --git a/voctocore/lib/avpreviewoutput.py b/voctocore/lib/avpreviewoutput.py index b05457a..d5c2c66 100644 --- a/voctocore/lib/avpreviewoutput.py +++ b/voctocore/lib/avpreviewoutput.py @@ -17,10 +17,14 @@ class AVPreviewOutput(TCPMultiConnection): else: vcaps_out = Config.get('mix', 'videocaps') + deinterlace = "" + if Config.getboolean('previews', 'deinterlace'): + deinterlace = "deinterlace mode=interlaced !" + pipeline = """ intervideosrc channel=video_{channel} ! {vcaps_in} ! - deinterlace mode=interlaced ! + {deinterlace} videoscale ! videorate ! {vcaps_out} ! @@ -47,7 +51,8 @@ class AVPreviewOutput(TCPMultiConnection): channel=self.channel, acaps=Config.get('mix', 'audiocaps'), vcaps_in=Config.get('mix', 'videocaps'), - vcaps_out=vcaps_out + vcaps_out=vcaps_out, + deinterlace=deinterlace ) self.log.debug('Creating Output-Pipeline:\n%s', pipeline) -- cgit v1.2.3