From a28f17653f7b81d01a6336aa17acde1c1901cb0e Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 25 Jun 2019 15:34:45 -0400 Subject: [PATCH] Add DecoderHWAccel fields to Monitor --- web/includes/Monitor.php | 2 ++ web/skins/classic/views/monitor.php | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php index 6e685508c..75c432c09 100644 --- a/web/includes/Monitor.php +++ b/web/includes/Monitor.php @@ -38,6 +38,8 @@ private $defaults = array( 'Palette' => '0', 'Orientation' => null, 'Deinterlacing' => 0, + 'DecoderHWAccelName' => null, + 'DecoderHWAccelDevice' => null, 'SaveJPEGs' => 3, 'VideoWriter' => '0', 'OutputCodec' => null, diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php index 1cedd8071..d13c6606b 100644 --- a/web/skins/classic/views/monitor.php +++ b/web/skins/classic/views/monitor.php @@ -895,6 +895,22 @@ include('_monitor_source_nvsocket.php');  (Type()), 'zmOptionHelp', 'optionhelp', '?' ) ?>) +Type() == 'Ffmpeg' ) { +?> + + + () + + + + + + () + + + Type() != 'NVSocket' && $monitor->Type() != 'WebSite' ) {