c3053a2f8a
Merge branch 'storageareas' into zma_to_thread
2018-05-10 17:51:38 -04:00
d31b33ffc6
add a code comment
2018-05-07 11:08:06 -04:00
8ed015966b
add zm_terminate to main while loop
2018-05-07 10:27:26 -04:00
bcdadc67bf
Merge branch 'storageareas' into zma_to_thread
2017-12-12 15:29:19 -05:00
8c1159ad56
quiet coverity by initializing everything in constructor
2017-12-12 12:37:36 -05:00
74650ebc70
simplify Analysis
2017-11-20 11:48:56 -05:00
64816aa005
fixes from cppcheck.
2017-11-18 16:00:10 -05:00
0e7f475ce8
merge work from zma_to_thread, but not the zma_to_thread part
2017-11-12 11:42:34 -05:00
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
fd44ff4e60
Merge branch 'master' into storageareas
2017-05-10 13:16:08 -04:00
71e6735b60
Neon32 functions now work on 64 bytes at a time. This results in 4-6x performance increase over standard functions
...
Memory allocations and image size requirements changed to be as needed for 64 byte alignment.
Self-test code for Blend modified accordingly and added Self-test for the delta functions.
2017-04-16 10:57:37 +03:00
59c85c1fbb
change bool recording to a timeval.
2017-04-12 13:38:39 -04:00
5ae34a7561
Merge branch 'master' into storageareas
2017-01-02 09:39:10 -05:00
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06:00
824d7c5b43
Merge ../ZoneMinder.Steve into packetqueue
2016-08-31 11:58:22 -04:00
55c6e5a6db
cleanup putting packetqueue in the monitor. It should be in the camera
2016-08-31 11:47:42 -04:00
6a8db582ff
whitespacing updates
2016-06-21 12:21:18 -04:00
0abfb7378a
Buffer work
2016-05-18 00:01:33 +10:00
da157f5a1a
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-04-30 22:27:10 +10:00
9a795432cf
merge all the commits from the messed up iconnor_video branch
2016-04-05 17:14:46 -04:00
03b1ced568
tabs to spaces and use 2space indenting
2016-04-04 10:11:48 -04:00
c26dbb9028
rough in record_audio, and do lots of whitespace cleanups
2016-03-31 12:54:56 -04:00
0e4156c095
Add CaptureAndRecord to vlc, still need to make it record
2014-10-23 19:56:35 +11:00
a81b9b8ce2
change examples for options
2014-05-17 21:48:08 +02:00
f62afdb8cc
add select list for rtsp method for ffmpeg and libvlc
2014-05-17 20:41:22 +02:00
9a71a0068a
add help window for ffmpeg/libvlc options
2014-05-17 04:33:33 +02:00
5cb7cd916f
add quotes to option debug/warn messages
2014-05-15 15:13:39 +02:00
c1557a99e5
add debug and warn messages
2014-05-15 15:06:01 +02:00
ae0ee9b3b3
testing/fixing
2014-05-05 15:54:13 +02:00
ceff5a98ea
add generic Option field to ffmpeg and libvlc cameras
2014-05-05 13:29:12 +02:00
6c94308ba0
Fix bug in frame difference checker.
2013-12-22 01:06:12 +00:00
3e2647782d
Better error handling
2013-12-19 23:10:45 +00:00
f4d72752a8
Check for frame differences as libvlc provides frames at a constant 15fps even if they are duplicates
2013-12-19 23:02:21 +00:00
e4a16ee57c
All colourspaces now working
2013-12-19 21:51:39 +00:00
c25011e781
Fix seemingly random lockup.
2013-12-19 21:51:39 +00:00
3321506b45
Working libvlc camera implementation.
2013-12-19 21:51:39 +00:00
Isaac Connor
Isaac Connor
Kfir Itzhak
Andy Bauer
Isaac Connor
Steve Gilvarry
SteveGilvarry
m-bene
Edward Barnard