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
|
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 |