Merge branch 'ZoneMinder:master' into patch-23613

Author: IgorA100

.eslintignore

@@ -4,6 +4,8 @@
 web/api/lib
 web/includes/csrf/
 web/js/videojs.zoomrotate.js
+web/js/video-stream.js
+web/js/video-rtc.js
 web/js/fontfaceobserver.standalone.js
 web/skins/classic/js/bootstrap-4.5.0.js
 web/skins/classic/js/bootstrap.bundle.min.js

.github/workflows/ci-bookworm.yml

@@ -48,6 +48,7 @@ jobs:
           libcurl4-gnutls-dev libvlc-dev libvncserver-dev
           libdate-manip-perl libdbd-mysql-perl libsys-mmap-perl libwww-perl
           libpolkit-gobject-1-dev
+          nlohmann-json3-dev
           ${{ matrix.crypto_package }} ${{ matrix.jwt_package }}
       - name: Prepare
         run: mkdir build

.github/workflows/ci-bullseye.yml

@@ -48,6 +48,7 @@ jobs:
           libcurl4-gnutls-dev libvlc-dev libvncserver-dev
           libdate-manip-perl libdbd-mysql-perl libsys-mmap-perl libwww-perl
           libpolkit-gobject-1-dev
+          nlohmann-json3-dev
           catch2
           ${{ matrix.crypto_package }} ${{ matrix.jwt_package }}
       - name: Prepare

.github/workflows/ci-focal.yml

@@ -45,6 +45,7 @@ jobs:
           libcurl4-gnutls-dev libvlc-dev libvncserver-dev
           libdate-manip-perl libdbd-mysql-perl libsys-mmap-perl libwww-perl
           libpolkit-gobject-1-dev
+          nlohmann-json3-dev
           ${{ matrix.crypto_package }} ${{ matrix.jwt_package }}
       - name: Prepare
         run: mkdir build

CMakeLists.txt

@@ -146,6 +146,8 @@ set(ZM_WEB_GROUP "" CACHE STRING
     Leave empty to be the same as the web user")
 set(ZM_DIR_EVENTS "${ZM_CONTENTDIR}/events" CACHE PATH
   "Location where events are recorded to, default: ZM_CONTENTDIR/events")
+set(ZM_DIR_MODELS "${ZM_CONTENTDIR}/models" CACHE PATH
+  "Location of AI models default: ${ZM_CONTENTDIR}/models")
 set(ZM_DIR_SOUNDS "sounds" CACHE PATH
   "Location to look for optional sound files, default: sounds")
 set(ZM_PATH_ZMS "/cgi-bin/nph-zms" CACHE PATH
@@ -484,6 +486,7 @@ find_package(FFMPEG 55.34.100 REQUIRED
   COMPONENTS
     avcodec
     avdevice
+    avfilter
     avformat
     avutil
     swresample
@@ -588,6 +591,14 @@ if(HAVE_LIBPCRE AND HAVE_PCRE_H)
   set(ZM_PCRE 1)
 endif()
 
+find_package(nlohmann_json CONFIG)
+if(nlohmann_json_FOUND)
+  set(ZM_HAS_NLOHMANN_JSON 1)
+else()
+  set(ZM_HAS_NLOHMANN_JSON 0)
+  message(AUTHOR_WARNING "nlohmann_json headers weren't found - AI results will not be available")
+endif()
+
 # Check for mmap and enable in all components
 set(ZM_MEM_MAPPED 0)
 set(ENABLE_MMAP no)

db/zm_create.sql.in

@@ -203,6 +203,7 @@ CREATE TABLE `Events` (
   `TotScore` int(10) unsigned NOT NULL default '0',
   `AvgScore` smallint(5) unsigned default '0',
   `MaxScore` smallint(5) unsigned default '0',
+  `MaxScoreFrameId` int(10) unsigned default NULL,
   `Archived` tinyint(3) unsigned NOT NULL default '0',
   `Videoed` tinyint(3) unsigned NOT NULL default '0',
   `Uploaded` tinyint(3) unsigned NOT NULL default '0',

db/zm_update-1.37.68.sql

@@ -0,0 +1,17 @@
+--
+-- Update Events table to have MaxScoreFrameId
+--
+
+SELECT 'Checking for MaxScoreFrameId in Events';
+SET @s = (SELECT IF(
+  (SELECT COUNT(*)
+  FROM INFORMATION_SCHEMA.COLUMNS
+  WHERE table_name = 'Events'
+  AND table_schema = DATABASE()
+  AND column_name = 'MaxScoreFrameId'
+  ) > 0,
+"SELECT 'Column MaxScoreFrameId already exists in Events'",
+ "ALTER TABLE `Events` ADD COLUMN `MaxScoreFrameId` int(10) unsigned default NULL AFTER `MaxScore`"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;

distros/redhat/zoneminder.spec

@@ -18,7 +18,7 @@
 %global zmtargetdistro %{?rhel:el%{rhel}}%{!?rhel:fc%{fedora}}
 
 Name: zoneminder
-Version: 1.37.66
+Version: 1.37.68
 Release: 1%{?dist}
 Summary: A camera monitoring and analysis tool
 Group: System Environment/Daemons

docs/installationguide/ubuntu.rst

@@ -37,7 +37,7 @@ Alternatively
 
 ::
 
-  apt-get install mariab-server
+  apt-get install mariadb-server
 
 **Step 4:** Configure the ZoneMinder Database
 

scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in

@@ -447,11 +447,11 @@ our @options = (
   },
   {
     name        => 'ZM_GO2RTC_PATH',
-    default     => 'http://127.0.0.1:1984',
+    default     => 'http://127.0.0.1:1984/api',
     description => 'URL for Go2RTC API.',
     help        => q`This value points to the location of the Go2RTC API
     install, including username and password. If left blank, this
-    will default to 127.0.0.1:1984
+    will default to http://127.0.0.1:1984/api
     `,
     type        => $types{string},
     category    => 'system',
@@ -1633,7 +1633,7 @@ our @options = (
       `,
     type        => {
       db_type     => 'string',
-      hint        => 'normal|collapsed',
+      hint        => 'normal|collapsed|left',
       pattern     => qr|^([nc])|i,
       format      => q( ($1 =~ /^n/) ? 'normal' : 'collapsed' )
     },
@@ -2834,11 +2834,11 @@ our @options = (
   {
     name        => 'ZM_WEB_LIST_THUMBS',
     default     => 'yes',
-    description => 'Display mini-thumbnails of event images in event lists',
+    description => 'Display mini-thumbnails of event images in event lists and on console',
     help        => q`
-      Ordinarily the event lists just display text details of the
-      events to save space and time. By switching this option on you
-      can also display small thumbnails to help you identify events
+      Originally the event lists and console just displayed text details of the
+      events and monitors to save space and time. By switching this option on you
+      can also display small thumbnails to help you identify events or cameras
       of interest. The size of these thumbnails is controlled by the
       following two options.
       `,
@@ -2848,10 +2848,10 @@ our @options = (
   {
     name        => 'ZM_WEB_LIST_THUMB_WIDTH',
     default     => '48',
-    description => 'The width of the thumbnails that appear in the event lists',
+    description => 'The width of the thumbnails that appear in the event lists and on console',
     help        => q`
       This options controls the width of the thumbnail images that
-      appear in the event lists. It should be fairly small to fit in
+      appear in the event lists and on the console. It should be fairly small to fit in
       with the rest of the table. If you prefer you can specify a
       height instead in the next option but you should only use one
       of the width or height and the other option should be set to