ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
20,268 Commits
32 Branches
93 Tags
164 MiB
Commit Graph

20268 Commits (2c0a9528b38aa67ead53a2233767ff0fec8ef424)

Author SHA1 Message Date
Isaac Connor 2c0a9528b3 Fix behaviour of layout,width,height scale etc. Height is a special case, it works differently than the rest. Use MonitorStream.js functions for setting the width/height and scale of the zms url. The img is always 100% width and height, everything is set in the containing divs. 2022-04-10 17:26:23 -04:00
Isaac Connor 88665a68f5 Don't warn about not being able to keep up to maxfps 2022-04-10 13:09:55 -04:00
Isaac Connor 37d0b6e606 Add some basic sanity checks for width & height == 0 2022-04-07 19:38:43 -04:00
Isaac Connor a58111fa46 Rough in an onclick handler for the monitor tabs so that we can store the selected tab value 2022-04-07 13:17:02 -04:00
Isaac Connor 0fc6ffe359 Use non-minified chosen.js because we made changes. 2022-04-07 13:15:15 -04:00
Isaac Connor 229f159069 If the select is hidden, it will have 0 width. So instead return 100% 2022-04-07 13:14:58 -04:00
Isaac Connor 2b1aa90b8e Implement last_dts[] because next_dts[] isn't actually useful. This fixes another ffmpeg deprecation problem by keep our own copy of cur_dts 2022-04-07 13:12:34 -04:00
Isaac Connor 55efd859c3 If deleting don't bother queuing 2022-04-07 13:11:56 -04:00
Isaac Connor e9f248def7 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-04-06 14:58:52 -04:00
Isaac Connor 10383d775a Fix on-change-this to data-on-change-this and remove an extra /tr 2022-04-06 14:58:42 -04:00
Isaac Connor 8de0ef9d30 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-04-06 10:39:23 -04:00
Isaac Connor 641613fe48 echo the scp command so we can cutnpaste it later 2022-04-06 10:39:19 -04:00
Isaac Connor 906951e450 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-04-06 10:37:10 -04:00
Isaac Connor 0e337cd8bf Remove support for Cambozola which no longer works or is needed. 2022-04-06 10:37:02 -04:00
Isaac Connor 1e6f34235c replace cur_dts mangling with use of our next_dts array 2022-04-06 09:59:13 -04:00
Isaac Connor 1f5d7866f7 Merge @alabamatoys' work to add focus controls 2022-04-06 09:03:27 -04:00
Isaac Connor d696714fb4 add a workflow to build debian packages on release 2022-04-05 10:19:33 -04:00
Isaac Connor 6d17aa4b77 Don't always default to Freeform. Also update some code in selectLayout 2022-04-04 17:47:45 -04:00
Isaac Connor 4fd027fbcc Fix test for chrome version 7 by not including periods. We only care about the major and php is confused. 2022-04-04 17:03:36 -04:00
Isaac Connor 278624081f Must set AVFMT_TS_NONSTRICT in oformat->flags not oc->flags 2022-04-04 16:28:46 -04:00
Isaac Connor 034dda5b6c Only bump iterators if we are pushing onto the back of the queue. If we are re-ordering, can do nothing about the iterators. Show if iterator points to the packet in dumpQueue. 2022-04-04 16:27:43 -04:00
Isaac Connor 9235b696ed Add index of packet that we have seen before 2022-04-04 16:26:52 -04:00
Isaac Connor 5b824f46c4 Load monitors when not in multi-server mode. 2022-04-04 15:06:34 -04:00
Isaac Connor ed7c139fb3 Add backtrace to ajaxError 2022-04-04 15:00:33 -04:00
Isaac Connor 8046c21eeb Add parenthesis to make logic more clear 2022-04-04 14:53:08 -04:00
Isaac Connor a689b3636d Only define av1 for newer ffmpeg 2022-04-03 17:38:27 -04:00
Isaac Connor 166ed2631f reference shared_data->recording instead of recording. Fix recording changing to ONMOTION due to use of = instead of == in an if 2022-04-03 16:53:14 -04:00
Isaac Connor 513c228ff3 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-04-03 16:29:15 -04:00
Isaac Connor d1cc451037 packet size should be buffer size, not the size of a pointer... 2022-04-03 16:28:38 -04:00
Isaac Connor 162595edbc Don't try to mangle pts and dts. We will have to depend on packetqueue re-ordering 2022-04-03 16:25:05 -04:00
Isaac Connor 5a78a765d1 Add in re-ordering of packets based on dts. 2022-04-03 16:24:21 -04:00
Isaac Connor 7c5a6f9bae Cleanups. Return if we don't find a video stream. Also check for width and height on video streams 2022-04-03 16:23:51 -04:00
Isaac Connor 7dcb45b7b7 Remove debugging, code style, spacing. Free lock before notifying 2022-04-03 16:21:40 -04:00
Isaac Connor 717dfff0c4
Merge pull request #3456 from exuvo/master 
ffmpeg change
 2022-04-03 14:59:35 -04:00
Isaac Connor 9cb59aced9 Fix last_write_index not incrementing hence live view broken 2022-04-01 12:40:59 -04:00
Isaac Connor 6907177c48 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-04-01 09:48:26 -04:00
Isaac Connor 585a01735a Fix lockups due to lack of locking around terminate_ 2022-04-01 09:48:20 -04:00
Isaac Connor 9d9b363536 Add backtrace when no primary key 2022-03-31 19:32:34 -04:00
Isaac Connor 19d823497e Add id's to nav row divs to facilitate styling. Only output third row if it has contents 2022-03-30 13:16:49 -04:00
Isaac Connor ed0f244c70 Don't use packet->index to calculate index into shmem. If we are skipping the increase might not be monotonic 2022-03-29 17:19:31 -04:00
Isaac Connor d0ee8dc6fd remove duplicated factor code, define speed so that it doesn't generate an error if not HasSpeed in Control. 2022-03-29 17:19:31 -04:00
Isaac Connor 474b6f1a2f Allow editing of admin user. Hide snapshots permission if the feature is turned off 2022-03-29 17:19:31 -04:00
Isaac Connor 40014588d4 Put the monitor Id first instead of stuck on the end of the Name 2022-03-29 17:16:25 -04:00
Isaac Connor d19b743864 Bump version to 1.37.13 2022-03-28 18:04:01 -04:00
Isaac Connor f95d184f02 Don't restart monitors that aren't decoding 2022-03-28 18:02:58 -04:00
Isaac Connor 8f013b55b2 Add Capturing, Analysing, Recording defaults. Add Decoding 2022-03-28 18:02:44 -04:00
Isaac Connor 5618d242f9 Change from DecodingEnabled to Decoding, and move to Source tab 2022-03-28 17:57:16 -04:00
Isaac Connor abf238a469 update help for Decoding options 2022-03-28 17:56:42 -04:00
Isaac Connor 723c10ca19 Cleanup options, add DecodingOptions 2022-03-28 17:45:01 -04:00
Isaac Connor 39d45e527c Switch from DecodingEnabled to DecodingOption. Implement the logic in ::Decode. 2022-03-28 17:44:44 -04:00