Commit Graph

19473 Commits (e5b858a3c372eddc6ec51430e412ec27a8d2b3c1)

Author SHA1 Message Date
Isaac Connor 3088a7a181 Fix test for chrome version 7 by not including periods. We only care about the major and php is confused. 2022-04-04 17:00:41 -04:00
Isaac Connor f6f35c73fa Should be oc->oformat 2022-04-04 16:42:32 -04:00
Isaac Connor cdc6260f01 Bump version to 1.36.14 2022-04-04 16:23:15 -04:00
Isaac Connor 7ee8c3dfb4 AVFMT_TS_NONSTRICT must be set in oformat->flags no oc->flags. 2022-04-04 16:22:20 -04:00
Isaac Connor bf4ef4391a Set NONSTRICT in oc->flags, not out_format which is const 2022-04-03 18:36:28 -04:00
Exuvo a9d8ffc1d6 Fix ffmpeg 5 const errors 2022-04-03 17:29:14 -04:00
Isaac Connor 6a86127718 packet size should be buffer size, not the size of a pointer... 2022-04-03 17:23:02 -04:00
Isaac Connor a56b5607c3 Remove extra { breaking ptz 2022-04-03 17:16:47 -04:00
Isaac Connor 5eda92492b Move the protocol loading into the Monitor Object. 2022-04-03 17:11:04 -04:00
Isaac Connor 395d087994 If no protocol defined, fall back to the name of the Control 2022-04-03 17:09:09 -04:00
Isaac Connor 81b752d16f improve debug logging when loading Control in Monitor 2022-04-03 17:08:52 -04:00
Isaac Connor f5fd8cb111 Implement Control() function to implement the Protocol Specific Control object 2022-04-03 17:08:18 -04:00
Isaac Connor 6a3fff0aa9 Add backtrace when no primary key 2022-04-03 17:03:15 -04:00
Isaac Connor 10663819b4 Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36 2022-04-03 16:58:31 -04:00
Isaac Connor 80d622b085 Must set MonitorId in Control 2022-03-31 19:37:11 -04:00
Isaac Connor 325d1429a7 Fix logged value 2022-03-31 19:36:29 -04:00
Isaac Connor db41e6eda5 Bump version to 1.36.13 for release 2022-03-29 19:03:57 -04:00
Isaac Connor d640468dd4 reduce debug logging 2022-03-29 19:00:34 -04:00
Isaac Connor 223afe271e rough in Url, UrlToZMS PathToZMS PathToIndex, UrlToIndex UrlToApi PathToApi in SERver object 2022-03-29 18:59:17 -04:00
Isaac Connor 71689a58a1 Implement reboot and ping methods for Trendnet PTZ Control 2022-03-29 18:57:26 -04:00
Isaac Connor b522f8ffce Use the reported move with x=0 y=0 for autostop in addition to old stop movement code 2022-03-29 18:56:59 -04:00
Isaac Connor 77566967d3 Make ZoneMinder::Control ingerit from Object. Make loadMonitor use MonitorId 2022-03-29 18:56:14 -04:00
Isaac Connor 0b2e5b1450 Set new defaults for various settings 2022-03-29 18:54:06 -04:00
Isaac Connor 388142b4e1 More new defaults. The navbar refreshes every 60 secs so make full page refresh be 240sec. Ajax timeout needs to be 10 seconds. Large event listings can take longer than 3 2022-03-29 18:52:48 -04:00
Isaac Connor e395cf75e1 Add mp4 as an option for generated video and make it the default instead of avi 2022-03-29 18:52:27 -04:00
Isaac Connor 906d6c62a1 remove cruft from ServersController.php 2022-03-29 18:50:38 -04:00
Isaac Connor e6e31b0c94 Don't both running zmu if monitor Function is set to None 2022-03-29 18:49:57 -04:00
Ben Dailey 1ad191e8d6 Most programmatic images are lazy. 2022-03-29 18:45:13 -04:00
Isaac Connor f4103e6e6e Use net zm_setcookie 2022-03-29 18:34:02 -04:00
Isaac Connor 7532d4aaaa Use net zm_setcookie 2022-03-29 18:12:32 -04:00
Isaac Connor 8fa924f3ba Add handling of NOT IN and =\[\] and \!\[\] 2022-03-29 18:11:52 -04:00
Isaac Connor ee6ae94dd8 Add debugging, but commented out 2022-03-29 18:11:12 -04:00
Isaac Connor e12dfb1025 better debugging when the row has no Id 2022-03-29 18:10:59 -04:00
Isaac Connor 86e95ff0ce spacing 2022-03-29 18:10:29 -04:00
Isaac Connor 2d07fda6fc Implement zm_setcookie to simplify setting cookies, set samesite, deal with older php etc. Use it. 2022-03-29 18:09:12 -04:00
Isaac Connor 789b729fd6 Add numCoords, Coords, Area, AlarmRGB to Zone object. Also add Points(), AreaCoords, svg_polygon utility functions to it. 2022-03-29 18:03:42 -04:00
Isaac Connor 5856aad74b Implement Server function which figures out which Server likely has the video. Use it to remove duplicate logic 2022-03-29 18:01:50 -04:00
Isaac Connor 4d44ab13fc spacing, improve debug 2022-03-29 17:59:02 -04:00
Isaac Connor 29f6d9e194 define raw as an empty array so we don't generate js errors 2022-03-29 17:56:39 -04:00
Isaac Connor 2fde32d211 Make filter debug modal work on non-saved filter 2022-03-29 17:55:06 -04:00
Isaac Connor 40968ed3f7 Add more of the resulting SQL to the filter debug modal 2022-03-29 17:55:03 -04:00
Isaac Connor cd613ec1cc Remove debug relating to max ram use 2022-03-29 17:50:24 -04:00
Isaac Connor 709d2568ca Allow editing of admin user. Hide snapshots permission if the feature is turned off 2022-03-29 17:20:19 -04:00
Isaac Connor 15156cd62e remove duplicated factor code, define speed so that it doesn't generate an error if not HasSpeed in Control. 2022-03-29 17:20:06 -04:00
Isaac Connor fee0a450e5 Allow empty sort field. 2022-03-25 12:00:40 -04:00
Isaac Connor 2a17f566d6 Remove offending extra comma 2022-03-24 19:40:17 -04:00
Isaac Connor 46faec47f2 Add useful title to frame image telling us which we are looking at 2022-03-24 19:40:10 -04:00
Isaac Connor 0602aa8760 terminate when zm_terminate is set. Do a countdown instead of countup. Sleeo for 10000 microseconds instead of 100. This restores the old value 2022-03-24 19:24:18 -04:00
Isaac Connor 34eeab25c7 Remove the decoding code, just populate the av_packet. This fixes rtsp decoding because we weren't copying the decoded frame to shm raw image. 2022-03-24 19:23:06 -04:00
Isaac Connor 10c44c1562 Fix merge problems. 2022-03-23 16:36:16 -04:00