Merge branch 'ai_server' of github.com:connortechnology/zoneminder into ai_server

Author: connortechnology

db/zm_update-1.37.73.sql

@@ -0,0 +1 @@
+UPDATE `Config` SET Value='https://telemetry.zoneminder.com/index.php' WHERE Value='https://zmanon:2b2d0b4skps@telemetry.zoneminder.com/zmtelemetry/testing5';

distros/redhat/zoneminder.spec

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

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

@@ -2740,7 +2740,7 @@ our @options = (
   },
   {
     name        => 'ZM_TELEMETRY_SERVER_ENDPOINT',
-    default     => 'https://zmanon:2b2d0b4skps@telemetry.zoneminder.com/zmtelemetry/testing5',
+    default     => 'https://telemetry.zoneminder.com/index.php',
     description => 'URL that ZoneMinder will send usage data to',
     help        => '',
     type        => $types{url},

scripts/zmtelemetry.pl.in

@@ -50,13 +50,17 @@ my $show = 0;
 # Interval between version checks
 my $interval;
 my $version;
+my $dry_run = 0;
+my $verbose;
 
 GetOptions(
-  force     => \$force,
-  help      => \$help,
-  show      => \$show,
-  interval  => \$interval,
-  version   => \$version
+  force   => \$force,
+  help    => \$help,
+  show    => \$show,
+  interval=> \$interval,
+  version => \$version,
+  verbose => \$verbose,
+  dry_run => \$dry_run,
 );
 
 if ($version) {
@@ -76,7 +80,7 @@ if ($show) {
   collectData($dbh, \%telemetry);
   my $result = jsonEncode(\%telemetry);
   print($result);
-  exit(0);
+  exit(0) if $dry_run;
 }
 
 if (!defined $interval) {
@@ -140,6 +144,7 @@ sub collectData {
   my $dbh = shift;
   my $telemetry = shift;
   $telemetry->{uuid} = getUUID($dbh);
+  $telemetry->{timezone} = $Config{ZM_TIMEZONE};
   @$telemetry{qw(city region country latitude longitude)} = getGeo();
   $telemetry->{timestamp} = strftime('%Y-%m-%dT%H:%M:%S%z', localtime());
   $telemetry->{monitor_count} = countQuery($dbh, 'Monitors');
@@ -188,7 +193,7 @@ sub sendData {
     $ua->proxy('https', $Config{ZM_UPDATE_CHECK_PROXY});
   }
 
-  Debug("Posting telemetry data to: $server_endpoint");
+  Debug("Posting telemetry data $msg to: $server_endpoint");
 
 # set custom HTTP request header fields
   my $req = HTTP::Request->new(POST => $server_endpoint);
@@ -286,8 +291,8 @@ sub getMonitorRef {
   my $dbh = shift;
 
   my $sql = 'SELECT `Id`,`Name`,`Type`,`Capturing`,`Analysing`,`Recording`,`Width`,`Height`,`Colours`,`MaxFPS`,`AlarmMaxFPS`,
-  (SELECT Name FROM Manufacturers WHERE Manufacturers.Id = ManufacturerId),
-  (SELECT Name FROM Models WHERE Models.Id = ModelId)
+  (SELECT Name FROM Manufacturers WHERE Manufacturers.Id = ManufacturerId) AS Manufacturer,
+  (SELECT Name FROM Models WHERE Models.Id = ModelId) AS Model
   FROM `Monitors`';
   my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
   my $res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );

src/zm_ffmpeg.cpp

@@ -74,7 +74,7 @@ static CodecData enc_codecs[] = {
   { AV_CODEC_ID_H265, "hevc", "h265_ni_quadra_enc", AV_PIX_FMT_YUV420P, AV_PIX_FMT_NI_QUAD, AV_HWDEVICE_TYPE_NI_QUADRA, "-1", nullptr },
   { AV_CODEC_ID_H265, "hevc", "h265_ni_quadra_enc", AV_PIX_FMT_YUV420P, AV_PIX_FMT_NI_QUAD, AV_HWDEVICE_TYPE_NI_QUADRA, "-1", nullptr },
   { AV_CODEC_ID_H264, "h264", "h264_ni_quadra_enc", AV_PIX_FMT_YUV420P, AV_PIX_FMT_NI_QUAD, AV_HWDEVICE_TYPE_NI_QUADRA, "-1", nullptr },
-  { AV_CODEC_ID_MJPEG, "mjpeg", "jpeg_ni_quadra_enc", AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_NI_QUAD, AV_HWDEVICE_TYPE_NI_QUADRA, "-1", nullptr },
+//{ AV_CODEC_ID_MJPEG, "mjpeg", "jpeg_ni_quadra_enc", AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_NI_QUAD, AV_HWDEVICE_TYPE_NI_QUADRA, "-1", nullptr },
 #endif
   { AV_CODEC_ID_H265, "hevc", "hevc_vaapi", AV_PIX_FMT_YUV420P, AV_PIX_FMT_VAAPI, AV_HWDEVICE_TYPE_VAAPI, nullptr, nullptr },
   { AV_CODEC_ID_H265, "hevc", "hevc_qsv", AV_PIX_FMT_YUV420P, AV_PIX_FMT_QSV, AV_HWDEVICE_TYPE_QSV, nullptr, nullptr },

version.txt

@@ -1 +1 @@
-1.37.72
+1.37.73

web/skins/classic/views/js/monitor.js

@@ -840,7 +840,7 @@ function ControlList_onClick() {
 
 function ObjectDetection_onChange(od_select) {
   const od = od_select.value;
-  if (od ==  'none') {
+  if (od == 'none') {
     // Hide other options
     $j('#ObjectDetectionModel').hide();
     $j('#ObjectDetectionObjectThreshold').hide();
@@ -857,7 +857,7 @@ function ObjectDetection_onChange(od_select) {
 
     od_model_select.innerHTML = '';
     for (const [key, value] of Object.entries(od_models[od])) {
-      let opt = document.createElement('option');
+      const opt = document.createElement('option');
       opt.value = key; // the index
       opt.innerHTML = value;
       od_model_select.append(opt);

web/skins/classic/views/js/watch.js

@@ -1356,7 +1356,9 @@ function monitorsSetScale(id=null) {
       var currentMonitor = monitorStream;
     } else if (typeof monitors !== 'undefined') {
       //used on Montage, Watch & Event page.
-      var currentMonitor = monitors.find((o) => { return parseInt(o["id"]) === id; });
+      var currentMonitor = monitors.find((o) => {
+        return parseInt(o["id"]) === id;
+      });
     } else {
       //Stream is missing
       return;