Commit Graph

109 Commits

Author SHA1 Message Date
Isaac Connor 8a85694b1c spacing 2018-01-10 14:19:47 -05:00
Isaac Connor 36ef0f5011 Merge branch 'storageareas' into zma_to_thread 2018-01-05 10:06:18 -05:00
Isaac Connor 2ec25a20ec Don't crash if we fail to open the video output stream 2018-01-04 10:07:51 -05:00
Isaac Connor 0ea6fd9807 Merge branch 'storageareas' into zma_to_thread 2017-12-19 14:06:58 -05:00
Isaac Connor 887235c746 move dumpPacket to zm_ffmpeg 2017-12-19 09:59:04 -05:00
Isaac Connor 7e9d740343 add npeg1 & 2 support and fix the first keyframe being ignored thing 2017-12-16 17:08:21 -05:00
Isaac Connor 49214a8902 Merge branch 'zma_to_thread' of github.com:/ConnorTechnology/ZoneMinder into zma_to_thread 2017-12-15 10:47:53 -05:00
Isaac Connor ebcd63f280 fixes to compile using avconv 2017-12-15 10:47:44 -05:00
Isaac Connor 212cd7e6c4 tidy ups 2017-12-15 10:46:43 -05:00
Isaac Connor 4e32a002e6 Fix timestamps on passthrough video. 2017-12-14 15:56:22 -05:00
Isaac Connor a0532cd84a fix merge 2017-12-12 15:30:47 -05:00
Isaac Connor bcdadc67bf Merge branch 'storageareas' into zma_to_thread 2017-12-12 15:29:19 -05:00
Isaac Connor 40e4d909c3 turn Fatal into Error 2017-12-12 12:41:11 -05:00
Isaac Connor 31189bdb11 make an error not fatal and check return to quiet coverity 2017-12-12 12:38:30 -05:00
Isaac Connor af37eeeeed fix int64 = int*int multiply 2017-12-08 15:17:45 -05:00
Isaac Connor 011c7e1540 revert to /1000000 tb 2017-12-08 14:22:38 -05:00
Isaac Connor aff08358f4 more debug 2017-12-08 13:46:02 -05:00
Isaac Connor d5b927c986 use xh264rgb is available 2017-12-08 10:38:16 -05:00
Isaac Connor 2a3683c072 add some more debug 2017-12-07 09:27:28 -05:00
APHW2 MFGENG 0cfc42b9fd some cleanups/fixes 2017-12-05 13:16:52 -08:00
Isaac Connor 61dd84de82 move most of the codec init out of the constructor into open so that we can fail gracefully 2017-12-04 18:06:42 -05:00
Isaac Connor 4d73ce4109 rework locking to have a per-packet mutex 2017-12-03 11:09:01 -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
APHW2 MFGENG 4a9c31a15d wip 2017-12-01 15:42:19 -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 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