diff options
| author | MaZderMind <git@mazdermind.de> | 2016-08-21 21:02:34 +0200 |
|---|---|---|
| committer | MaZderMind <git@mazdermind.de> | 2016-08-21 21:02:34 +0200 |
| commit | d4506ffc6e2b91b2aa18f4cca25b319a7f551ad3 (patch) | |
| tree | f9fa1e0f169d8d8623e37e26872c722a06dd2ae9 /voctocore/lib/avpreviewoutput.py | |
| parent | 7ce3b12e4a76d1926077d7efa57e5e9d3538de33 (diff) | |
| parent | 0319be21855f9c9f4d618552ddde2a852d56869a (diff) | |
Merge branch 'Florob-voctomidi'
Diffstat (limited to 'voctocore/lib/avpreviewoutput.py')
| -rw-r--r-- | voctocore/lib/avpreviewoutput.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/voctocore/lib/avpreviewoutput.py b/voctocore/lib/avpreviewoutput.py index a0bb951..d5c2c66 100644 --- a/voctocore/lib/avpreviewoutput.py +++ b/voctocore/lib/avpreviewoutput.py @@ -17,12 +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} ! - capssetter caps="video/x-raw,interlace-mode=interlaced" ! - deinterlace ! - video/x-raw,interlace-mode=progressive ! + {deinterlace} videoscale ! videorate ! {vcaps_out} ! @@ -49,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) |