Isaac Connor
|
a4c956da7d
|
Only update db entry when value changes
|
2018-02-05 22:59:22 -05:00 |
Isaac Connor
|
af67e3b686
|
whitespace
|
2018-02-04 11:54:25 -08:00 |
|
Isaac Connor
|
310193791d
|
add a 10 second sleep before reconneting
|
2018-02-04 11:54:11 -08:00 |
|
Isaac Connor
|
e25af4b40c
|
cleanup, reset result
|
2018-02-02 16:07:13 -05:00 |
|
Isaac Connor
|
4b7ddd81bf
|
Merge branch 'storageareas' into zma_to_thread
|
2018-02-02 14:24:02 -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
|
868e17a414
|
Allow Method in Monitors to be NULL
|
2018-02-02 10:31:55 -05:00 |
|
Isaac Connor
|
6942aaed15
|
whitespace
|
2018-01-31 14:36:01 -05:00 |
|
Isaac Connor
|
882a242b76
|
Fix mpeg streaming.
|
2018-01-31 14:35:00 -05:00 |
|
Isaac Connor
|
31ad807a90
|
If ffmpeg is open in PrimeCapture, close it. Turn all Fatals into Errors
|
2018-01-31 14:34:39 -05:00 |
|
Isaac Connor
|
bdb5176981
|
increase debug lvel of dumpPacket
|
2018-01-31 14:33:42 -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
|
ba2c111762
|
restructure to keep trying to open the camera instead of exiting.
|
2018-01-31 14:32:48 -05:00 |
|
Isaac Connor
|
218e34a079
|
Can only have 6 digitals, not 8
|
2018-01-30 11:23:09 -05:00 |
|
Isaac Connor
|
8c90a8a47a
|
Fix Id => MonitorId in MonitorStatus
|
2018-01-29 23:06:59 -05:00 |
|
Isaac Connor
|
67b365948e
|
Merge branch 'storageareas' into zma_to_thread
Conflicts:
src/zm_ffmpeg_camera.cpp
src/zm_monitor.cpp
web/includes/Monitor.php
web/skins/classic/views/js/add_monitors.js
web/skins/classic/views/js/console.js
|
2018-01-29 15:53:26 -05:00 |
|
Isaac Connor
|
5b238f713d
|
fix comma
|
2018-01-29 11:52:17 -05:00 |
|
Isaac Connor
|
1d221dff7c
|
Frame throttling is not an error.
|
2018-01-29 11:45:33 -05:00 |
|
Isaac Connor
|
fc4edefd81
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-29 07:35:24 -08:00 |
|
Isaac Connor
|
7e2f132cdd
|
Better debugging
|
2018-01-29 07:22:05 -08:00 |
|
Isaac Connor
|
cfb0461fcf
|
Rename column Id to MonitorId in MonitorStatus
|
2018-01-29 09:31:43 -05:00 |
|
Isaac Connor
|
f98217e62a
|
remove useless debug code
|
2018-01-28 15:17:48 -05:00 |
|
Isaac Connor
|
190d8d1600
|
remove useless debug code
|
2018-01-28 15:17:41 -05:00 |
|
Isaac Connor
|
748f78d7a6
|
clean out old threaded code that has been #defined out for a long time. When EOF, after re-opening, continue instead of logging the error
|
2018-01-28 15:17:22 -05:00 |
|
Isaac Connor
|
057509637a
|
TUrn a warning into a debug
|
2018-01-28 15:16:06 -05:00 |
|
Isaac Connor
|
16c24240f7
|
clean out old threaded code that has been #defined out for a long time. When EOF, after re-opening, continue instead of logging the error
|
2018-01-28 15:14:38 -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
|
6a42dab4e8
|
Fix
|
2018-01-24 12:18:39 -05:00 |
|
Isaac Connor
|
71263c525b
|
:Merge branch 'storageareas' into zma_to_thread
Conflicts:
src/zm_ffmpeg_camera.cpp
src/zm_monitor.cpp
|
2018-01-24 11:55:32 -05:00 |
|
Isaac Connor
|
50fc4a2d94
|
Use a memory table called Monitor_Status to store FPS and Status info for Monitors. This is to reduce locking and updates on the main Monitors table.
|
2018-01-24 11:51:11 -05:00 |
|
Isaac Connor
|
215660a817
|
Merge branch 'storageareas' into zma_to_thread
Conflicts:
src/zm_ffmpeg_camera.cpp
src/zm_packetqueue.cpp
src/zm_videostore.cpp
src/zm_videostore.h
web/includes/Event.php
web/skins/classic/views/events.php
|
2018-01-24 11:06:19 -05:00 |
Isaac
|
66fd02a29e
|
Use dumpPacket
|
2018-01-23 18:15:29 +01:00 |
|
Isaac
|
abb2cfbe12
|
fix zm_av_packet_ref for old ffmpeg. Need to set the size and flags as well as copying the mem.
|
2018-01-23 18:14:55 +01:00 |
|
Isaac Connor
|
6bc83ca6a2
|
Set Default Scheme
|
2018-01-23 09:07:40 -05:00 |
|
Isaac
|
bfa0a00e67
|
dfebug improvements
|
2018-01-22 03:27:44 +01:00 |
|
Isaac
|
41a05f5eef
|
simplify logic, improve debugging
|
2018-01-22 03:26:36 +01:00 |
|
Isaac
|
414930cb90
|
simplify logic, improve debugging
|
2018-01-22 03:26:33 +01:00 |
|
Isaac
|
4127aa50f3
|
simplify logic, improve debugging
|
2018-01-22 03:26:25 +01:00 |
|
Isaac Connor
|
18f0610d87
|
Merge zm_ffmpeg.cpp from zma_to_thread
|
2018-01-21 17:18:29 -05:00 |
|
Isaac Connor
|
e37d27e972
|
Merge branch 'storageareas' into zma_to_thread
Conflicts:
src/zm_monitor.cpp
|
2018-01-18 13:44:26 -05:00 |
|
Isaac Connor
|
59a1272307
|
bump version
|
2018-01-18 11:39:33 -05:00 |
|
Isaac Connor
|
22df150cb2
|
Merge branch 'storageareas' into zma_to_thread
Conflicts:
src/zm_ffmpeg_camera.cpp
src/zm_packetqueue.cpp
|
2018-01-17 13:59:34 -05:00 |
|
Isaac Connor
|
360a10276f
|
Fix. We were deleting the keyframe that we wanted to keep.
|
2018-01-17 10:01:48 -05:00 |
|
Isaac Connor
|
687d797303
|
Only log debug message about excluding audio if there is an audio stream
|
2018-01-17 09:53:03 -05:00 |
|
Isaac Connor
|
7f4deef4a9
|
Move debug comment about opening audio codec into the part where the audio codec is opened
|
2018-01-17 09:21:17 -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
|
26cea49f1a
|
handle nulls in event_prefix and label_format in Monitor::Reload
|
2018-01-16 11:08:35 -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
|
2c121fb784
|
If we get a term signal while waiting for zmc, die.
|
2018-01-12 07:12:54 -08:00 |
|
Isaac Connor
|
c3ab7d5269
|
Merge branch 'storageareas' into zma_to_thread
Conflicts:
src/zm_packetqueue.cpp
src/zma.cpp
|
2018-01-10 14:24:46 -05:00 |
|
Isaac Connor
|
8a85694b1c
|
spacing
|
2018-01-10 14:19:47 -05:00 |
|
Isaac Connor
|
7d2becee21
|
add reload on HUP
|
2018-01-10 12:59:42 -05:00 |
|
Isaac Connor
|
ae5f4c9d9c
|
Add log re-init on HUP
|
2018-01-10 12:58:22 -05:00 |
|
Isaac Connor
|
727bde752f
|
Count non-i frames in frames_to_keep. Should reduce the size of the packetqueue
|
2018-01-07 13:39:13 -05:00 |
|
Isaac Connor
|
36ef0f5011
|
Merge branch 'storageareas' into zma_to_thread
|
2018-01-05 10:06:18 -05:00 |
|
Isaac Connor
|
2ec25a20ec
|
Don't crash if we fail to open the video output stream
|
2018-01-04 10:07:51 -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
|
887235c746
|
move dumpPacket to zm_ffmpeg
|
2017-12-19 09:59:04 -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
|
7e9d740343
|
add npeg1 & 2 support and fix the first keyframe being ignored thing
|
2017-12-16 17:08:21 -05:00 |
|
Isaac Connor
|
14eedf4927
|
rework state machine
|
2017-12-16 17:07:53 -05:00 |
|
Isaac Connor
|
49214a8902
|
Merge branch 'zma_to_thread' of github.com:/ConnorTechnology/ZoneMinder into zma_to_thread
|
2017-12-15 10:47:53 -05:00 |
|
Isaac Connor
|
ebcd63f280
|
fixes to compile using avconv
|
2017-12-15 10:47:44 -05:00 |
|
Isaac Connor
|
212cd7e6c4
|
tidy ups
|
2017-12-15 10:46:43 -05:00 |
|
Isaac Connor
|
4e32a002e6
|
Fix timestamps on passthrough video.
|
2017-12-14 15:56:22 -05:00 |
|
Isaac Connor
|
a0532cd84a
|
fix merge
|
2017-12-12 15:30:47 -05:00 |
|
Isaac Connor
|
bcdadc67bf
|
Merge branch 'storageareas' into zma_to_thread
|
2017-12-12 15:29:19 -05:00 |
|
Isaac Connor
|
a304af727b
|
debug GetFPS
|
2017-12-12 14:37:02 -05:00 |
|
Isaac Connor
|
70d43d2d27
|
fix strncpy calls
|
2017-12-12 13:42:48 -05:00 |
|
Isaac Connor
|
34668db43b
|
use return value of WriteJpeg
|
2017-12-12 13:39:36 -05:00 |
|
Isaac Connor
|
97e3ac046e
|
close file handle on error
|
2017-12-12 13:38:31 -05:00 |
|
Isaac Connor
|
599848346e
|
close infile on error condition. Make failure to read not be fatal.
|
2017-12-12 13:35:19 -05:00 |
|
Isaac Connor
|
7278448b01
|
remove test for less than zero of uints
|
2017-12-12 13:30:58 -05:00 |
|
Isaac Connor
|
6bffc54b77
|
fix referencing event_data before we test it for null
|
2017-12-12 13:30:43 -05:00 |
|
Isaac Connor
|
c40f79097d
|
fix zeroing of vid_cap, when we want to zero vid_pic!
|
2017-12-12 13:28:39 -05:00 |
|
Isaac Connor
|
5f0db60c38
|
quiet coverity
|
2017-12-12 13:25:41 -05:00 |
|
Isaac Connor
|
b246ae4d19
|
remove less than zero tests for unsigned parameters
|
2017-12-12 13:25:02 -05:00 |
|
Isaac Connor
|
2769c1fc54
|
add missing unlock
|
2017-12-12 13:20:53 -05:00 |
|
Isaac Connor
|
5fa7fd4db8
|
initialize mValue
|
2017-12-12 13:19:35 -05:00 |
|
Isaac Connor
|
3c44c1f9be
|
quiet coverity by returning after Panic
|
2017-12-12 13:19:23 -05:00 |
|
Isaac Connor
|
52953d7112
|
initialize ttl
|
2017-12-12 13:19:09 -05:00 |
|
Isaac Connor
|
46094fe6cf
|
close outfile on error
|
2017-12-12 13:18:57 -05:00 |
|
Isaac Connor
|
47f3971f9a
|
remove unused mDbConnection
|
2017-12-12 13:18:50 -05:00 |
|
Isaac Connor
|
568b15a916
|
initilize things to quiet coverity
|
2017-12-12 13:09:55 -05:00 |
|
Isaac Connor
|
23a2f1e609
|
quiet coverity by initialising last_frame_timestamp
|
2017-12-12 13:01:57 -05:00 |
|
Isaac Connor
|
fe8e1ba445
|
change the order of open/stat. Only stat and check for char device if we can actualy open it
|
2017-12-12 13:01:38 -05:00 |
|
Isaac Connor
|
fe74c41723
|
fix integer division instead of double
|
2017-12-12 12:56:19 -05:00 |
|
Isaac Connor
|
716a29545f
|
fix strncpy not leaving null terminator space
|
2017-12-12 12:53:05 -05:00 |
|
Isaac Connor
|
db915b2c56
|
Don't do an unneccesary assignemnt
|
2017-12-12 12:52:30 -05:00 |
|
Isaac Connor
|
43e4421368
|
fix strncpy not leaving null terminator space
|
2017-12-12 12:52:20 -05:00 |
|
Isaac Connor
|
2df96bf6ee
|
use the return value of stat
|
2017-12-12 12:51:54 -05:00 |
|
Isaac Connor
|
007ebd3689
|
remove unused var
|
2017-12-12 12:41:17 -05:00 |
|
Isaac Connor
|
40e4d909c3
|
turn Fatal into Error
|
2017-12-12 12:41:11 -05:00 |
|
Isaac Connor
|
ec99c96587
|
remove unneccesary assignment
|
2017-12-12 12:38:40 -05:00 |
|
Isaac Connor
|
31189bdb11
|
make an error not fatal and check return to quiet coverity
|
2017-12-12 12:38:30 -05:00 |
|
Isaac Connor
|
9085a4b062
|
remove unused class members
|
2017-12-12 12:38:05 -05:00 |
|
Isaac Connor
|
f8738f2387
|
quiet coverity
|
2017-12-12 12:37:49 -05:00 |
|
Isaac Connor
|
8c1159ad56
|
quiet coverity by initializing everything in constructor
|
2017-12-12 12:37:36 -05:00 |
|
Isaac Connor
|
56e879da7b
|
should only cpoy sizeof(path)-1 to leave space for null terminator
|
2017-12-12 12:37:04 -05:00 |
|
Isaac Connor
|
a9bbe3e85c
|
remove debug lines
|
2017-12-12 12:36:35 -05:00 |
|
Isaac Connor
|
16ac341642
|
locallist return code vars, they don't need to be class members
|
2017-12-12 12:35:54 -05:00 |
|
Isaac Connor
|
a0f79b7bf7
|
add CFG_UNKNOWN and use it in the .cpp to quiet coverity
|
2017-12-12 12:35:28 -05:00 |
|
Isaac Connor
|
49be06d641
|
move freeaddrinfo up before a return to prevent memleak
|
2017-12-12 12:35:05 -05:00 |
|
Isaac Connor
|
475d39f1c6
|
move closedir down so that it always happens. Make coverity quiet
|
2017-12-12 12:34:43 -05:00 |
|
Isaac Connor
|
819c2e5190
|
fix possible not null-terminated strncpy. Wouldn't actually happen because we are copying from the db field which is 1 smaller than the variable but Coverity doesn't know that.
|
2017-12-12 11:48:12 -05:00 |
|
Isaac Connor
|
dd384e9e6d
|
reduce wait time when waiting for first frame
|
2017-12-08 21:29:05 -05:00 |
|
Isaac Connor
|
9a5371c371
|
don't exit on capture fail
|
2017-12-08 21:28:47 -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
|
af37eeeeed
|
fix int64 = int*int multiply
|
2017-12-08 15:17:45 -05:00 |
|
Isaac Connor
|
011c7e1540
|
revert to /1000000 tb
|
2017-12-08 14:22:38 -05:00 |
|
Isaac Connor
|
aff08358f4
|
more debug
|
2017-12-08 13:46:02 -05:00 |
|
Isaac Connor
|
533b370a81
|
add a mutex to the packetqueue
|
2017-12-08 10:39:57 -05:00 |
|
Isaac Connor
|
135d3803fb
|
make sure that we don't queue a packet twice
|
2017-12-08 10:39:24 -05:00 |
|
Isaac Connor
|
d5b927c986
|
use xh264rgb is available
|
2017-12-08 10:38:16 -05:00 |
|
Isaac Connor
|
12350407bf
|
reconnet to db on error
|
2017-12-08 10:37:35 -05:00 |
|
Isaac Connor
|
311e62de7a
|
change zmDbConnect to return a bool
|
2017-12-08 10:36:54 -05:00 |
|
Isaac Connor
|
2a3683c072
|
add some more debug
|
2017-12-07 09:27:28 -05:00 |
APHW2 MFGENG
|
0cfc42b9fd
|
some cleanups/fixes
|
2017-12-05 13:16:52 -08:00 |
Isaac Connor
|
13de2b60d4
|
need to store the monitor object
|
2017-12-04 18:06:53 -05:00 |
|
Isaac Connor
|
61dd84de82
|
move most of the codec init out of the constructor into open so that we can fail gracefully
|
2017-12-04 18:06:42 -05:00 |
|
Isaac Connor
|
588f63b053
|
Merge branch 'storageareas' into zma_to_thread
|
2017-12-04 17:07:16 -05:00 |
|
Isaac Connor
|
c04ec1b8a8
|
fix mem corruption
|
2017-12-03 12:50:57 -05:00 |
|
Isaac Connor
|
6fc684a018
|
Merge branch 'zma_to_thread' of github.com:/ConnorTechnology/ZoneMinder into zma_to_thread
|
2017-12-03 11:09:17 -05:00 |
|
Isaac Connor
|
4d73ce4109
|
rework locking to have a per-packet mutex
|
2017-12-03 11:09:01 -05:00 |
|
Isaac Connor
|
5f01313ff6
|
Merge branch 'zma_to_thread' of github.com:ConnorTechnology/ZoneMinder into zma_to_thread
|
2017-12-03 11:00:52 -05:00 |
|
Isaac Connor
|
b8f455ee7c
|
some cleanup, add a note about the lines that cause zm to crash
|
2017-12-03 11:00:40 -05:00 |
|
Isaac Connor
|
bc525a4e01
|
blah
|
2017-12-02 13:55:26 -05:00 |
|
Isaac Connor
|
b1019267d8
|
try moving codec selection up above ctx allocation so that it allocates a priv_data
|
2017-12-02 08:12:04 -05:00 |
|
Isaac Connor
|
0ef9d13dbd
|
Merge branch 'zma_to_thread' of github.com:/ConnorTechnology/ZoneMinder into zma_to_thread
|
2017-12-01 18:50:46 -05:00 |
|
Isaac Connor
|
3ca9b36877
|
fixes to compile on old ffmpeg
|
2017-12-01 18:50:28 -05:00 |
|
APHW2 MFGENG
|
4a9c31a15d
|
wip
|
2017-12-01 15:42:19 -08:00 |
|
APHW2 MFGENG
|
392e6c28a1
|
Merge branch 'zma_to_thread' of http://github.com/connortechnology/ZoneMinder into zma_to_thread
|
2017-12-01 12:09:02 -08:00 |
|
APHW2 MFGENG
|
c26d7fec7b
|
Merge branch 'zma_to_thread' of http://github.com/connortechnology/ZoneMinder into zma_to_thread
|
2017-12-01 11:50:05 -08:00 |
|
Isaac Connor
|
b87e459125
|
still corrupting memory
|
2017-12-01 14:48:30 -05:00 |
|
Isaac Connor
|
2e3fda488e
|
more debug
|
2017-12-01 14:33:51 -05:00 |
|
Isaac Connor
|
cbae7ef7b4
|
Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread
|
2017-12-01 10:33:15 -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
|
6e17bfefdd
|
fix printouts on 32bit
|
2017-12-01 10:30:58 -05:00 |
|
Isaac Connor
|
0865201e1e
|
seems to work
|
2017-12-01 07:26:34 -05:00 |
|
Isaac Connor
|
967368ce07
|
testing
|
2017-11-30 22:18:33 -05:00 |
|
Isaac Connor
|
4e26bde140
|
merge fix
|
2017-11-30 22:18:02 -05:00 |
|
Isaac Connor
|
4130c73943
|
Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread
|
2017-11-30 19:26:58 -05:00 |
|
Isaac Connor
|
4cc5838c66
|
whitespace & cleanup
|
2017-11-30 19:26:51 -05:00 |
|
Isaac Connor
|
556c4d8851
|
debug
|
2017-11-30 16:10:30 -05:00 |
|
Isaac Connor
|
c52d7c60eb
|
finish deprecating zma
|
2017-11-30 15:19:31 -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 |
|
APHW2 MFGENG
|
f0ffa34c4d
|
set videostreamid
|
2017-11-28 12:58:20 -08:00 |
|
Isaac Connor
|
344539f5dc
|
cleanup
|
2017-11-28 11:55:47 -05:00 |
|
Isaac Connor
|
d73f9e8a73
|
wip, crashes
|
2017-11-28 11:11:41 -05:00 |
|
Isaac Connor
|
1e50df741f
|
fix some memleaks
|
2017-11-28 09:50:09 -05:00 |
|
Isaac Connor
|
6e4abf83d0
|
wip
|
2017-11-28 08:29:03 -05:00 |
|
Isaac Connor
|
9d91d4ce45
|
relocate code for readability
|
2017-11-27 15:43:16 -05:00 |
|
Isaac Connor
|
81fa201910
|
init last_signal
|
2017-11-27 15:43:06 -05:00 |
|
Isaac Connor
|
d1886b5536
|
wip
|
2017-11-27 14:57:24 -05:00 |
|
Isaac Connor
|
99968dfa2a
|
Merge branch 'storageareas' into zma_to_thread
|
2017-11-27 11:28:36 -05:00 |
|
Isaac Connor
|
03c9f88d55
|
fix build on trusty
|
2017-11-27 08:24:14 -05:00 |
|
Isaac Connor
|
7c491bf62e
|
make compile on trusty
|
2017-11-26 18:06:12 -05:00 |
|
Isaac Connor
|
fc27674d76
|
can't do init in the if statement
|
2017-11-26 17:50:57 -05:00 |
|
Isaac Connor
|
4b92a788f7
|
fix filter execute
|
2017-11-24 15:37:50 -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
|
fe42eed1ea
|
cannot unlink the lock file, it has to stick around.
|
2017-11-22 11:43:13 -05:00 |
|
Isaac Connor
|
cd1d2e1721
|
lots more debugging. re-add status update command on failure
|
2017-11-22 01:18:07 -05:00 |
|
Isaac Connor
|
3af52256b8
|
turn down debug
|
2017-11-21 23:57:34 -05:00 |
|
Isaac Connor
|
4d758b7ce9
|
debugging
|
2017-11-21 23:57:13 -05:00 |
|
Isaac Connor
|
ebe3073c59
|
only update fps if we have an image capture
|
2017-11-21 23:57:01 -05:00 |
|
Isaac Connor
|
a1fe0c4de3
|
store the value of saveJpegs in the event
|
2017-11-21 23:56:22 -05:00 |
|
Isaac Connor
|
752990bb0f
|
improve zms logging
|
2017-11-21 23:55:53 -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
|
43b71fc49b
|
rework
|
2017-11-20 15:32:40 -05:00 |
|
Isaac Connor
|
74650ebc70
|
simplify Analysis
|
2017-11-20 11:48:56 -05:00 |
|
Isaac Connor
|
64816aa005
|
fixes from cppcheck.
|
2017-11-18 16:00:10 -05:00 |
|
Isaac Connor
|
1abcb19851
|
add Copy routing
|
2017-11-18 09:45:54 -05:00 |
|
Isaac Connor
|
7d77cd75fe
|
eliminate redundant code and memleak
|
2017-11-18 09:45:47 -05:00 |
|
Isaac Connor
|
882563c06e
|
rename frame to out_frame. Fix problem where we weren't copying from in_frame to out_frame
|
2017-11-17 18:19:37 -05:00 |
|
Isaac Connor
|
f5f45b3397
|
add Copy
|
2017-11-17 16:50:44 -05:00 |
|
Isaac Connor
|
4217d8ec4d
|
Merge branch 'zma_to_thread' of github.com:ConnorTechnology/ZoneMinder into zma_to_thread
|
2017-11-17 16:49:31 -05:00 |
|
Isaac Connor
|
28286c7967
|
fix spacing
|
2017-11-17 16:49:28 -05:00 |
|
Isaac Connor
|
cd596d49e3
|
fix local camera inputstream
|
2017-11-17 16:49:01 -05:00 |
|
Isaac Connor
|
6702b10dee
|
remove redundant code and memory leaks
|
2017-11-17 15:37:26 -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
|
22ff831859
|
more cppcheck recommendations
|
2017-11-16 21:21:56 -05:00 |
|
Isaac Connor
|
7bff9a8083
|
fix to compile
|
2017-11-16 20:37:40 -05:00 |
|
Isaac Connor
|
2aa252fbd0
|
Merge branch 'storageareas' into zma_to_thread
|
2017-11-16 18:27:44 -05:00 |
|
Isaac Connor
|
0318fb54a6
|
add missing initializers
|
2017-11-16 18:23:02 -05:00 |
|
Isaac Connor
|
1686584908
|
more cppcheck fixes
|
2017-11-16 09:19:27 -05:00 |
|
Isaac Connor
|
a956ffe7b3
|
add Copy and =operators to satisfy cppcheck
|
2017-11-16 09:15:04 -05:00 |
|
APHW2 MFGENG
|
028aa9f161
|
fix segfault
|
2017-11-14 15:32:37 -08:00 |
|
APHW2 MFGENG
|
82b30ef9d0
|
Merge branch 'zma_to_thread' of http://github.com/connortechnology/ZoneMinder into zma_to_thread
|
2017-11-14 13:16:58 -08:00 |
|
APHW2 MFGENG
|
93c79efc72
|
test out more options
|
2017-11-14 13:16:56 -08:00 |
|
Isaac Connor
|
3129afa5d6
|
fixup decoding when recording from a non-ffmpeg suorce
|
2017-11-14 13:16:07 -08:00 |
|
APHW2 MFGENG
|
9563c534a9
|
play around with presets
|
2017-11-14 12:41:25 -08:00 |
|
Isaac Connor
|
bac3fbfce9
|
fix compile on old ffmpeg
|
2017-11-14 08:55:00 -08:00 |
|
APHW2 MFGENG
|
b839151cbc
|
only set orientation if doing pssthrough
|
2017-11-14 08:53:29 -08:00 |
|
APHW2 MFGENG
|
1809921b46
|
turnoff debug
|
2017-11-14 08:53:08 -08:00 |
|
Isaac Connor
|
2b09658f88
|
fixes, set tune to lowlatency
|
2017-11-14 08:41:45 -05:00 |
|
Isaac Connor
|
d5962b11ff
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-11-14 02:48:38 -05:00 |
|
Isaac Connor
|
57c8cdde63
|
Merge branch 'storageareas' into put_ffmpeg_into_event_wip
|
2017-11-14 02:45:34 -05:00 |
|
Isaac Connor
|
65e7fb0014
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-11-14 02:40:12 -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 |
|
APHW2 MFGENG
|
043e44d273
|
fix, must clear the frame
|
2017-11-13 14:24:28 -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 |
|
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
|
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 |
|
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 |
|
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
|
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 |
|
Isaac Connor
|
4b8a8e7b56
|
fix new return value from Capture, 1 signals 1 frame captured
|
2017-11-05 18:02:09 -05:00 |
|
Isaac Connor
|
0a3327e2d2
|
move test for h264 into the code that opens the stream instead of comparing on every capture
|
2017-11-05 09:59:27 -05:00 |
|
Isaac Connor
|
ee96f58ac4
|
fix fps reporting value when Capture doesn't return a new frame
|
2017-11-05 09:59:06 -05:00 |
|
Isaac Connor
|
cab8c4cd5e
|
cleanup Monitor::Capture. Cleanup the return values from Capture and CaptureAndRecord. <0 is error, 0 is things ok, but no video frame. > 0 means we have a frame. Plus google code style
|
2017-11-03 13:49:42 -04:00 |
|
Isaac Connor
|
fdbd344d74
|
whitespace
|
2017-11-03 09:23:08 -04:00 |
|
Isaac Connor
|
495cd580aa
|
add more debugging
|
2017-11-02 11:45:49 -04:00 |
|
Isaac Connor
|
a8b679e479
|
set frameCount for audio packets too so that a long period of just audio will return and update lastframesent etc.
|
2017-11-02 11:45:33 -04:00 |
|
Isaac Connor
|
f0cfebe719
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-11-01 13:11:49 -04:00 |
|
Isaac Connor
|
ac9116e78b
|
add connkey to logging so I can tell which process is which
|
2017-11-01 12:01:12 -04:00 |
|
Isaac Connor
|
c9d52b47ba
|
add debug
|
2017-10-31 13:29:49 -07:00 |
|
Isaac Connor
|
ab1c9f7c98
|
add more debugging
|
2017-10-31 16:27:43 -04:00 |
|
Isaac Connor
|
ef0379dd18
|
wip
|
2017-10-27 20:36:49 -07:00 |
|
Isaac Connor
|
eb48759ff8
|
wip
|
2017-10-27 13:37:51 -07:00 |
|
Isaac Connor
|
52293b1791
|
Merge branch 'ffmpeg_output' of github.com:connortechnology/ZoneMinder into ffmpeg_output
|
2017-10-26 21:15:17 -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
|
ec3b18f8e8
|
add rouhged in output
|
2017-10-25 13:27:34 -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
|
0fc6852065
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-10-24 16:25:49 -07:00 |
|
Isaac Connor
|
df14b3c812
|
handle failure to connect to zmc in zms gracefully
|
2017-10-24 16:22:26 -07:00 |
|
Isaac Connor
|
fdbbc5101e
|
Merge branch 'storageareas' of http://github.com/connortechnology/ZoneMinder into storageareas
|
2017-10-24 16:10:20 -07:00 |
|
Isaac Connor
|
b54d340bda
|
google code style fix
|
2017-10-24 16:10:16 -07:00 |
|
Isaac Connor
|
cfaf10335b
|
add Monitor status, capturrFPS and AnalysisFPS to processes
|
2017-10-24 16:08:31 -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
|
fece06c9e3
|
google code style
|
2017-10-19 17:12:36 -04:00 |
|
Isaac Connor
|
e0d99018aa
|
Google code style, add a warning if no sd
|
2017-10-19 16:08:20 -04:00 |
|
Isaac Connor
|
666233af54
|
fix mving capture_file_format to staticCOnfig
|
2017-10-18 20:46:26 -04:00 |
Isaac Connor
|
10accc4226
|
google code style
|
2017-10-18 10:23:40 -07:00 |
|
Isaac Connor
|
965e1e8bc1
|
improve readability of debug statement
|
2017-10-18 10:22:53 -07:00 |
|
Isaac Connor
|
f81471da09
|
google code style
|
2017-10-18 10:22:37 -07:00 |
|
Isaac Connor
|
3436c65aab
|
minor logic improvement
|
2017-10-18 10:22:15 -07:00 |
|
Isaac Connor
|
4b30dd540c
|
tabs to spaces
|
2017-10-18 10:21:54 -07: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
|
c654d008f0
|
add monitor selector to montagereview and montage.
|
2017-10-10 09:36:56 -04:00 |
|
Isaac Connor
|
b6974ea373
|
Add monitor drorpdown to montagereview
|
2017-10-09 15:32:09 -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
|
7b7d477ab2
|
spacing, increase debug level of discovered formats. Don't crash if device returns more than 64 formats
|
2017-10-08 09:13:37 -04:00 |
|
Isaac Connor
|
94ab00aebd
|
continue cleanup of Monitor instantiation
|
2017-10-07 11:30:41 -04:00 |
|
Isaac Connor
|
224ca30c86
|
Merge branch 'storageareas' into zma_to_thread
|
2017-10-06 17:10:28 -04:00 |
|
Isaac Connor
|
df1fa97e0c
|
handle nulls in StorageId and device
|
2017-10-06 16:17:37 -04:00 |
|
APHW2 MFGENG
|
c11f310f54
|
fix
|
2017-10-03 14:51:57 -07:00 |
|
APHW2 MFGENG
|
354262c557
|
wip nvsocket
|
2017-10-03 13:28:56 -07:00 |
|
Isaac Connor
|
a1847aff75
|
add in new experimental nvsocket camera
|
2017-10-02 12:57:40 -04:00 |
|
Isaac Connor
|
ddb7305aab
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-10-02 09:11:55 -04:00 |
|
Isaac Connor
|
8c1cfb28a5
|
use c-style casts because they work
|
2017-09-26 16:13:26 -04:00 |
|
Isaac Connor
|
94fd113b63
|
use c-style casts because they work
|
2017-09-26 16:12:20 -04:00 |
|
Isaac Connor
|
1ba0a52769
|
remove const... which is preventing us from building on trusty
|
2017-09-26 12:53:54 -04:00 |
|
Isaac Connor
|
38a4ca1a6f
|
use storageareas when outputting zone diag images
|
2017-09-26 09:33:33 -04:00 |
|
Isaac Connor
|
e277456682
|
put parenthesis back in
|
2017-09-26 09:15:54 -04:00 |
|
Isaac Connor
|
9f93bfc23b
|
use Monitor Id in path to diag images instead of monitor name as the name is a convenience link and not guaranteed to exist
|
2017-09-25 18:45:58 -04:00 |
|
Isaac Connor
|
1791d3d5b7
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-09-25 16:23:33 -04:00 |