Isaac Connor
|
d87e691363
|
Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread
|
2018-01-16 17:53:48 -05:00 |
|
Isaac Connor
|
573c44839a
|
Merge branch 'storageareas' into zma_to_thread
|
2018-01-16 17:39:37 -05:00 |
Isaac Connor
|
a2211bf438
|
Merge branch 'storageareas' into zma_to_thread
Conflicts:
src/zm_event.cpp
src/zm_monitor.cpp
|
2018-01-16 13:36:57 -05:00 |
|
Isaac Connor
|
9284e26512
|
get rid of the snapshot setting. If we aren't storing all frames, then we should always store the snapshot.
|
2018-01-13 15:15:14 -05:00 |
|
Isaac Connor
|
0ea6fd9807
|
Merge branch 'storageareas' into zma_to_thread
|
2017-12-19 14:06:58 -05:00 |
|
Isaac Connor
|
2922a86d23
|
fixes to new Storage Schemes code
|
2017-12-19 11:01:03 -05:00 |
|
Isaac Connor
|
e16852ee8e
|
fix compile, impose minimum 10 second event length
|
2017-12-18 13:39:08 -05:00 |
|
Isaac Connor
|
8a8001f14a
|
fix missingc_str()
|
2017-12-18 13:25:24 -05:00 |
|
Isaac Connor
|
705a98276f
|
change StorageScheme to Scheme
|
2017-12-18 13:17:43 -05:00 |
|
Isaac Connor
|
d312482a2b
|
add StorageScheme to Storage and Events. Deprecate ZM_USE_DEEP_STORAGE
|
2017-12-18 12:52:26 -05:00 |
|
Isaac Connor
|
bcdadc67bf
|
Merge branch 'storageareas' into zma_to_thread
|
2017-12-12 15:29:19 -05:00 |
|
Isaac Connor
|
2df96bf6ee
|
use the return value of stat
|
2017-12-12 12:51:54 -05:00 |
|
Isaac Connor
|
2f23f81ff3
|
store a snaphost when we don't storae anything else as opposed to when specifically storing a snpashot
|
2017-12-08 21:28:30 -05:00 |
|
Isaac Connor
|
12350407bf
|
reconnet to db on error
|
2017-12-08 10:37:35 -05:00 |
|
Isaac Connor
|
128ae82331
|
add a debug for when in addpacket and no videostore
|
2017-12-01 10:33:10 -05:00 |
Isaac Connor
|
0865201e1e
|
seems to work
|
2017-12-01 07:26:34 -05:00 |
|
Isaac Connor
|
84c901a01b
|
don't write non-frames
|
2017-11-30 15:01:48 -05:00 |
|
Isaac Connor
|
f2efc80f22
|
works?
|
2017-11-30 14:37:36 -05:00 |
|
Isaac Connor
|
9d91d4ce45
|
relocate code for readability
|
2017-11-27 15:43:16 -05:00 |
|
Isaac Connor
|
8e494ef431
|
Merge branch 'storageareas' into zma_to_thread
|
2017-11-23 08:40:49 -05:00 |
Isaac Connor
|
0eb2ae60f3
|
only try to write timecodes if the open was successful
|
2017-11-22 12:13:28 -08:00 |
|
Isaac Connor
|
3c55daaf36
|
Merge branch 'tesla' of github.com:connortechnology/ZoneMinder into tesla
|
2017-11-22 12:10:54 -08:00 |
|
Isaac Connor
|
a1fe0c4de3
|
store the value of saveJpegs in the event
|
2017-11-21 23:56:22 -05:00 |
|
Isaac Connor
|
24a0d717c5
|
wip
|
2017-11-21 19:55:40 -05:00 |
|
Isaac Connor
|
7ed495c948
|
wip
|
2017-11-21 11:58:15 -05:00 |
|
Isaac Connor
|
74650ebc70
|
simplify Analysis
|
2017-11-20 11:48:56 -05:00 |
|
Isaac Connor
|
ef5e296144
|
some fixes
|
2017-11-17 14:30:38 -05:00 |
|
Isaac Connor
|
159c0a7165
|
moer cppcheck fixes
|
2017-11-17 07:52:26 -05:00 |
|
Isaac Connor
|
ecc68da0fd
|
Merge branch 'zma_to_thread' into put_ffmpeg_into_event_wip
|
2017-11-14 02:39:58 -05:00 |
|
Isaac Connor
|
56bb2205d8
|
add mjpeg support
|
2017-11-14 01:59:15 -05:00 |
|
Isaac Connor
|
39b12057f2
|
add saveJPEGs to Events
|
2017-11-13 21:34:39 -05:00 |
|
Isaac Connor
|
df0d37f4eb
|
add saveJPEGS to the event record
|
2017-11-13 21:29:15 -05:00 |
|
Isaac Connor
|
e325f5435c
|
too much refactoring
|
2017-11-13 10:17:46 -05:00 |
|
Isaac Connor
|
bb116cebd7
|
wip
|
2017-11-09 13:37:02 -08:00 |
APHW2 MFGENG
|
d15d36f389
|
rework, compiles, won't open h264
|
2017-11-09 11:50:20 -08:00 |
|
Isaac Connor
|
ef0379dd18
|
wip
|
2017-10-27 20:36:49 -07:00 |
|
Isaac Connor
|
0265a48a30
|
fix seg fault, fix pkt pts dts/duration. Stil wrong framerate
|
2017-10-26 10:12:56 -07:00 |
|
Isaac Connor
|
3be40bcc99
|
blah
|
2017-10-25 13:25:44 -07:00 |
|
Isaac Connor
|
0fbb473dd4
|
refactoring
|
2017-10-25 13:06:15 -07:00 |
|
Isaac Connor
|
2d3aa08303
|
include <0 in test on event frame timestamp
|
2017-10-23 09:56:30 -04:00 |
|
Isaac Connor
|
b58c9d87c3
|
wip
|
2017-10-23 09:51:41 -04:00 |
|
Isaac Connor
|
666233af54
|
fix mving capture_file_format to staticCOnfig
|
2017-10-18 20:46:26 -04:00 |
Isaac Connor
|
ad97023732
|
spacing
|
2017-10-12 08:54:43 -07:00 |
|
Isaac Connor
|
8ea335d45e
|
whitespace
|
2017-10-10 15:08:24 -04:00 |
|
Isaac Connor
|
7b2163f824
|
add debug
|
2017-10-10 12:58:06 -04:00 |
|
Isaac Connor
|
463503b763
|
mostly comments, deal with negative timestamps
|
2017-10-09 14:58:07 -04:00 |
|
Isaac Connor
|
2163099d6b
|
Merge branch 'storageareas' into zma_to_thread
|
2017-10-08 09:14:04 -04:00 |
|
Isaac Connor
|
219b7e0f36
|
output failing sql
|
2017-10-08 09:13:56 -04:00 |
|
Isaac Connor
|
224ca30c86
|
Merge branch 'storageareas' into zma_to_thread
|
2017-10-06 17:10:28 -04:00 |
|
Isaac Connor
|
869d2b4f16
|
make failure to symlink non-fatal. Someday we may want to use a file store that doesn't do symlinks
|
2017-09-25 16:22:41 -04:00 |