Isaac Connor
|
a0df09dcaa
|
Have to check for lock on video keyframe as well
|
2021-01-25 12:07:56 -05:00 |
|
Isaac Connor
|
baf39b0d4f
|
add adts_source
|
2021-01-24 20:16:54 -05:00 |
Isaac Connor
|
5ee423be7c
|
Merge pull request #3113 from pliablepixels/feature-api-daemon-control
new api to control daemon
|
2021-01-23 16:28:39 -05:00 |
Pliable Pixels
|
ed2a50f4ae
|
add permission check
|
2021-01-23 16:18:40 -05:00 |
|
Pliable Pixels
|
68dac0e406
|
new api to control daemon
|
2021-01-23 14:22:52 -05:00 |
|
Isaac Connor
|
8a1686076a
|
break long line
|
2021-01-22 20:24:29 -05:00 |
|
Isaac Connor
|
7feb252f81
|
code style
|
2021-01-22 20:24:12 -05:00 |
|
Isaac Connor
|
9d2598da13
|
cleanup and add AAC support. Also stop source threads
|
2021-01-22 20:23:30 -05:00 |
|
Isaac Connor
|
afc7c86eac
|
add AAC support
|
2021-01-22 20:22:50 -05:00 |
|
Isaac Connor
|
2561a07d86
|
provide a simple SDP line
|
2021-01-22 20:21:28 -05:00 |
|
Isaac Connor
|
d03e5fbe20
|
cleanup
|
2021-01-22 19:29:19 -05:00 |
|
Isaac Connor
|
71ebae27eb
|
Use codecpar instead of codec which is deprecated
|
2021-01-22 19:29:01 -05:00 |
|
Isaac Connor
|
c7b8d7bda9
|
get rid of useThread. We will always have a thread
|
2021-01-22 19:26:00 -05:00 |
|
Isaac Connor
|
afd57ec307
|
Add a base extractFrame that just treats the entire buffer as a frame
|
2021-01-22 19:25:38 -05:00 |
|
Isaac Connor
|
c94e2c0f13
|
cleanup
|
2021-01-22 19:24:27 -05:00 |
|
Isaac Connor
|
08165c06df
|
Add audio details to zm_dump_codecpar
|
2021-01-22 19:24:15 -05:00 |
|
Isaac Connor
|
1a400be11c
|
add zm_rtsp_server_adts_source.cpp to build
|
2021-01-22 19:23:36 -05:00 |
|
Isaac Connor
|
ea8f264724
|
Merge branch 'release-1.34'
|
2021-01-22 15:54:06 -05:00 |
|
Isaac Connor
|
d3c84a168a
|
Remove the word All from the mark column on console. I think the UX is pretty universal by now.
|
2021-01-22 15:51:31 -05:00 |
|
Isaac Connor
|
cd9f10695d
|
correct colours in links, navbar buttons. sync colours of monitor filter text inputs to match chosen dropdown. make options sidebar black. Remove redundant layout duplicated from base.
|
2021-01-22 15:51:04 -05:00 |
|
Isaac Connor
|
c7ef587d5d
|
Shirnk colMark because I got rid of the word All in the header. Make the monitor filters inline-block which makes them flow with their label when narrow
|
2021-01-22 15:47:44 -05:00 |
|
Isaac Connor
|
436cd3397b
|
apply a top/bottom margin to buttons of 1px to create a tiny space between buttons and console table. Remove commented out styles
|
2021-01-22 15:46:48 -05:00 |
Terry Sanders
|
c21e02e3c7
|
Fixed issue where mysql_free_result can get called twice when a vaild username with an incorrect password is used.
|
2021-01-22 12:23:38 -05:00 |
|
Isaac Connor
|
f9fc10b394
|
When not capturing don't try to create mmap. Fixes #3112
|
2021-01-22 12:23:13 -05:00 |
|
Isaac Connor
|
f1686cfe9a
|
When not capturing don't try to create mmap. Fixes #3112
|
2021-01-22 12:11:43 -05:00 |
|
Isaac Connor
|
01ec57f902
|
remove test for negative pts. Negative pts is ok. Have been running this in master for a while with no negative effects.
|
2021-01-22 12:07:47 -05:00 |
|
Isaac Connor
|
a30a473981
|
fix passing in audiostream
|
2021-01-21 10:27:15 -05:00 |
|
Isaac Connor
|
b8eac366b7
|
pts is an int
|
2021-01-21 10:27:02 -05:00 |
|
Isaac Connor
|
d0380fb89b
|
cleanup, start roughing in audio stream support
|
2021-01-21 10:26:46 -05:00 |
|
Isaac Connor
|
44245a9a4f
|
spacing typos
|
2021-01-21 10:25:26 -05:00 |
|
Isaac Connor
|
8a9111d0b3
|
spacing
|
2021-01-21 10:25:09 -05:00 |
|
Isaac Connor
|
35c72b32dd
|
Cleanup. Remove stats stuff. Code now works so remove other options. Re-implement extractFrame as it was broken. It would skip shortmarkers.
|
2021-01-21 10:23:30 -05:00 |
|
Isaac Connor
|
66c78e5a9b
|
Merge branch 'zma_to_thread' into rtsp_server
|
2021-01-19 13:43:25 -05:00 |
Andrew Bauer
|
e3fdfa659a
|
fix typo and disable settings btn rather than hide
|
2021-01-19 10:32:18 -06:00 |
|
Isaac Connor
|
15514e1ae1
|
Merge pull request #3110 from SynAckFin/master
Fixed issue where mysql_free_result can get called twice
|
2021-01-19 11:26:10 -05:00 |
|
Andrew Bauer
|
c13d2ea99f
|
make watch view event list more efficient
|
2021-01-19 10:10:51 -06:00 |
|
Terry Sanders
|
ef006ca407
|
Fixed issue where mysql_free_result can get called twice when a vaild username with an incorrect password is used.
|
2021-01-19 14:47:11 +00:00 |
|
Isaac Connor
|
b1b72ec85b
|
Improve debugging. Add parenthesis to fix test for end. I think the * dereference is not being applied at the right time.
|
2021-01-19 09:46:08 -05:00 |
|
Isaac Connor
|
256080abb1
|
Fix crash of Reload() due to Load() clearing shared_data and mem_ptr. Load() shouldn't do these kinds of initialisations.
|
2021-01-19 09:44:53 -05:00 |
|
Andrew Bauer
|
0b35a6f09a
|
remove mootools from debian packaging
|
2021-01-18 07:59:54 -06:00 |
|
Andrew Bauer
|
b9c0823774
|
don't install tools folder
|
2021-01-18 07:41:08 -06:00 |
|
Andrew Bauer
|
68819a86a0
|
remove mootools from zoneminder
|
2021-01-18 07:31:43 -06:00 |
|
Isaac Connor
|
cb90c06cde
|
Merge branch 'master' into zma_to_thread
|
2021-01-17 17:38:34 -05:00 |
|
Isaac Connor
|
5186ae2433
|
use bindButton
|
2021-01-16 13:17:46 -05:00 |
|
Isaac Connor
|
50af7f25b8
|
Use less memory in event querying. More work to do here
|
2021-01-16 13:17:46 -05:00 |
|
Isaac Connor
|
3dc35c49a2
|
quotes
|
2021-01-16 13:17:46 -05:00 |
|
Isaac Connor
|
d98dde4aee
|
Use auth hash in event loading. Use monitorURL in ajax calls that need to talk to zms. Use bindButton to handle the non-existence of settings button.
|
2021-01-16 13:17:46 -05:00 |
|
Isaac Connor
|
6586aa6338
|
Introduce a helper function bindButton to do the button event binding with nice error logging.
|
2021-01-16 13:17:46 -05:00 |
|
Isaac Connor
|
1e59c5bbde
|
Merge branch 'release-1.34'
|
2021-01-15 18:46:07 -05:00 |
|
Isaac Connor
|
7183a47a3a
|
split Netcat security header into multiple lines for legibility
|
2021-01-15 18:45:13 -05:00 |