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 |
Pliable Pixels
|
2dc935b488
|
added object detection frame rendering (#2505)
|
2019-02-08 13:49:00 -05:00 |
|
Isaac Connor
|
dea64320f0
|
Fix a + that should be a .
|
2019-01-04 15:52:14 -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
|
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 |
|
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
|
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
|
b4e0cb5eab
|
WHen we are storing jpgs we don't generate a snapshot, so handle that
|
2018-06-06 11:41:28 -04: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
|
de08e3114e
|
more and less debug
|
2018-01-23 18:16:37 +01:00 |
digital-gnome
|
6d02c88db9
|
Don't round percentage in bulkframes
Gives more accurate frame delta.
|
2017-11-16 12:48:04 -05: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
|
2da374bfb1
|
log the command as well as output and return values
|
2017-05-18 14:43:17 -04:00 |
|
Isaac Connor
|
c125d22d4d
|
Fix Debug to Logger::Debug
|
2017-05-18 12:49:59 -04:00 |
|
Isaac Connor
|
7d6505f015
|
use Delta to grab frame from video, using -ss for speed
|
2017-04-12 16:17:19 -04:00 |
|
Isaac Connor
|
d462dfdb77
|
fix error message when fid not specified
|
2017-04-07 13:20:54 -04:00 |
|
Isaac Connor
|
cee05a1bb7
|
fix merge problem
|
2017-02-02 09:21:49 -05:00 |
|
Isaac Connor
|
7ab6818fa0
|
Merge branch 'sanitize_image_path' of https://github.com/knnniggett/ZoneMinder into storageareas_sanitize
|
2017-01-25 17:14:30 -05:00 |
Andrew Bauer
|
dbd73690b2
|
use !== false rather than === true
|
2017-01-25 09:26:07 -06:00 |
|
Andrew Bauer
|
6189d2670c
|
ZM_DIR_EVENTS can be, and often is, a symlink
|
2017-01-25 09:05:34 -06:00 |
|
Andrew Bauer
|
8b19fca992
|
sanitize the image path before processing
|
2017-01-25 08:30:19 -06:00 |
|
Isaac Connor
|
2ce4bad39b
|
fix Event being undefined when called by path
|
2017-01-13 14:42:10 -05:00 |
|
Isaac Connor
|
5ae34a7561
|
Merge branch 'master' into storageareas
|
2017-01-02 09:39:10 -05:00 |
Andy Bauer
|
254fcbcef7
|
update gpl 2 mailing address in source files
|
2016-12-26 09:23:16 -06:00 |
Isaac Connor
|
6bf921a858
|
Add thumbnanils to the frames view. Also add a content-disposition header and some url mangling to help browsers give a useful filename when doing Save Image As
|
2016-11-21 12:28:15 -05:00 |
|
Isaac Connor
|
67e14bd12f
|
move States loading code into state view where it belongs. Move runnign check into specific places where it is needed. These changes reduce events list load time by about 4 seconds for me.
|
2016-10-20 13:16:50 -04:00 |
|
Isaac Connor
|
cb88b984c7
|
fix capt -> capture and some suspicious sprintf formatting and double quotes to single quotes
|
2016-10-20 12:01:25 -04:00 |
|
Isaac Connor
|
cf9fa78ca3
|
work on fixing event view
|
2016-09-29 09:28:48 -04:00 |
|
Isaac Connor
|
3dcc1c3697
|
fix php outputting extra newlines after content
|
2016-09-22 10:37:32 -04:00 |
|
Isaac Connor
|
364a80fb94
|
don't output jpeg header unless there is some kind of success
|
2016-09-20 15:55:28 -04:00 |
|
Isaac Connor
|
19d46c2d09
|
Merge branch 'master' into storageareas
|
2016-08-15 10:45:50 -04:00 |
|
Isaac Connor
|
bcb7dd1ba4
|
take optional show= to specify the analyse image or the capture image
|
2016-08-12 15:16:05 -04:00 |
|
Isaac Connor
|
e4566f2e8e
|
Merge branch 'update_image_view' into storageareas
|
2016-05-16 12:23:19 -04:00 |
|
Isaac Connor
|
ed3e975e5a
|
take fid and eid as alternate parameters
|
2016-05-12 11:55:48 -04:00 |
|
Isaac Connor
|
df960bb1ea
|
rework image.php view to properly handle fid being the FrameId instead of fid. Fix scaling.
|
2016-05-05 14:49:40 -04:00 |
|
Isaac Connor
|
240d08133d
|
implement caching of scaled images.
|
2016-05-02 14:12:30 -04:00 |
|
Isaac Connor
|
b8c8ff3807
|
fix if structuring
|
2016-05-02 13:36:19 -04:00 |