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
|
556c4d8851
|
debug
|
2017-11-30 16:10:30 -05:00 |
Isaac Connor
|
f2efc80f22
|
works?
|
2017-11-30 14:37:36 -05: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
|
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
|
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
|
ebe3073c59
|
only update fps if we have an image capture
|
2017-11-21 23:57:01 -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
|
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
|
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
|
3129afa5d6
|
fixup decoding when recording from a non-ffmpeg suorce
|
2017-11-14 13:16:07 -08: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 |
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 |
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
|
ef0f01d498
|
more debug, try to get pts/dts right
|
2017-11-12 13:16:40 -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 |
APHW2 MFGENG
|
626af8d2fb
|
wip
|
2017-11-10 10:10:51 -08:00 |
APHW2 MFGENG
|
d15d36f389
|
rework, compiles, won't open h264
|
2017-11-09 11:50:20 -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 |
Isaac Connor
|
a9419064ef
|
don't calc fps if no time has passed
|
2017-11-07 09:35:13 -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
|
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
|
0fbb473dd4
|
refactoring
|
2017-10-25 13:06:15 -07:00 |
Isaac Connor
|
cfaf10335b
|
add Monitor status, capturrFPS and AnalysisFPS to processes
|
2017-10-24 16:08:31 -07: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
|
965e1e8bc1
|
improve readability of debug statement
|
2017-10-18 10:22:53 -07:00 |
Isaac Connor
|
463503b763
|
mostly comments, deal with negative timestamps
|
2017-10-09 14:58:07 -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 |