Isaac Connor
|
1a05e777c0
|
fix path not being constructed properly for shallow event storage
|
2018-12-14 08:54:29 -05:00 |
Andrew Bauer
|
22460f580b
|
Merge pull request #2305 from pliablepixels/save-first-alarm
Save first alarm
|
2018-12-11 09:35:40 -06:00 |
|
Isaac Connor
|
ab9081e1bf
|
create a simple Frame class. Add a queue of Frames to the Event. When we get 10 of them write them out to the db.
|
2018-12-05 13:18:21 -05:00 |
|
Isaac Connor
|
87140ecdb5
|
white space and quiet warning
|
2018-11-17 10:39:42 -05:00 |
Pliable Pixels
|
01a57222d3
|
keep track if we have written alarmed frame incase savejpeg is off
|
2018-11-12 12:43:20 -05:00 |
Isaac Connor
|
5ab1126260
|
Merge branch 'storageareas' into zma_to_thread
|
2018-10-20 17:31:14 -04:00 |
|
Isaac Connor
|
89cd7ceaf8
|
Whitespace, extra parentheses, google code style
|
2018-09-23 16:47:06 -04:00 |
|
Isaac Connor
|
7abe4c40d5
|
Merge branch 'fix_2213' into storageareas
|
2018-09-19 20:02:27 -04:00 |
|
Isaac Connor
|
c8b10b2e3b
|
factor out some common code when creating the event directory and add a mkdir for creating the monitor directory. Should make event writing more robust when monitor dirs do not exist for some reason.
|
2018-09-19 19:50:26 -04:00 |
|
Isaac Connor
|
60b952ab86
|
Merge branch 'master' into storageareas
|
2018-09-13 16:20:36 -04:00 |
|
Isaac Connor
|
cc417cf3e7
|
reverse order of tests to be more efficient
|
2018-09-11 13:19:33 -04:00 |
|
Isaac Connor
|
672b4affe1
|
Merge branch 'storageareas' into zma_to_thread
|
2018-08-31 19:05:22 -04:00 |
|
Isaac Connor
|
96a1ac14e8
|
Don't do all the event notes stuff if notes is empty
|
2018-08-17 16:02:40 -04:00 |
|
Isaac Connor
|
b2c9c2961d
|
spacing, code style, remove useless debug logging
|
2018-08-11 18:49:30 -04:00 |
|
Isaac Connor
|
979b31ffc3
|
Merge branch 'storageareas' into zma_to_thread
|
2018-08-11 10:08:30 -04:00 |
|
Isaac Connor
|
a335eb66de
|
remove some extra braces
|
2018-08-10 11:16:04 -04:00 |
|
Isaac Connor
|
a0e67da51d
|
Improve loging around writing out analysis frames
|
2018-08-02 15:40:33 -04:00 |
|
Isaac Connor
|
e831c1563d
|
pretty the code structure
|
2018-05-24 10:59:26 -04:00 |
|
Isaac Connor
|
dc5ccd04ef
|
Update thumbnail with high scoring image.
|
2018-05-22 11:31:03 -04:00 |
|
Isaac Connor
|
4454ca0072
|
Merge branch 'storageareas' into zma_to_thread
|
2018-05-20 10:39:14 -04:00 |
|
Isaac Connor
|
d3c95ea144
|
fix merges
|
2018-05-12 19:44:20 -04:00 |
|
Isaac Connor
|
94377a4652
|
Merge branch 'storageareas' into zma_to_thread
|
2018-05-05 12:57:50 -04:00 |
|
Isaac Connor
|
f6139d33ed
|
Merge branch 'storageareas' into zma_to_thread
|
2018-05-05 12:25:11 -04:00 |
|
Isaac Connor
|
375af59657
|
use unsigned for formatting
|
2018-05-04 09:58:22 -04:00 |
|
Isaac Connor
|
6d5e46e91f
|
whitspace
|
2018-05-03 13:54:05 -04:00 |
|
Isaac Connor
|
d8b461806a
|
fix StartTime in the future log
|
2018-05-02 11:37:54 -04:00 |
|
Isaac Connor
|
2845f891bc
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-04-30 10:12:41 -04:00 |
|
Isaac Connor
|
e55846e716
|
Log start_time when its > Now
|
2018-04-30 10:12:34 -04:00 |
Isaac Connor
|
a4da624f4c
|
break out of loops when zm-terminate is set
|
2018-04-27 13:20:38 -07:00 |
|
Andrew Bauer
|
35dcedb2ad
|
fix ftbs on el7
adds compiler support for PRIu64
|
2018-04-21 20:55:21 -05:00 |
|
Isaac Connor
|
e56cf0b31c
|
switch to uint64_t for event_id because long long can actually be 128 bit
|
2018-04-17 13:57:19 -04:00 |
|
Isaac Connor
|
c7deb91319
|
Merge branch 'zma_to_thread' of github.com:ConnorTechnology/ZoneMinder into zma_to_thread
|
2018-04-14 14:58:25 -04:00 |
|
Isaac Connor
|
cd3046abb3
|
Merge branch 'storageareas' into zma_to_thread
|
2018-04-14 11:03:08 -04:00 |
|
Isaac Connor
|
f9f78e9aa3
|
Convert event_id to a 64bit unsigned int
|
2018-04-12 13:40:11 -07:00 |
|
Isaac Connor
|
2af539e916
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-04-12 11:39:30 -04:00 |
|
Isaac Connor
|
3b7992a39b
|
converity scan fixes, and close the .mp4 after updating the db record.
|
2018-04-12 10:22:46 -04:00 |
|
Isaac Connor
|
db0dac6eb2
|
Don't use static sql when multiple threads might be using it
|
2018-04-10 13:06:36 -07:00 |
|
Isaac Connor
|
9fde052d39
|
merge
|
2018-04-03 14:41:32 -07:00 |
|
Isaac Connor
|
2107e5b223
|
whitespace
|
2018-03-23 12:50:53 -04:00 |
|
Isaac Connor
|
03d3f5e665
|
Merge branch 'storageareas' into zma_to_thread
|
2018-03-03 13:28:01 -08:00 |
|
Isaac Connor
|
ede13ac41b
|
put all db access after finishing encoding, because we don
't care when they happen, and we need the encoding done.
|
2018-03-02 18:25:20 -08:00 |
|
Isaac Connor
|
1bc6e40fbc
|
add mutex locking around mysql functions so that we can go multi-threaded
|
2018-03-01 19:20:52 -08:00 |
|
Isaac Connor
|
c443168389
|
split out codec and encoder, allowing one to specify which encoder to use
|
2018-02-28 07:17:16 -08:00 |
Isaac Connor
|
84b42ef4d7
|
workarouns for omx
|
2018-02-22 11:43:04 -05:00 |
|
Isaac Connor
|
84b7e85259
|
Add a mutex around mysql operations
|
2018-02-15 15:54:13 -05:00 |
|
Isaac Connor
|
a1392bf613
|
Merge branch 'storageareas' into zma_to_thread
Conflicts:
src/zm_ffmpeg_camera.cpp
src/zm_mpeg.cpp
src/zmc.cpp
|
2018-02-02 14:23:26 -05:00 |
|
Isaac Connor
|
c9bc5a8cd8
|
if given timestamp is in the future, reset it, it is likely invalid
|
2018-01-31 14:33:20 -05:00 |
|
Isaac Connor
|
218e34a079
|
Can only have 6 digitals, not 8
|
2018-01-30 11:23:09 -05:00 |
|
Isaac Connor
|
5b238f713d
|
fix comma
|
2018-01-29 11:52:17 -05:00 |
|
Isaac Connor
|
9a15328894
|
Merge branch 'storageareas' into zma_to_thread
Conflicts:
src/zm_event.cpp
|
2018-01-26 13:02:16 -05:00 |
|
Isaac Connor
|
5a3d0b944e
|
Detect invalid delta_time and don't exit on failed mysql
|
2018-01-26 12:21:12 -05:00 |
|
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 |