Commit Graph

17775 Commits

Author SHA1 Message Date
Peter Keresztes Schmidt e09fa1bebf Remove includes of <cinttypes>
Instead of including <cinttypes> directly, zm_define.h should be used
to get the typedef'ed types as well.
2021-02-02 21:37:26 +01:00
Peter Keresztes Schmidt 0f5df0c739 zm: Typedef C++11 int types to make them easier to use
In order to clearly state the intended length of an integer variable
all usages of other integer types (short int, int, long int, ...)
should be converted.
2021-02-02 21:37:26 +01:00
Isaac Connor b35e27d0b6 Use decodeURIComponent instead of decodeURI 2021-02-02 09:12:34 -05:00
Isaac Connor 49d3e5ddbf decodeURI row.Message 2021-02-02 09:09:53 -05:00
Isaac Connor b6c258c41f Revert "add_stylesheet is deprecated. Use add_css_file instead"
Since we still use older sphinx we need to live with the deprecation warnings until we can figure out a way to support old and new.

This reverts commit 84d9d363c9.
2021-02-02 08:24:32 -05:00
Isaac Connor 105eff7a21 Remove references to zma 2021-02-01 17:29:16 -05:00
Isaac Connor 49209d9e72 populate mid if specified to enable reusing mids. Fix auto-populating resolution dropdown 2021-02-01 16:45:13 -05:00
Isaac Connor 0dc6b60985 Use new insert function to allow re-use of monitor Ids 2021-02-01 16:44:41 -05:00
Isaac Connor 50e5f84df2 introduce insert function to be used when we want specifically to insert a db record instead of being smart about update/insert. 2021-02-01 16:44:04 -05:00
Isaac Connor da7d9c3756 Add default for Monitor Name 2021-02-01 16:43:24 -05:00
Isaac Connor b71aa4bd97 Fix never allowing the queue to fill when pre_event_count=0 2021-02-01 16:01:30 -05:00
Isaac Connor a5417cfe6c NULL=>nullptr. Update analysis_fps earlier on startup 2021-02-01 16:01:09 -05:00
Isaac Connor aa53260a32 Free packet counts and iterators in destructor. Fix mem leak in queuePacket. Introduce free_it method to release iterators 2021-02-01 10:25:48 -05:00
Isaac Connor 0676c7cfb4 Use packetqueue::free_it to release iterators 2021-02-01 10:24:58 -05:00
Isaac Connor 08a498ef6a Convert packetqueue from a pointer to a packetqueue to a member packetqueue that is always available. 2021-01-31 21:31:33 -05:00
Isaac Connor a0722b3782 stop thread 2021-01-31 21:31:33 -05:00
Isaac Connor fdadacac6c set packet.size and data because av_init_packet don't do that 2021-01-31 21:31:33 -05:00
Isaac Connor dd57d05f40 Convert packetqueue from a pointer to a packetqueue to a member packetqueue that is always available. Add methods to set packetqueue parameters. Emptying the queue is now in packetqueue::clear() 2021-01-31 21:31:33 -05:00
Andrew Bauer c55b80beab rpmspecfile - generate ssl cert for both apache and nginx 2021-01-31 16:14:39 -06:00
Isaac Connor 49cf55c22c Put close back before joins 2021-01-31 12:39:06 -05:00
Isaac Connor e08060af3f Free linked monitors 2021-01-31 11:57:43 -05:00
Isaac Connor a3fe577fc6 Fix margin in ptz buttons 2021-01-31 11:45:11 -05:00
Isaac Connor 4bcefe0562 Add a 10 second wait to force alarm on. If the monitor doesn't notice it is likely not running, leaving an mmap behind 2021-01-31 11:44:58 -05:00
Isaac Connor 14c06cd2d4 Close monitor after terminating threads instead of before 2021-01-31 11:44:25 -05:00
Isaac Connor e237719d6a Delete frame queue on stop 2021-01-31 11:43:16 -05:00
Isaac Connor b83becd856 spacing 2021-01-31 11:43:03 -05:00
Isaac Connor 0fb7cb935f Fix skipping over the head packet when deleting packets. 2021-01-31 11:42:51 -05:00
Isaac Connor ee5d5e3cab wrap fps text in another div to make the title easier to bring up and include the word fps 2021-01-31 10:19:10 -05:00
Isaac Connor 69b9e40b59 Fix textstatus=>textStatus 2021-01-31 10:09:22 -05:00
Isaac Connor e084780123 Remove no longer used pre_event buffer and event_delete_thread 2021-01-31 10:09:03 -05:00
Isaac Connor 00114d32bc Minor code improvements ostly just being more specific about parenthesis 2021-01-30 20:35:10 -05:00
Isaac Connor b47d2428da Minor code, debugging improvements 2021-01-30 20:34:39 -05:00
Isaac Connor 5fc52ae6df Handle iterator pointing to end 2021-01-30 20:34:09 -05:00
Isaac Connor 9ef9fe81fa Don't log error when flushing queues 2021-01-30 14:05:19 -05:00
Isaac Connor b93aab6a11 turn off hwtransfer direct to image. Too compliated for now with not enough benefit 2021-01-30 12:34:29 -05:00
Isaac Connor 4ba939e267 role=tabList needs to be role=tablist 2021-01-29 20:37:55 -05:00
Isaac Connor 927d11a6a4 Fix tags not allowed under ul 2021-01-29 20:37:34 -05:00
Isaac Connor ac88567ee2 fix 2021-01-29 17:32:22 -05:00
Isaac Connor 5581cdafb6 must increment iterators in the packetqueue lock 2021-01-29 17:30:39 -05:00
Isaac Connor 95d2b1518e Don't treat send_frame null as errors. We are ni flushing mode 2021-01-29 17:07:58 -05:00
Isaac Connor dbad734414 Just include zm_ffmpeg.h 2021-01-29 15:49:53 -05:00
Isaac Connor d0f307101b Report on finding live555 libs 2021-01-29 15:49:40 -05:00
Isaac Connor b812e0d484 It is necessary to prefer the image in the packet to in_frame as it has been timestamped etc 2021-01-29 15:37:51 -05:00
Isaac Connor 292e1b4c9e Set stream time_base to Q. Set PTS/DTS of packets to current time 2021-01-29 15:37:23 -05:00
Isaac Connor c444e5cf07 spacing 2021-01-29 14:05:04 -05:00
Isaac Connor fea2ea37e5 Cleanup unused first/start/last pts/dts 2021-01-29 14:04:50 -05:00
Isaac Connor a7d05613b5 When using remote RTSP need to set videoStream parameters 2021-01-29 14:04:21 -05:00
Isaac Connor 5f7f066a4f Better to alloc context with codec 2021-01-29 14:03:48 -05:00
Isaac Connor ec1a7ec427 scale the event width when calculating if the stats table will fit 2021-01-29 14:03:12 -05:00
Isaac Connor 63a6bdaac1 spacing 2021-01-29 09:53:48 -05:00