Convert OutputCodec from int to varchar OutputCodecName. ffmpeg has different values for codec_id for different versions of ffmpeg. So just use the codec name instead.

Author: connortechnology

db/zm_create.sql.in

@@ -559,7 +559,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

src/zm_monitor.cpp

@@ -94,7 +94,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`,"
@@ -359,7 +359,7 @@ Monitor::Monitor() :
    "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, "
@@ -550,8 +550,8 @@ void Monitor::Load(MYSQL_ROW dbrow, bool load_zones=true, Purpose p = QUERY) {
 
   Debug(3, "Decoding: %d savejpegs %d videowriter %d", decoding, savejpegs, videowriter);
 
-  /*"`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

@@ -537,7 +537,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;
@@ -847,7 +847,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_videostore.cpp

@@ -298,18 +298,9 @@ bool VideoStore::open() {
         }
       }  // end if extradata_entry
     } else if (monitor->GetOptVideoWriter() == Monitor::ENCODE) {
-      int wanted_codec = monitor->OutputCodec();
-      if (!wanted_codec) {
-        // default to h264
-        //Debug(2, "Defaulting to H264");
-        //wanted_codec = AV_CODEC_ID_H264;
-        // FIXME what is the optimal codec?  Probably low latency h264 which is effectively mjpeg
-      } else {
-        if (AV_CODEC_ID_H264 != 27 and wanted_codec > 3) {
-          // Older ffmpeg had AV_CODEC_ID_MPEG2VIDEO_XVMC at position 3 has been deprecated
-          wanted_codec += 1;
-        }
-        Debug(2, "Codec wanted %d %s", wanted_codec, avcodec_get_name((AVCodecID)wanted_codec));
+      std::string wanted_codec = monitor->OutputCodec();
+      if (wanted_codec.empty() or wanted_codec == "auto") {
+        Debug(2, "Codec wanted %s", wanted_codec.c_str());
       }
       std::string wanted_encoder = monitor->Encoder();
 
@@ -321,13 +312,8 @@ bool VideoStore::open() {
             continue;
           }
         }
-        if (wanted_codec and (codec_data[i].codec_id != wanted_codec)) {
-          Debug(1, "Not the right codec %d %s != %d %s",
-                codec_data[i].codec_id,
-                avcodec_get_name(codec_data[i].codec_id),
-                wanted_codec,
-                avcodec_get_name((AVCodecID)wanted_codec)
-               );
+        if ((!wanted_codec.empty() and wanted_codec != "auto") and (codec_data[i].codec_codec != wanted_codec)) {
+          Debug(1, "Not the right codec %s != %s", codec_data[i].codec_codec, wanted_codec.c_str());
           continue;
         }
 

version.txt

@@ -1 +1 @@
-1.37.69
+1.37.70

web/includes/Monitor.php

@@ -275,7 +275,7 @@ public static function getRTSP2WebStreamOptions() {
     'DecoderHWAccelDevice'  =>  null,
     'SaveJPEGs' =>  0,
     'VideoWriter' =>  '2',
-    'OutputCodec' =>  '0',
+    'OutputCodecName' =>  'auto',
     'Encoder'     =>  'auto',
     'OutputContainer' => null,
     'EncoderParameters' => '',

web/skins/classic/views/monitor.php

@@ -1145,13 +1145,13 @@ class="nav-link<?php echo ($tab == $name ? ' active' : '') . ' ' . (($name == 'z
               <label><?php echo translate('OutputCodec') ?></label>
 <?php
 $videowriter_codecs = array(
-  '0' => translate('Auto'),
-  '27' => 'h264',
-  '173' => 'h265/hevc',
-  '167' => 'vp9',
-  '226' => 'av1',
+  'auto' => translate('Auto'),
+  'h264' => 'h264',
+  'hevc' => 'h265/hevc',
+  'vp9' => 'vp9',
+  'av1' => 'av1',
 );
-echo htmlSelect('newMonitor[OutputCodec]', $videowriter_codecs, $monitor->OutputCodec());
+echo htmlSelect('newMonitor[OutputCodecName]', $videowriter_codecs, $monitor->OutputCodecName());
 ?>
             </li>
             <li class="Encoder">