From 47e4b7cf3784daa5c71fdd1ab3a2fc7c53563770 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sun, 26 Feb 2023 16:31:14 -0500 Subject: [PATCH] Add DecoderName to Monitors --- src/zm_monitor.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp index 32833d305..12f3618af 100644 --- a/src/zm_monitor.cpp +++ b/src/zm_monitor.cpp @@ -87,7 +87,7 @@ std::string load_monitor_sql = "`LinkedMonitors`, `EventStartCommand`, `EventEndCommand`, `AnalysisFPSLimit`, `AnalysisUpdateDelay`, `MaxFPS`, `AlarmMaxFPS`," "`Device`, `Channel`, `Format`, `V4LMultiBuffer`, `V4LCapturesPerFrame`, " // V4L Settings "`Protocol`, `Method`, `Options`, `User`, `Pass`, `Host`, `Port`, `Path`, `SecondPath`, `Width`, `Height`, `Colours`, `Palette`, `Orientation`+0, `Deinterlacing`, " -"`DecoderHWAccelName`, `DecoderHWAccelDevice`, `RTSPDescribe`, " +"`Decoder`, `DecoderHWAccelName`, `DecoderHWAccelDevice`, `RTSPDescribe`, " "`SaveJPEGs`, `VideoWriter`, `EncoderParameters`, " "`OutputCodec`, `Encoder`, `OutputContainer`, " "`RecordAudio`, " @@ -451,7 +451,8 @@ void Monitor::Load(MYSQL_ROW dbrow, bool load_zones=true, Purpose p = QUERY) { deinterlacing = atoi(dbrow[col]); col++; deinterlacing_value = deinterlacing & 0xff; -/*"`DecoderHWAccelName`, `DecoderHWAccelDevice`, `RTSPDescribe`, " */ +/*"`Decoder`, `DecoderHWAccelName`, `DecoderHWAccelDevice`, `RTSPDescribe`, " */ + decoder_name = dbrow[col] ? dbrow[col] : ""; col++; decoder_hwaccel_name = dbrow[col] ? dbrow[col] : ""; col++; decoder_hwaccel_device = dbrow[col] ? dbrow[col] : ""; col++; rtsp_describe = (dbrow[col] && *dbrow[col] != '0'); col++;