diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp index c7e2e3f89..249e86cfb 100644 --- a/src/zm_monitor.cpp +++ b/src/zm_monitor.cpp @@ -101,7 +101,7 @@ std::string load_monitor_sql = "`ImageBufferCount`, `MaxImageBufferCount`, `WarmupCount`, `PreEventCount`, " "`PostEventCount`, `StreamReplayBuffer`, `AlarmFrameCount`, " "`SectionLength`, `SectionLengthWarn`, `MinSectionLength`, `EventCloseMode`+0, " - "`FrameSkip`, `MotionFrameSkip`, " + "`MotionFrameSkip`, " "`FPSReportInterval`, `RefBlendPerc`, `AlarmRefBlendPerc`, `TrackMotion`, `Exif`, " "`Latitude`, `Longitude`, " "`RTSPServer`, `RTSPStreamName`, `SOAP_wsa_compl`, `ONVIF_Alarm_Text`," @@ -245,7 +245,6 @@ Monitor::Monitor() : min_section_length(0), startstop_on_section_length(false), adaptive_skip(false), - frame_skip(0), motion_frame_skip(0), analysis_fps_limit(0), analysis_update_delay(0), @@ -618,7 +617,7 @@ void Monitor::Load(MYSQL_ROW dbrow, bool load_zones=true, Purpose p = QUERY) { packetqueue.setMaxVideoPackets(max_image_buffer_count); packetqueue.setKeepKeyframes((videowriter == PASSTHROUGH) && (recording != RECORDING_NONE)); - /* "SectionLength, SectionLengthWarn, MinSectionLength, EventCloseMode, FrameSkip, MotionFrameSkip, " */ + /* "SectionLength, SectionLengthWarn, MinSectionLength, EventCloseMode, MotionFrameSkip, " */ section_length = Seconds(atoi(dbrow[col])); col++; section_length_warn = dbrow[col] ? atoi(dbrow[col]) : false; @@ -661,8 +660,6 @@ void Monitor::Load(MYSQL_ROW dbrow, bool load_zones=true, Purpose p = QUERY) { event_close_mode = CLOSE_IDLE; } - frame_skip = atoi(dbrow[col]); - col++; motion_frame_skip = atoi(dbrow[col]); col++; diff --git a/src/zm_monitor.h b/src/zm_monitor.h index 5626f079d..9bb63c464 100644 --- a/src/zm_monitor.h +++ b/src/zm_monitor.h @@ -625,7 +625,6 @@ class Monitor : public std::enable_shared_from_this { Seconds min_section_length; // Minimum event length when using event_close_mode == ALARM bool startstop_on_section_length; // Whether to start/stop events on time % section_length bool adaptive_skip; // Whether to use the newer adaptive algorithm for this monitor - int frame_skip; // How many frames to skip in continuous modes int motion_frame_skip; // How many frames to skip in motion detection double analysis_fps_limit; // Target framerate for video analysis Microseconds analysis_update_delay; // How long we wait before updating analysis parameters diff --git a/web/skins/classic/views/js/monitor.js.php b/web/skins/classic/views/js/monitor.js.php index b90763a85..5a75a5185 100644 --- a/web/skins/classic/views/js/monitor.js.php +++ b/web/skins/classic/views/js/monitor.js.php @@ -162,8 +162,6 @@ function validateForm(form) { errors[errors.length] = ""; if ( !form.elements['newMonitor[FPSReportInterval]'].value || !(parseInt(form.elements['newMonitor[FPSReportInterval]'].value) >= 0 ) ) errors[errors.length] = ""; - if ( !form.elements['newMonitor[FrameSkip]'].value || !(parseInt(form.elements['newMonitor[FrameSkip]'].value) >= 0 ) ) - errors[errors.length] = ""; if ( !form.elements['newMonitor[MotionFrameSkip]'].value || !(parseInt(form.elements['newMonitor[MotionFrameSkip]'].value) >= 0 ) ) errors[errors.length] = ""; if ( form.elements['newMonitor[Type]'].value == 'Local' ) diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php index 75b59d924..54b9d7460 100644 --- a/web/skins/classic/views/monitor.php +++ b/web/skins/classic/views/monitor.php @@ -1591,11 +1591,6 @@ echo htmlSelect('newMonitor[ReturnLocation]', $return_options, $monitor->ReturnL translate('System'), 'time'=>translate('Time'), 'duration'=>translate('Duration'), 'idle'=>translate('Idle'), 'alarm'=>translate('Alarm')], $monitor->EventCloseMode()); ?> When continuous events are closed. (?) -
  • - - - -