aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--voctocore/default-config.ini2
-rw-r--r--voctocore/lib/avpreviewoutput.py1
-rw-r--r--voctogui/lib/videodisplay.py29
3 files changed, 26 insertions, 6 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 = {
diff --git a/voctogui/lib/videodisplay.py b/voctogui/lib/videodisplay.py
index 9259f6c..f42775c 100644
--- a/voctogui/lib/videodisplay.py
+++ b/voctogui/lib/videodisplay.py
@@ -16,16 +16,34 @@ class VideoDisplay(object):
self.drawing_area = drawing_area
self.level_callback = level_callback
- caps = Config.get('mix', 'videocaps')
+ if Config.has_option('previews', 'videocaps'):
+ previewcaps = Config.get('previews', 'videocaps')
+ else:
+ previewcaps = Config.get('mix', 'videocaps')
+
use_previews = (Config.getboolean('previews', 'enabled') and
Config.getboolean('previews', 'use'))
# Preview-Ports are Raw-Ports + 1000
if use_previews:
- self.log.info('using jpeg-previews instead of raw-video for gui')
+ self.log.info('using endoded previews instead of raw-video for gui')
port += 1000
+
+ vdec = 'image/jpeg ! jpegdec'
+ if Config.has_option('previews', 'vaapi'):
+ try:
+ decoder = Config.get('previews', 'vaapi')
+ decoders = {
+ 'h264': 'video/x-h264 ! avdec_h264',
+ 'jpeg': 'image/jpeg ! jpegdec',
+ 'mpeg2': 'video/mpeg,mpegversion=2 ! mpeg2dec'
+ }
+ vdec = decoders[decoder]
+ except Exception as e:
+ self.log.error(e)
+
else:
- self.log.info('using raw-video instead of jpeg-previews for gui')
+ self.log.info('using raw-video instead of endoded-previews for gui')
# Setup Server-Connection, Demuxing and Decoding
pipeline = """
@@ -37,8 +55,7 @@ class VideoDisplay(object):
if use_previews:
pipeline += """
demux. !
- image/jpeg !
- jpegdec !
+ {vdec} !
{previewcaps} !
queue !
"""
@@ -109,6 +126,8 @@ class VideoDisplay(object):
vcaps=Config.get('mix', 'videocaps'),
previewcaps=Config.get('previews', 'videocaps'),
host=Args.host if Args.host else Config.get('server', 'host'),
+ vdec=vdec,
+ host=Config.get('server', 'host'),
port=port,
)