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 |
|
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 |
|
Isaac Connor
|
84be41998a
|
make debug lines more informative
|
2017-09-25 16:23:27 -04:00 |
|
Isaac Connor
|
74bb2da668
|
remove extra parenthesis
|
2017-09-25 16:23:15 -04:00 |
|
Isaac Connor
|
3227599e01
|
google code style
|
2017-09-25 16:22:52 -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 |