diff options
Diffstat (limited to 'voctocore/lib')
| -rw-r--r-- | voctocore/lib/avpreviewoutput.py | 7 | ||||
| -rw-r--r-- | voctocore/lib/config.py | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/voctocore/lib/avpreviewoutput.py b/voctocore/lib/avpreviewoutput.py index ac5fd0a..a0bb951 100644 --- a/voctocore/lib/avpreviewoutput.py +++ b/voctocore/lib/avpreviewoutput.py @@ -20,10 +20,13 @@ class AVPreviewOutput(TCPMultiConnection): pipeline = """ intervideosrc channel=video_{channel} ! {vcaps_in} ! + capssetter caps="video/x-raw,interlace-mode=interlaced" ! + deinterlace ! + video/x-raw,interlace-mode=progressive ! + videoscale ! videorate ! - videoscale method=nearest-neighbour ! {vcaps_out} ! - jpegenc ! + jpegenc quality=90 ! queue ! mux. diff --git a/voctocore/lib/config.py b/voctocore/lib/config.py index ebb9e1e..3075f61 100644 --- a/voctocore/lib/config.py +++ b/voctocore/lib/config.py @@ -12,8 +12,11 @@ SafeConfigParser.getlist = getlist files = [ os.path.join(os.path.dirname(os.path.realpath(__file__)), '../default-config.ini'), os.path.join(os.path.dirname(os.path.realpath(__file__)), '../config.ini'), - '/etc/voctomix.ini', - os.path.expanduser('~/.voctomix.ini'), + '/etc/voctomix/voctocore.ini', + '/etc/voctomix.ini', # deprecated + '/etc/voctocore.ini', + os.path.expanduser('~/.voctomix.ini'), # deprecated + os.path.expanduser('~/.voctocore.ini'), ] if Args.ini_file is not None: |