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 |
|
Isaac Connor
|
32109697d2
|
Add update for add Decoding to Monitors
|
2022-03-28 16:22:18 -04:00 |
|
Isaac Connor
|
a6193bba0e
|
Fill in Protocol of HikVision control
|
2022-03-28 14:40:21 -04:00 |
|
Isaac Connor
|
55ae6ba4a5
|
rough in Url, UrlToZMS PathToZMS PathToIndex, UrlToIndex UrlToApi PathToApi in SERver object
|
2022-03-28 14:30:08 -04:00 |
|
Isaac Connor
|
0e4c175aba
|
clean up debug
|
2022-03-28 13:49:46 -04:00 |
|
Isaac Connor
|
d6e504aa34
|
trim all monitor inputs before looking for errors. No inputs should have whitespace at beginning or end
|
2022-03-28 13:47:45 -04:00 |
|
Isaac Connor
|
bdffa10cc6
|
limit logging of full packetqueue
|
2022-03-27 13:14:40 -04:00 |
|
Isaac Connor
|
bf4d2a82d6
|
handle when maxfps is not specified
|
2022-03-27 12:17:00 -04:00 |
|
Isaac Connor
|
75833abbe7
|
Move convertContext code to it's own function for readability. Use it to clean up code in Decode
|
2022-03-26 20:32:05 -04:00 |
|
Isaac Connor
|
cc1368ba2c
|
Move code for AVPixFormat to .cpp instead .h. Add const's so we can use it on cost Image * vars
|
2022-03-26 20:31:33 -04:00 |
|
Isaac Connor
|
f17ca48cab
|
Default end_time to start_time on event creation so that we don't get a negative duration
|
2022-03-26 12:47:46 -04:00 |
|
Isaac Connor
|
9f404f7b97
|
Add test for event before calling event->Duration.
|
2022-03-26 12:47:26 -04:00 |
|
Isaac Connor
|
1c9c3d34f5
|
Free up raw images early when not recording also. Also free up decoded frame ram
|
2022-03-25 13:50:12 -04:00 |
|
Isaac Connor
|
8458eb741a
|
Don't store keyframes in packetqueue if we are not recording at all.
|
2022-03-25 12:26:05 -04:00 |
|
Isaac Connor
|
2b8fee80de
|
escape html in Storage names
|
2022-03-21 16:06:52 -04:00 |
|
Isaac Connor
|
99e78debf5
|
Use shared_data->analysing instead of analysing in tests since we could be disabled by zmu.
|
2022-03-21 15:58:01 -04:00 |
|
Isaac Connor
|
0850e0db70
|
Remove Enabled test, replace with Capturing and Recording tests
|
2022-03-21 15:56:16 -04:00 |
|
Isaac Connor
|
531793276f
|
Fix auth'd user information being saved to session before switching session id's leaving bogus authenticated user in previous session.
|
2022-03-21 15:31:44 -04:00 |
|