Commit Graph

86 Commits

Author SHA1 Message Date
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 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 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 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
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 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 24a0d717c5 wip 2017-11-21 19:55: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 7bff9a8083 fix to compile 2017-11-16 20:37:40 -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
Isaac Connor 2b09658f88 fixes, set tune to lowlatency 2017-11-14 08:41:45 -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
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 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 ef0f01d498 more debug, try to get pts/dts right 2017-11-12 13:16:40 -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 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
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 e17bcb9178 updates for mast ffmpeg 2017-11-07 18:21:51 -08:00