ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,840 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

144 Commits

Author SHA1 Message Date
Isaac Connor d99ec696b4 reorganize to reduce code depth 2020-04-10 12:21:53 -04:00
Isaac Connor 571ff260cc Merge branch 'release-1.34' 2020-04-04 16:35:09 -04:00
Isaac Connor 5d72e3b1b5 ensure no output buffering when downloading an archive. 2020-04-03 15:33:28 -04:00
Pliable Pixels 921c4c5bbd don't return mp4 if objdetect is used 2020-03-14 15:00:33 -04:00
Pliable Pixels 4342506e5b fix media type allocations 2020-03-14 14:24:39 -04:00
Pliable Pixels 4d5f9f7de0 add back gif, make nomenclature consistent of objdetect_subtypes 2020-03-14 14:18:25 -04:00
Pliable Pixels 9a31d545d4 replace GIF function with MP4 2020-03-14 08:08:52 -04:00
Pliable Pixels 49f23cb35b Added options to render objdetect, objdetectanim and objdetectimage 2020-03-10 13:51:55 -04:00
Pliable Pixels 38b519c8a6 better error log 2020-03-09 15:58:57 -04:00
Pliable Pixels 6bc8012e04 add support to render gif image that may be created by object detection 2020-03-09 15:56:34 -04:00
Isaac Connor c465fa55d8 Use ZM_PATH_FFMPEG instead of ffmpeg 2020-02-06 13:22:22 -05:00
Isaac Connor e0d085d187 CHeck for existence of snapshot.jpg or alarm.jpg instead of hitting the database. 2019-10-30 16:57:45 -04:00
Isaac Connor 12dfcae81f remove debug 2019-10-21 13:19:20 -04:00
Isaac Connor a2861c1361 remove errant ( 2019-09-28 14:22:40 -04:00
Isaac Connor 7cab22b450 Use Event->SaveJPEGs instead of Monitor->SaveJPEGs 2019-08-26 15:04:59 -04:00
Isaac Connor 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
Isaac Connor fd310c0f0a Merge branch 'master' into storageareas 2019-02-22 11:33:47 -05:00
Isaac Connor 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
Isaac Connor 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
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