diff options
| author | MaZderMind <git@mazdermind.de> | 2016-08-17 13:57:58 +0200 |
|---|---|---|
| committer | Peter Körner <pkoerner@seibert-media.net> | 2016-09-27 10:01:07 +0200 |
| commit | 9834a6809d49ad63cf1af88b44efb02db6bca7ac (patch) | |
| tree | fafebb7418708995e848733bb049a527ecb6834a /voctocore | |
| parent | bb795bad0b439f6236f74f79c04e88888867b1dd (diff) | |
add configurable decoders into the gui
Diffstat (limited to 'voctocore')
| -rw-r--r-- | voctocore/default-config.ini | 2 | ||||
| -rw-r--r-- | voctocore/lib/avpreviewoutput.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/voctocore/default-config.ini b/voctocore/default-config.ini index 8f816d3..4c85abb 100644 --- a/voctocore/default-config.ini +++ b/voctocore/default-config.ini @@ -62,7 +62,7 @@ mix_out=10000 enabled=false deinterlace=false -; use vaapi to encode the previews, can be h264, mpeg2 or jpeg +; use vaapi to encode the previews, can be h264, mpeg2 or jpeg (BUT ONLY h264 IS TESTED) ; not all encoders are available on all CPUs ;vaapi=h264 diff --git a/voctocore/lib/avpreviewoutput.py b/voctocore/lib/avpreviewoutput.py index b43b5c7..91e2031 100644 --- a/voctocore/lib/avpreviewoutput.py +++ b/voctocore/lib/avpreviewoutput.py @@ -24,6 +24,7 @@ class AVPreviewOutput(TCPMultiConnection): deinterlace = "deinterlace mode=interlaced !" venc = 'jpegenc quality=90' + if Config.has_option('previews', 'vaapi'): try: encoder = Config.get('previews', 'vaapi') encoders = { |