ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spacing and change last_fps_time and last_analysis_time to doubles

This commit is contained in:
Isaac Connor 2020-12-23 18:50:38 -05:00
parent 1ffc233593
commit f934a6bbaf
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/zm_monitor.h
View File

@ -325,31 +325,23 @@ protected:
int capture_max_fps; int capture_max_fps;
Purpose purpose; // What this monitor has been created to do
unsigned int last_camera_bytes; unsigned int last_camera_bytes;
Image delta_image;
Image ref_image;
Image alarm_image; // Used in creating analysis images, will be initialized in Analysis
Image write_image; // Used when creating snapshot images
std::string diag_path_ref;
std::string diag_path_delta;
Purpose purpose; // What this monitor has been created to do
int event_count; int event_count;
int image_count; int image_count;
int analysis_image_count; int analysis_image_count; // How many frames have been processed by analysis thread.
int motion_frame_count; // How many frames have had motion detection performed on them.
int ready_count; int ready_count;
int first_alarm_count; int first_alarm_count;
int last_alarm_count; int last_alarm_count;
bool last_signal; bool last_signal;
int last_section_mod; int last_section_mod;
int buffer_count; int buffer_count;
int prealarm_count;
State state; State state;
time_t start_time; time_t start_time;
time_t last_fps_time; double last_fps_time;
time_t last_analysis_fps_time; double last_analysis_fps_time;
time_t auto_resume_time; time_t auto_resume_time;
unsigned int last_motion_score; unsigned int last_motion_score;
@ -393,6 +385,13 @@ protected:
std::vector<Group *> groups; std::vector<Group *> groups;
Image delta_image;
Image ref_image;
Image alarm_image; // Used in creating analysis images, will be initialized in Analysis
Image write_image; // Used when creating snapshot images
std::string diag_path_ref;
std::string diag_path_delta;
public: public:
explicit Monitor(); explicit Monitor();
explicit Monitor(unsigned int p_id); explicit Monitor(unsigned int p_id);
@ -492,6 +491,7 @@ public:
uint64_t GetLastEventId() const; uint64_t GetLastEventId() const;
double GetFPS() const; double GetFPS() const;
void UpdateAnalysisFPS(); void UpdateAnalysisFPS();
void UpdateCaptureFPS();
void ForceAlarmOn( int force_score, const char *force_case, const char *force_text="" ); void ForceAlarmOn( int force_score, const char *force_case, const char *force_text="" );
void ForceAlarmOff(); void ForceAlarmOff();
void CancelForced(); void CancelForced();