Commit Graph

66 Commits

Author SHA1 Message Date
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
Isaac Connor fdbd344d74 whitespace 2017-11-03 09:23:08 -04: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 b58c9d87c3 wip 2017-10-23 09:51:41 -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 e277456682 put parenthesis back in 2017-09-26 09:15:54 -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 74bb2da668 remove extra parenthesis 2017-09-25 16:23:15 -04:00
Isaac Connor 2a39cf2bcd split videostore opening out of the constructor so that we can test for failure 2017-09-25 15:28:14 -04:00
Isaac Connor 789de37d33 fix builds on older ffmpeg 2017-08-24 09:53:40 -04:00
Isaac Connor a81ff85fbb add ffmpeg decoding of a .mp4 to get the frames 2017-08-23 15:05:44 -04:00
Isaac Connor 732ebf6df4 shorted some variable names and correct spacing 2017-08-23 10:37:32 -04:00
Isaac Connor eb5cee7f3e use ifdef around uses of AV_CODEC_ID_H265 and fix google code style 2017-08-23 10:14:06 -04:00
Isaac Connor cf8560b648 fix duration if it's negative 2017-08-21 10:15:56 -04:00
Isaac Connor da5438a6ff detect hardware accel capabilities 2017-08-16 12:16:15 -04:00
Isaac Connor 9e2aa941fc rough in vaapi and qsv decoders. More debugging 2017-08-16 11:31:47 -04:00
Isaac Connor e24a2935d2 remove unneeded error message 2017-08-15 13:49:11 -04:00
Isaac Connor 38111e80a5 use AVERROR_EOF instead of EOF 2017-08-15 13:17:51 -04:00
Isaac Connor ae579c9649 potentially fix a crash when camera sends aac 2017-08-15 12:16:29 -04:00
Isaac Connor adab628af9 fix video speed, various other 2017-08-14 18:22:52 -04:00