From 9834a6809d49ad63cf1af88b44efb02db6bca7ac Mon Sep 17 00:00:00 2001 From: MaZderMind Date: Wed, 17 Aug 2016 13:57:58 +0200 Subject: add configurable decoders into the gui --- voctocore/default-config.ini | 2 +- voctocore/lib/avpreviewoutput.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'voctocore') 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 = { -- cgit v1.2.3