Commit Graph

17266 Commits

Author SHA1 Message Date
Isaac Connor a440ab3ef0 need to copy parameters to codecpar 2020-12-27 12:04:17 -05:00
Isaac Connor 16662f79ce spacing and code stylez 2020-12-27 12:03:44 -05:00
Isaac Connor 57542b01d5 Remove all the scaling and conversion stuff. Use packet->decode. Set keyframe flag. return codes of functions are now -1 for failure, 0 for failure but no error and 1 for success. 2020-12-27 12:02:02 -05:00
Isaac Connor 7c9db96acc spacing and NULL=>nullptr 2020-12-27 12:01:01 -05:00
Isaac Connor 3f2d088f8c Delete image if image_index == -1 2020-12-27 12:00:45 -05:00
Isaac Connor 197f9bdd9e indenting fix. Don't update reference image if not doing motion detection. Decouple the image buffer from the packetqueue. So always allocate a new image. Then copy decoded image to image buffer if required. 2020-12-27 12:00:18 -05:00
Isaac Connor 63687c8e44 code style 2020-12-27 11:57:50 -05:00
Isaac Connor 61bffdb249 fix compiler warning 2020-12-27 11:57:23 -05:00
Isaac Connor 5624a0bef4 NULL->nullptr 2020-12-27 11:56:59 -05:00
Isaac Connor d6bbc9bbbb Set codec_type in ffmpeg_camera instead of in monitor 2020-12-27 11:56:44 -05:00
Isaac Connor 0521d05295 Can only output jpegs if we are doing decoding. 2020-12-27 11:55:53 -05:00
Isaac Connor 9b916a15a2 Only get ref image if we are doing motion detection. 2020-12-27 11:55:14 -05:00
Isaac Connor 48d9b4d5a5 Remove unused variables 2020-12-23 18:50:52 -05:00
Isaac Connor f934a6bbaf spacing and change last_fps_time and last_analysis_time to doubles 2020-12-23 18:50:38 -05:00
Isaac Connor 1ffc233593 Move some initialisation into MOnitor() initialisation. Update UpdateAnalysisFPS to use more doubles instead of integers to get better numbers. Move capture FPS updating to UpdateCaptureFPS and use doubles there too. remove some dead code and add some debugging 2020-12-23 18:50:07 -05:00
Isaac Connor 3893e97e94 Quieten compiler warnings 2020-12-23 18:18:30 -05:00
Isaac Connor ee8f940acf Add some debug 2020-12-23 18:18:16 -05:00
Isaac Connor 286a5a72a3 Merge branch 'master' into zma_to_thread 2020-12-23 09:47:31 -05:00
Isaac Connor fb2793d337 use nullptr instead of 0 when init'ing event 2020-12-23 09:11:33 -05:00
Andrew Bauer c497b94378 use tlzoom class to avoid conflict with thumbnail zoom 2020-12-23 07:57:44 -06:00
Andrew Bauer a9b92905ca eslint 2020-12-22 19:07:12 -06:00
Isaac Connor a1917d83d0 Merge branch 'master' into zma_to_thread 2020-12-22 19:52:09 -05:00
Andrew Bauer cc5a732103 continue work on timeline.js 2020-12-22 16:06:21 -06:00
Isaac Connor 6be9b294ef Hidden and hidden are two very different classes 2020-12-22 17:00:07 -05:00
Isaac Connor d6486d1a7e use nullptr instead of 0 when init'ing event 2020-12-22 15:44:07 -05:00
Andrew Bauer 8a26252914 update object detected link in events 2020-12-22 12:42:27 -06:00
Andrew Bauer 9af383db92 set the width style for the objdetect modal 2020-12-22 12:30:44 -06:00
Andrew Bauer 2ea4b39d93 don't use quotes around the event id 2020-12-22 11:46:31 -06:00
Andrew Bauer ee45916526 move objdetect image to a modal 2020-12-22 10:08:31 -06:00
Isaac Connor a231125fb3 Replace Download with a direct link to the mp4 like it used to be. Add back a Frames link 2020-12-22 10:23:44 -05:00
Isaac Connor 400e0de609 When updating Monitor_Status, reset FPS on Prime 2020-12-22 10:22:52 -05:00
Isaac Connor 4bea286cfe Use new get_event_start_packet_it function to start the new event with the right packet. 2020-12-22 10:22:28 -05:00
Isaac Connor 91057b9546 Clean up video_packet_count stuff. use packet_counts instead. Use more efficient logic for managing the # of video packets on the queue. Rewrite clearQueue to not use reverse iterators. Implement get_starting_packet to return an iterator to the packet that SHOULD start an event. So it takes into account pre_event_count and keyframe rules. 2020-12-22 10:20:44 -05:00
Isaac Connor d89cbebbdf AddPacket should just take a packet. score and alarm_image are members of the packet 2020-12-22 10:18:15 -05:00
Andrew Bauer cbe04674c5 remove non-existent id preview 2020-12-21 15:59:05 -06:00
Andrew Bauer d080109f4b eslint 2020-12-21 15:20:38 -06:00
Andrew Bauer 663748d9a7 partial replace mootools 2020-12-21 13:07:14 -06:00
Andrew Bauer 1f3fd93296 use setTimeout instead of mootools pass 2020-12-20 15:21:38 -06:00
Andrew Bauer 92361210ce eslint 2020-12-20 15:07:16 -06:00
Andrew Bauer 1d6c4664dc replace mootools in export 2020-12-20 10:54:18 -06:00
Andrew Bauer 0b569e7e37 replace mootools in control.js 2020-12-20 08:29:39 -06:00
Andrew Bauer 66ae2c0461 replace mootools request JSON 2020-12-20 07:59:17 -06:00
Andrew Bauer 2d5353a716
spelling 2020-12-19 15:10:17 -06:00
Andrew Bauer b352ed3269
Update multiserver.rst 2020-12-19 12:17:38 -06:00
Andrew Bauer 24d558b31a
spelling 2020-12-19 12:14:56 -06:00
Andrew Bauer 95d72a0794
Update multiserver.rst 2020-12-19 12:12:06 -06:00
Andrew Bauer 57b0a96dcf
Update multiserver.rst 2020-12-19 12:06:13 -06:00
Andrew Bauer abba77e54a
Update redhat.rst 2020-12-19 11:45:22 -06:00
Andrew Bauer 2e2205885f
Update redhat.rst 2020-12-19 11:43:50 -06:00
Andrew Bauer f68078cb1e
Update redhat.rst 2020-12-19 11:36:31 -06:00