feec631ca5
Only save updated DiskSpace if event is finished
2021-03-15 15:02:43 -04:00
671d58f0d0
bump version and put back ZM_MIN_RTSP_PORT setting
2021-01-26 12:35:17 -05:00
c8392feba3
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
2020-10-22 16:35:44 -04:00
10c0a6617c
Return Debug to a regular function to match other logging functions. Since we switched to using namespaces we no longer clash with cake_php.
2020-10-14 10:39:25 -04:00
a118e52f30
Add 2>&1 to ffmpeg command line to get stderr as well
2020-09-28 16:13:06 -04:00
921c4c5bbd
don't return mp4 if objdetect is used
2020-03-14 15:00:33 -04:00
4342506e5b
fix media type allocations
2020-03-14 14:24:39 -04:00
4d5f9f7de0
add back gif, make nomenclature consistent of objdetect_subtypes
2020-03-14 14:18:25 -04:00
9a31d545d4
replace GIF function with MP4
2020-03-14 08:08:52 -04:00
49f23cb35b
Added options to render objdetect, objdetectanim and objdetectimage
2020-03-10 13:51:55 -04:00
38b519c8a6
better error log
2020-03-09 15:58:57 -04:00
6bc8012e04
add support to render gif image that may be created by object detection
2020-03-09 15:56:34 -04:00
c465fa55d8
Use ZM_PATH_FFMPEG instead of ffmpeg
2020-02-06 13:22:22 -05:00
e0d085d187
CHeck for existence of snapshot.jpg or alarm.jpg instead of hitting the database.
2019-10-30 16:57:45 -04:00
12dfcae81f
remove debug
2019-10-21 13:19:20 -04:00
a2861c1361
remove errant (
2019-09-28 14:22:40 -04:00
7cab22b450
Use Event->SaveJPEGs instead of Monitor->SaveJPEGs
2019-08-26 15:04:59 -04:00
79de2b65cd
If we are saving jpegs we don't save a snapshot image, and since we may delay writing frame info to the db, we have to default to frame 0 instead of snapshot
2019-04-04 12:18:46 -04:00
5098329d94
remove ob_clean stuff which logs errors when output buffering is turned off ( #2395 )
...
* remove ob_clean stuff which logs errors when output buffering is turned off.
* Don't ob_clean because if buffering is off php will output an error
2019-02-22 09:58:16 -05:00
8dd8888975
Php namespace ( #2537 )
...
* experiment with namespaces on the Server class
* experiment with namespaces on the Server class
* Implement the ZM namespace on objects
* Implement the ZM namespace on objects
* Implement the ZM namespace on objects
2019-02-22 09:19:07 -05:00
9a0f3801de
fix + instead of .
2019-02-12 16:25:31 -05:00
5ce681b463
instantiate a false Frame object with id = objectect
2019-02-11 16:37:22 -05:00
5a924ab176
cleanup redundant code and spacing
2019-02-11 16:29:19 -05:00
2dc935b488
added object detection frame rendering ( #2505 )
2019-02-08 13:49:00 -05:00
dea64320f0
Fix a + that should be a .
2019-01-04 15:52:14 -05:00
01a57222d3
keep track if we have written alarmed frame incase savejpeg is off
2018-11-12 12:43:20 -05:00
9938346752
Merge branch 'master' of github.com:/ZoneMinder/ZoneMinder
2018-10-22 16:14:36 -04:00
f4ddc0fe9b
ob_clcean and flush break outputting the image
2018-10-22 16:13:12 -04:00
a76e33bd48
rough in for alarmed frame retrieval ( #2248 )
...
* rough in for alarmed frame retrieval
* add sorting
2018-10-11 10:07:56 -04:00
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
b4e0cb5eab
WHen we are storing jpgs we don't generate a snapshot, so handle that
2018-06-06 11:41:28 -04:00
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
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
8b165c34b0
Handle event and frame no found earlier
2018-04-20 14:25:54 -04:00
842a42bcd5
test for existence of mp4 before trying to grab images from it
2018-03-28 13:01:58 -07:00
de08e3114e
more and less debug
2018-01-23 18:16:37 +01:00
6d02c88db9
Don't round percentage in bulkframes
...
Gives more accurate frame delta.
2017-11-16 12:48:04 -05:00
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
8086b6e0a5
whitespace
2017-11-11 14:49:42 -05:00
59e50bbbef
Update DiskSpace when we create jpg's
2017-10-23 17:04:02 -07:00
a836dd5ab3
UPdate DiskSpace when creating frame images from the mp4
2017-10-23 10:55:24 -07:00
9b809c357b
Fix Bulk frame calculations
2017-10-17 11:53:34 -07:00
e31e106612
fix loading virtual frame from bulk frames
2017-10-17 10:09:30 -07:00
7ceeef55fc
rough in figuring out a frame in between bulk frames
2017-10-16 15:16:19 -04:00
7f50a13074
add Event disk space recalc to zmaudit
2017-10-10 12:11:59 -07:00
2da374bfb1
log the command as well as output and return values
2017-05-18 14:43:17 -04:00
c125d22d4d
Fix Debug to Logger::Debug
2017-05-18 12:49:59 -04:00
7d6505f015
use Delta to grab frame from video, using -ss for speed
2017-04-12 16:17:19 -04:00
d462dfdb77
fix error message when fid not specified
2017-04-07 13:20:54 -04:00
cee05a1bb7
fix merge problem
2017-02-02 09:21:49 -05:00
Isaac Connor
Pliable Pixels
Isaac Connor
Isaac Connor
Pliable Pixels
Isaac Connor
Isaac
digital-gnome
Isaac Connor