Isaac Connor
|
d1b3b23c09
|
Merge branch 'master' into storageareas
|
2019-02-13 09:42:03 -05:00 |
|
Isaac Connor
|
9a0f3801de
|
fix + instead of .
|
2019-02-12 16:25:31 -05:00 |
|
Isaac Connor
|
5ce681b463
|
instantiate a false Frame object with id = objectect
|
2019-02-11 16:37:22 -05:00 |
|
Isaac Connor
|
5a924ab176
|
cleanup redundant code and spacing
|
2019-02-11 16:29:19 -05:00 |
|
Isaac Connor
|
555cb4780d
|
Merge branch 'master' into storageareas
|
2019-02-10 12:37:45 -05:00 |
Pliable Pixels
|
2dc935b488
|
added object detection frame rendering (#2505)
|
2019-02-08 13:49:00 -05:00 |
|
Isaac Connor
|
8eb61b1c11
|
Merge branch 'master' into storageareas
|
2019-01-05 10:16:38 -05:00 |
|
Isaac Connor
|
dea64320f0
|
Fix a + that should be a .
|
2019-01-04 15:52:14 -05:00 |
|
Isaac Connor
|
0bfe1007c8
|
Merge branch 'master' into storageareas
|
2018-12-14 10:16:08 -05:00 |
Pliable Pixels
|
01a57222d3
|
keep track if we have written alarmed frame incase savejpeg is off
|
2018-11-12 12:43:20 -05:00 |
|
Isaac Connor
|
ca8770bd5a
|
Merge branch 'fix_rce' into storageareas
|
2018-10-24 10:17:16 -04:00 |
Isaac Connor
|
9938346752
|
Merge branch 'master' of github.com:/ZoneMinder/ZoneMinder
|
2018-10-22 16:14:36 -04:00 |
|
Isaac Connor
|
f4ddc0fe9b
|
ob_clcean and flush break outputting the image
|
2018-10-22 16:13:12 -04:00 |
|
Isaac Connor
|
7149576a7c
|
Merge branch 'smarter_packetqueue' into storageareas
|
2018-10-15 10:59:50 -04:00 |
|
Pliable Pixels
|
a76e33bd48
|
rough in for alarmed frame retrieval (#2248)
* rough in for alarmed frame retrieval
* add sorting
|
2018-10-11 10:07:56 -04:00 |
|
Isaac Connor
|
9c437b0303
|
Merge branch 'add_export_to_filter' into storageareas
|
2018-09-25 14:35:19 -04:00 |
|
Isaac Connor
|
5dba17e1fc
|
Merge branch 'master' into storageareas
|
2018-09-21 10:50:10 -04:00 |
Andrew Bauer
|
347c0d2ae4
|
fix whitespace
|
2018-09-20 13:41:13 -05:00 |
|
Andrew Bauer
|
ac9129b632
|
fix corrupted export downloads
|
2018-09-20 13:36:52 -05:00 |
|
Isaac Connor
|
40292f3dad
|
Add Compression flag
|
2018-09-07 09:08:33 -04:00 |
|
Isaac Connor
|
d5cab088d6
|
Merge branch 'master' into add_export_to_filter
|
2018-09-05 10:33:10 -04:00 |
|
Isaac Connor
|
2858564155
|
Merge branch 'master' into storageareas
|
2018-08-31 16:06:13 -04:00 |
|
Isaac Connor
|
798aab84f3
|
whitespace changes
|
2018-08-31 11:58:33 -04:00 |
|
Isaac Connor
|
57d5e28870
|
clear output buffer before sending image. Adjust filename for saveAs when doing a scaled image. whitespace corrections. More Debug output
|
2018-08-31 11:57:47 -04:00 |
|
Isaac Connor
|
62946578c6
|
Use to determine export filename
|
2018-07-09 12:02:05 -04:00 |
|
Isaac Connor
|
b4e0cb5eab
|
WHen we are storing jpgs we don't generate a snapshot, so handle that
|
2018-06-06 11:41:28 -04:00 |
Isaac
|
337db8bb18
|
Include Content-Length so we get a download progress
|
2018-05-18 15:52:30 +02:00 |
|
Isaac Connor
|
bb76079d54
|
fix logic when snapshot.jpg doesn't exist. We need an actual frame, to get a Delta to tell ffmpeg which frame to use. So load the Frame with Score=MaxScore
|
2018-05-11 10:37:00 -04:00 |
|
Isaac Connor
|
230a59cd8e
|
fix case where it wouldn't generate the snapshot.jpg because we hadn't specified whether to show a capture or analysis image
|
2018-05-11 09:53:24 -04:00 |
|
Isaac Connor
|
8b165c34b0
|
Handle event and frame no found earlier
|
2018-04-20 14:25:54 -04:00 |
Isaac Connor
|
842a42bcd5
|
test for existence of mp4 before trying to grab images from it
|
2018-03-28 13:01:58 -07:00 |
Isaac
|
e364a541d4
|
Whitespace and use ZM_DIR_EXPORT instead of ZM_DIR_TMP
|
2018-01-24 22:21:43 +01:00 |
|
Isaac
|
de08e3114e
|
more and less debug
|
2018-01-23 18:16:37 +01:00 |
digital-gnome
|
4f5677eb3b
|
Remove time limit from archive download for exceptionally large files
|
2017-12-03 14:42:08 -05:00 |
Isaac Connor
|
6eb542f0e2
|
Merge branch 'storageareas' into LookandFeel
|
2017-11-20 20:19:27 -05:00 |
|
digital-gnome
|
6d02c88db9
|
Don't round percentage in bulkframes
Gives more accurate frame delta.
|
2017-11-16 12:48:04 -05:00 |
|
Isaac Connor
|
bc3f169a80
|
add event_id as a paramteter
|
2017-11-13 11:51:54 -08:00 |
|
digital-gnome
|
5283f778c5
|
Fix virtual/bulk frame calculation
Previously bulk frames wouldn't calculate at the start and end of bulk frame collection. Also the calculation for percent was inaccurate.
|
2017-11-11 14:49:42 -05:00 |
|
digital-gnome
|
8086b6e0a5
|
whitespace
|
2017-11-11 14:49:42 -05:00 |
|
Isaac Connor
|
59e50bbbef
|
Update DiskSpace when we create jpg's
|
2017-10-23 17:04:02 -07:00 |
|
Isaac Connor
|
a836dd5ab3
|
UPdate DiskSpace when creating frame images from the mp4
|
2017-10-23 10:55:24 -07:00 |
Isaac Connor
|
9b809c357b
|
Fix Bulk frame calculations
|
2017-10-17 11:53:34 -07:00 |
|
Isaac Connor
|
e31e106612
|
fix loading virtual frame from bulk frames
|
2017-10-17 10:09:30 -07:00 |
|
Isaac Connor
|
7ceeef55fc
|
rough in figuring out a frame in between bulk frames
|
2017-10-16 15:16:19 -04:00 |
|
Isaac Connor
|
7f50a13074
|
add Event disk space recalc to zmaudit
|
2017-10-10 12:11:59 -07:00 |
|
Isaac Connor
|
cfbfc0dd44
|
Merge branch 'master' into storageareas
|
2017-07-21 11:04:32 -04:00 |
|
Andrew Bauer
|
89bcfc4e28
|
fix incorrect gpl license text mailing address
|
2017-07-14 10:39:50 -05:00 |
|
Isaac Connor
|
b6ed806d6c
|
braces and comments
|
2017-05-30 13:51:00 -04:00 |
|
Isaac Connor
|
8b3b9eb30e
|
more merges/fixes from SA
|
2017-05-30 13:47:30 -04:00 |
|
Isaac Connor
|
2da374bfb1
|
log the command as well as output and return values
|
2017-05-18 14:43:17 -04:00 |