Merge branch 'master' into ai_server

Author: connortechnology

db/zm_create.sql.in

@@ -563,7 +563,7 @@ CREATE TABLE `Monitors` (
   `DecoderHWAccelDevice`  varchar(255),
   `SaveJPEGs` TINYINT NOT NULL DEFAULT '3' ,
   `VideoWriter` TINYINT NOT NULL DEFAULT '0',
-  `OutputCodec` int(10) unsigned NOT NULL default 0,
+  `OutputCodecName` varchar(32) NOT NULL default 'auto',
   `Encoder`     varchar(32),
   `EncoderHWAccelName`  varchar(64),
   `EncoderHWAccelDevice`  varchar(255),

db/zm_update-1.37.70.sql

@@ -0,0 +1,21 @@
+/* Change OutputCodec  from int to varchar(32) */
+SELECT 'Checking for OutputCodecName in Monitors';
+SET @s = (SELECT IF(
+  (SELECT COUNT(*)
+  FROM INFORMATION_SCHEMA.COLUMNS
+  WHERE table_name = 'Monitors'
+  AND table_schema = DATABASE()
+  AND column_name = 'OutputCodecName'
+  ) > 0,
+"SELECT 'Column OutputCodecName already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD COLUMN `OutputCodecName` varchar(32) NOT NULL default '' AFTER `VideoWriter`"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+UPDATE Monitors SET OutputCodecName='auto' where OutputCodec=0 AND OutputCodecName='';
+UPDATE Monitors SET OutputCodecName='h264' where OutputCodec=27 AND OutputCodecName='';
+UPDATE Monitors SET OutputCodecName='hevc' where OutputCodec=173 AND OutputCodecName='';
+UPDATE Monitors SET OutputCodecName='vp9' where OutputCodec=167 AND OutputCodecName='';
+UPDATE Monitors SET OutputCodecName='av1' where OutputCodec=225 or OutputCodec=226 AND OutputCodecName='';
+

distros/redhat/zoneminder.spec

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

eslint.config.js

@@ -0,0 +1,110 @@
+"use strict";
+
+const {
+    defineConfig,
+    globalIgnores,
+} = require("eslint/config");
+
+const globals = require("globals");
+const html = require("eslint-plugin-html");
+const phpMarkup = require("eslint-plugin-php-markup");
+const js = require("@eslint/js");
+
+const {
+    FlatCompat,
+} = require("@eslint/eslintrc");
+
+const compat = new FlatCompat({
+    baseDirectory: __dirname,
+    recommendedConfig: js.configs.recommended,
+    allConfig: js.configs.all
+});
+
+module.exports = defineConfig([{
+    languageOptions: {
+        globals: {
+            ...globals.browser,
+        },
+    },
+
+    extends: compat.extends("google"),
+
+    plugins: {
+        html,
+        "php-markup": phpMarkup,
+    },
+
+    "rules": {
+        "no-invalid-this": "off",
+        "camelcase": "off",
+        "comma-dangle": "off",
+        "guard-for-in": "off",
+        "max-len": "off",
+
+        "new-cap": ["error", {
+            capIsNewExceptions: ["Error", "Warning", "Debug", "Polygon_calcArea", "Play", "Stop", "Panzoom"],
+            newIsCapExceptionPattern: "^Asset..",
+        }],
+
+        "no-array-constructor": "off",
+
+        "no-unused-vars": ["error", {
+            "vars": "local",
+            "args": "none",
+            "ignoreRestSiblings": false,
+        }],
+
+        "no-var": "off",
+        "prefer-rest-params": "off",
+        "quotes": "off",
+        "require-jsdoc": "off",
+        "spaced-comment": "off",
+    },
+
+    "settings": {
+        "php/php-extensions": [".php"],
+
+        "php/markup-replacement": {
+            "php": "",
+            "=": "0",
+        },
+
+        "php/keep-eol": false,
+        "php/remove-whitespace": false,
+        "php/remove-empty-line": false,
+        "php/remove-php-lint": false,
+    },
+}, {
+    files: ["**/*.*php"],
+
+    "rules": {
+        "eol-last": "off",
+        "indent": "off",
+    },
+}, globalIgnores([
+    "**/*.min.js",
+    "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",
+    "web/skins/classic/js/bootstrap-table-1.23.5",
+    "web/skins/classic/js/chosen",
+    "web/skins/classic/js/dateTimePicker",
+    "web/skins/classic/js/jquery-*.js",
+    "web/skins/classic/js/jquery-ui-*",
+    "web/skins/classic/js/jquery.js",
+    "web/skins/classic/js/moment.js",
+    "web/skins/classic/js/video.js",
+    "web/skins/classic/assets",
+    "web/js/janus.js",
+    "web/js/ajaxQueue.js",
+    "web/js/hls-1.5.20/",
+    "web/js/noUiSlider-15.8.1/",
+    "web/js/dms.js",
+    "web/skins/classic/includes/export_functions.php",
+    "web/skins/classic/views/events.php",
+])]);

src/zm_event.cpp

@@ -172,7 +172,7 @@ int Event::OpenJpegCodec(AVFrame *frame) {
     mJpegCodecContext = nullptr;
   }
 
-  std::list<const CodecData *>codec_data = get_encoder_data(AV_CODEC_ID_MJPEG, "");
+  std::list<const CodecData *>codec_data = get_encoder_data("mjpeg", "");
   if (!codec_data.size()) {
     Error("No codecs for mjpeg found");
     return -1;

src/zm_ffmpeg.cpp

@@ -109,7 +109,7 @@ int ni_get_cardno(const AVCodecContext *ctx) {
 }
 #endif
 
-std::list<const CodecData*> get_encoder_data(int wanted_codec, const std::string &wanted_encoder) {
+std::list<const CodecData*> get_encoder_data(const std::string &wanted_codec, const std::string &wanted_encoder) {
   std::list<const CodecData*> results;
 
   for (unsigned int i = 0; i < sizeof(enc_codecs) / sizeof(*enc_codecs); i++) {
@@ -120,12 +120,10 @@ std::list<const CodecData*> get_encoder_data(int wanted_codec, const std::string
         continue;
       }
     }
-    if (wanted_codec and (enc_codecs[i].codec_id != wanted_codec)) {
-      Debug(4, "Not the right codec id %d %s != %d %s for %s",
-          chosen_codec_data->codec_id,
-          avcodec_get_name(chosen_codec_data->codec_id),
-          wanted_codec,
-          avcodec_get_name((AVCodecID)wanted_codec),
+    if ((!wanted_codec.empty() and wanted_codec != "auto") and (enc_codecs[i].codec_codec != wanted_codec)) {
+      Debug(4, "Not the right codec id %s != %s for %s",
+          chosen_codec_data->codec_codec,
+          wanted_codec.c_str(),
           chosen_codec_data->codec_name
           );
       continue;

src/zm_ffmpeg.h

@@ -348,7 +348,7 @@ struct CodecData {
   const char *hwdevice_default;
   const char *options_defaults;
 };
-std::list<const CodecData*> get_encoder_data(int wanted_codec, const std::string &wanted_coder) ;
+std::list<const CodecData*> get_encoder_data(const std::string & wanted_codec, const std::string &wanted_coder) ;
 std::list<const CodecData*> get_decoder_data(int wanted_codec, const std::string &wanted_coder) ;
 int setup_hwaccel(AVCodecContext *codec_ctx, const CodecData *codec_data,AVBufferRef * &hw_device_ctx, const std::string &device, int width, int height);
 #ifdef HAVE_QUADRA

src/zm_monitor.cpp

@@ -104,7 +104,7 @@ std::string load_monitor_sql =
   "`Deinterlacing`, "
   "`Decoder`, `DecoderHWAccelName`, `DecoderHWAccelDevice`, `RTSPDescribe`, "
   "`SaveJPEGs`, `VideoWriter`, `EncoderParameters`, "
-  "`OutputCodec`, `Encoder`, `EncoderHWAccelName`, `EncoderHWAccelDevice`, `OutputContainer`, "
+  "`OutputCodecName`, `Encoder`, `EncoderHWAccelName`, `EncoderHWAccelDevice`, `OutputContainer`, "
   "`RecordAudio`, WallClockTimestamps,"
   "`Brightness`, `Contrast`, `Hue`, `Colour`, "
   "`EventPrefix`, `LabelFormat`, `LabelX`, `LabelY`, `LabelSize`,"
@@ -194,7 +194,7 @@ Monitor::Monitor() :
   colours(0),
   videowriter(DISABLED),
   encoderparams(""),
-  output_codec(0),
+  output_codec(""),
   encoder(""),
   encoder_hwaccel_name(""),
   encoder_hwaccel_device(""),
@@ -348,7 +348,7 @@ std::string TriggerState_Strings[] = {"Cancel", "On", "Off"};
    "Device, Channel, Format, V4LMultiBuffer, V4LCapturesPerFrame, " // V4L Settings
    "Protocol, Method, Options, User, Pass, Host, Port, Path, SecondPath, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, RTSPDescribe, "
    "SaveJPEGs, VideoWriter, EncoderParameters,"
-   "OutputCodec, Encoder, OutputContainer, RecordAudio, WallClockTimestamps,"
+   "OutputCodecName, Encoder, OutputContainer, RecordAudio, WallClockTimestamps,"
    "Brightness, Contrast, Hue, Colour, "
    "EventPrefix, LabelFormat, LabelX, LabelY, LabelSize,"
    "ImageBufferCount, `MaxImageBufferCount`, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, "
@@ -565,8 +565,8 @@ void Monitor::Load(MYSQL_ROW dbrow, bool load_zones = true, Purpose p = QUERY) {
   encoderparams = dbrow[col] ? dbrow[col] : "";
   col++;
 
-  /*"`OutputCodec`, `Encoder`, `OutputContainer`, " */
-  output_codec = dbrow[col] ? atoi(dbrow[col]) : 0;
+  /*"`OutputCodecName`, `Encoder`, `OutputContainer`, " */
+  output_codec = dbrow[col] ? dbrow[col] : "auto";
   col++;
   encoder = dbrow[col] ? dbrow[col] : "";
   col++;

src/zm_monitor.h

@@ -609,7 +609,7 @@ class Monitor : public std::enable_shared_from_this<Monitor> {
   int             colours;
   VideoWriter     videowriter;
   std::string     encoderparams;
-  int             output_codec;
+  std::string     output_codec;
   std::string     encoder;
   std::string     encoder_hwaccel_name;
   std::string     encoder_hwaccel_device;
@@ -965,7 +965,7 @@ class Monitor : public std::enable_shared_from_this<Monitor> {
   const std::string &GetEncoderOptions() const { return encoderparams; }
   const std::string &EncoderHWAccelName() const { return encoder_hwaccel_name; }
   const std::string &EncoderHWAccelDevice() const { return encoder_hwaccel_device; }
-  int OutputCodec() const { return output_codec; }
+  const std::string &OutputCodec() const { return output_codec; }
   const std::string &Encoder() const { return encoder; }
   const std::string &OutputContainer() const { return output_container; }
 

src/zm_stream.cpp

@@ -51,7 +51,7 @@ bool StreamBase::initContexts(int in_width, int in_height, AVPixelFormat format,
 
   if (mJpegCodecContext) avcodec_free_context(&mJpegCodecContext);
 
-  std::list<const CodecData *>codec_data = get_encoder_data(AV_CODEC_ID_MJPEG, "");
+  std::list<const CodecData *>codec_data = get_encoder_data("mjpeg", "");
   if (!codec_data.size()) {
     Error("No codecs for mjpeg found");
     return false;