APHW2 MFGENG
|
043e44d273
|
fix, must clear the frame
|
2017-11-13 14:24:28 -08:00 |
Isaac Connor
|
32a27e468d
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-11-13 11:52:13 -08:00 |
|
Isaac Connor
|
bc3f169a80
|
add event_id as a paramteter
|
2017-11-13 11:51:54 -08:00 |
|
Isaac Connor
|
878e9e4cde
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-11-13 11:51:01 -08:00 |
Isaac Connor
|
ed72017684
|
add a mutex
|
2017-11-13 14:35:47 -05:00 |
|
APHW2 MFGENG
|
d07f36a7ee
|
Merge branch 'storageareas' of http://github.com/connortechnology/ZoneMinder into storageareas
|
2017-11-13 10:27:27 -08:00 |
|
APHW2 MFGENG
|
f093cfbcef
|
add Filtering to monitors index
|
2017-11-13 10:27:24 -08:00 |
|
Isaac Connor
|
8a1e3f1d9a
|
Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread
|
2017-11-13 12:38:49 -05:00 |
|
Isaac Connor
|
aee2b148f0
|
wip
|
2017-11-13 12:14:57 -05:00 |
|
Isaac Connor
|
0e799233d2
|
move up timestamping to before videowriting
|
2017-11-13 10:57:37 -05:00 |
|
Isaac Connor
|
e325f5435c
|
too much refactoring
|
2017-11-13 10:17:46 -05:00 |
|
Isaac Connor
|
eee312a2d4
|
free contexts
|
2017-11-12 17:14:21 -05:00 |
|
Isaac Connor
|
75743d63b6
|
fixes
|
2017-11-12 17:02:11 -05:00 |
Isaac Connor
|
ecd86b3fde
|
cleanup
|
2017-11-12 15:18:39 -05:00 |
|
Isaac Connor
|
f476c8f2e5
|
fixes from cppcheck
|
2017-11-12 13:25:19 -05:00 |
|
Isaac Connor
|
a99c5b54fa
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-11-12 13:16:49 -05:00 |
|
Isaac Connor
|
ef0f01d498
|
more debug, try to get pts/dts right
|
2017-11-12 13:16:40 -05:00 |
|
Isaac Connor
|
feca6c3df0
|
add a copy constructor at the advice of cppcheck
|
2017-11-12 13:16:18 -05:00 |
|
Isaac Connor
|
50d3b168fa
|
wip
|
2017-11-12 11:50:07 -05:00 |
|
Isaac Connor
|
0e7f475ce8
|
merge work from zma_to_thread, but not the zma_to_thread part
|
2017-11-12 11:42:34 -05:00 |
|
Isaac Connor
|
29782ee938
|
Merge branch 'zma_to_thread' of github.com:ConnorTechnology/ZoneMinder into zma_to_thread
|
2017-11-12 10:30:02 -05:00 |
|
Isaac Connor
|
71f13a7c9a
|
optimisations/fixes from cppcheck
|
2017-11-12 10:27:47 -05:00 |
|
Isaac Connor
|
3dafb5c225
|
don't delete image when destroying zmpacket
|
2017-11-11 09:25:13 -05:00 |
|
Isaac Connor
|
4c76b74645
|
decrease debugging
|
2017-11-11 09:11:05 -05:00 |
|
Isaac Connor
|
3dd8fe072d
|
add omx
|
2017-11-10 18:59:58 -05:00 |
|
Isaac Connor
|
8694edb1b6
|
add :80 default
|
2017-11-10 16:23:38 -05:00 |
|
Isaac Connor
|
ce8350cbef
|
add :80 default
|
2017-11-10 16:22:58 -05:00 |
|
APHW2 MFGENG
|
97058065ff
|
Merge branch 'storageareas' of http://github.com/connortechnology/ZoneMinder into storageareas
|
2017-11-10 10:11:03 -08:00 |
|
APHW2 MFGENG
|
626af8d2fb
|
wip
|
2017-11-10 10:10:51 -08:00 |
|
Isaac Connor
|
bb116cebd7
|
wip
|
2017-11-09 13:37:02 -08:00 |
|
Isaac Connor
|
57a53f6fdd
|
spacing and fixes
|
2017-11-09 15:03:23 -05:00 |
|
APHW2 MFGENG
|
d15d36f389
|
rework, compiles, won't open h264
|
2017-11-09 11:50:20 -08:00 |
|
APHW2 MFGENG
|
476ed4c9e0
|
add a quick test to load omx
|
2017-11-09 06:16:41 -08:00 |
|
Isaac Connor
|
5efaed0ef4
|
Merge branch 'storageareas' into ffmpeg_output
|
2017-11-08 17:22:07 -05:00 |
|
Isaac Connor
|
821717b06e
|
turn off debug
|
2017-11-08 11:26:13 -05:00 |
|
Isaac Connor
|
2570869aa0
|
bring back libvlc
|
2017-11-08 11:18:54 -05:00 |
|
Isaac Connor
|
aba7ecd9a6
|
split lines
|
2017-11-08 11:18:23 -05:00 |
|
Isaac Connor
|
59a87c14d3
|
fix error message
|
2017-11-08 11:17:46 -05:00 |
|
Isaac Connor
|
625170bffc
|
fix getVideoStream to getVideoStreamHTML. Change how scaling works
|
2017-11-08 11:17:30 -05:00 |
|
APHW2 MFGENG
|
4e080b8a36
|
Merge branch 'storageareas' into ffmpeg_output
Conflicts:
scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
scripts/ZoneMinder/lib/ZoneMinder/Object.pm
|
2017-11-07 18:25:33 -08:00 |
|
APHW2 MFGENG
|
402ad0ace3
|
Merge branch 'storageareas' of http://github.com/connortechnology/ZoneMinder into storageareas
|
2017-11-07 18:22:12 -08:00 |
|
APHW2 MFGENG
|
e17bcb9178
|
updates for mast ffmpeg
|
2017-11-07 18:21:51 -08:00 |
|
Isaac Connor
|
b6548ba137
|
put curl back, we use it's decoding function for urls
|
2017-11-07 15:54:13 -05:00 |
|
Isaac Connor
|
a9419064ef
|
don't calc fps if no time has passed
|
2017-11-07 09:35:13 -05:00 |
|
Isaac Connor
|
c3cfd096c7
|
Don't connect to the monitor when doing an eventStream
|
2017-11-07 09:34:47 -05:00 |
|
APHW2 MFGENG
|
2ffa79172a
|
Only load Name,Value when loading config because that's all we use
|
2017-11-06 08:36:53 -08:00 |
|
APHW2 MFGENG
|
c2fab6e959
|
add the options for nvsocket as an include
|
2017-11-06 07:31:08 -08:00 |
|
Isaac Connor
|
4b8a8e7b56
|
fix new return value from Capture, 1 signals 1 frame captured
|
2017-11-05 18:02:09 -05:00 |
|
Isaac Connor
|
bef7c0ed94
|
Only start a monitor if it has a Function
|
2017-11-05 11:54:00 -05:00 |
|
Isaac Connor
|
7374ced076
|
0 is a prefectly valid PreEventCount
|
2017-11-05 10:00:24 -05:00 |