Isaac Connor
|
64deff7486
|
include std::string don't include zm_video.h. Remove old videoWriter references
|
2020-12-30 21:22:33 -05:00 |
|
Isaac Connor
|
00aae0b68f
|
Use proper c++ initializers
|
2020-12-30 21:21:59 -05:00 |
|
Isaac Connor
|
019f02e9de
|
remove old sigblocking code
|
2020-12-30 21:21:41 -05:00 |
|
Isaac Connor
|
db8fead52b
|
Add more encoder options
|
2020-12-29 12:18:57 -05:00 |
|
Isaac Connor
|
284b9f963f
|
Merge branch 'master' into zma_to_thread
|
2020-12-29 12:18:26 -05:00 |
|
Isaac Connor
|
dc487f35a9
|
set packet codec_type
|
2020-12-27 12:36:33 -05:00 |
|
Isaac Connor
|
9be7547c8b
|
Look at stream index instead of image_index when finding first keyframe in packetqueue
|
2020-12-27 12:32:46 -05:00 |
|
Isaac Connor
|
e58c06e60f
|
Don't need keyframes when saving jpegs.
|
2020-12-27 12:32:06 -05:00 |
|
Isaac Connor
|
af94473eb1
|
remove debug lines about nalType=1
|
2020-12-27 12:25:23 -05:00 |
|
Isaac Connor
|
085d83b250
|
frames are allocated in zm_packet now, so remove them
|
2020-12-27 12:24:34 -05:00 |
|
Isaac Connor
|
c8d2eb9c0f
|
Must stop threads before Closing monitor
|
2020-12-27 12:04:35 -05:00 |
|
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
|
a362f2abc2
|
Merge pull request #3102 from connortechnology/fix_3101
fix api monitor save daemon control
|
2020-12-25 13:29:01 -05:00 |
Andrew Bauer
|
2adeedf418
|
additional mootools cleanup in event.js
|
2020-12-25 07:19:41 -06:00 |
|
Andrew Bauer
|
9209f40daa
|
eslint
|
2020-12-24 14:59:27 -06:00 |
|
Andrew Bauer
|
5fa8cbf158
|
add Frames button to event view
|
2020-12-24 14:46:13 -06:00 |
|
Andrew Bauer
|
3fd50bb01d
|
reorganize logger.js and use jquery
|
2020-12-24 14:32:23 -06:00 |
|
Andrew Bauer
|
e66b050c72
|
WIP jquery conversion of event view
|
2020-12-24 10:38:44 -06:00 |
|
Isaac Connor
|
ddf66bc9b5
|
Merge pull request #3100 from vertigeaux/share_frame_scores
save frame scores to SharedData for use with linked monitors
|
2020-12-24 11:08:25 -05:00 |
|
Andrew Bauer
|
b093e99688
|
disable click to select on the events table Cause column
|
2020-12-24 07:10:47 -06: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
|
3132820a71
|
Move daemonControl logic into the model. daemonControl needs to be called on the previous monitor data so that it knows which daemons to stop.
|
2020-12-23 13:48:12 -05:00 |
|
Andrew Bauer
|
816c306518
|
use jquery for submitTab
|
2020-12-23 12:29:39 -06:00 |
|
Andrew Bauer
|
a94550795b
|
update setButtonState
|
2020-12-23 12:20:31 -06:00 |
|
Andrew Bauer
|
f64f3262ed
|
WIP replace mootools in evnet.js
|
2020-12-23 12:19:35 -06:00 |
|
Andrew Bauer
|
f857d12103
|
WIP replace mootools in event.js
|
2020-12-23 10:51:23 -06:00 |
|
Andrew Bauer
|
493bfa6a16
|
eslint
|
2020-12-23 09:15:31 -06:00 |
|
Andrew Bauer
|
3c79204592
|
replace mootools in add_monitors
|
2020-12-23 08:54:11 -06:00 |
|
Isaac Connor
|
286a5a72a3
|
Merge branch 'master' into zma_to_thread
|
2020-12-23 09:47:31 -05:00 |
|
Andrew Bauer
|
c91a0b2c09
|
fixup jquery click functions
|
2020-12-23 08:37:28 -06: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 |
Vertigeaux
|
1416cbb03c
|
save frame scores to SharedData for use with linked monitors
|
2020-12-22 17:44:53 -06:00 |