9924 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
APHW2 MFGENG	93c79efc72	test out more options	2017-11-14 13:16:56 -08:00
APHW2 MFGENG	9563c534a9	play around with presets	2017-11-14 12:41:25 -08:00
APHW2 MFGENG	b839151cbc	only set orientation if doing pssthrough	2017-11-14 08:53:29 -08:00
APHW2 MFGENG	1809921b46	turnoff debug	2017-11-14 08:53:08 -08:00
Isaac Connor	2b09658f88	fixes, set tune to lowlatency	2017-11-14 08:41:45 -05:00
Isaac Connor	57c8cdde63	Merge branch 'storageareas' into put_ffmpeg_into_event_wip	2017-11-14 02:45:34 -05:00
Isaac Connor	93a4dfa3aa	remove extra dropdown addition	2017-11-14 02:42:51 -05:00
Isaac Connor	65e7fb0014	Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas	2017-11-14 02:40:12 -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	bafdf1fdfc	add codecs and containers	2017-11-13 21:41:57 -05:00
Isaac Connor	39b12057f2	add saveJPEGs to Events	2017-11-13 21:34:39 -05:00
Isaac Connor	df0d37f4eb	add saveJPEGS to the event record	2017-11-13 21:29:15 -05:00
Isaac Connor	5717a19215	be able to popup watch view even if the monitor is not running	2017-11-13 20:29:01 -05:00
Isaac Connor	99802945fe	be able to popup watch view even if the monitor is not running	2017-11-13 20:28:18 -05:00
Isaac Connor	1632aa7349	fix nvsocket	2017-11-13 14:25:19 -08:00
APHW2 MFGENG	043e44d273	fix, must clear the frame	2017-11-13 14:24:28 -08:00
Isaac Connor	32a27e468d	Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas	2017-11-13 11:52:13 -08:00
Isaac Connor	bc3f169a80	add event_id as a paramteter	2017-11-13 11:51:54 -08:00
Isaac Connor	878e9e4cde	Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas	2017-11-13 11:51:01 -08:00
Isaac Connor	ed72017684	add a mutex	2017-11-13 14:35:47 -05:00
APHW2 MFGENG	d07f36a7ee	Merge branch 'storageareas' of http://github.com/connortechnology/ZoneMinder into storageareas	2017-11-13 10:27:27 -08:00
APHW2 MFGENG	f093cfbcef	add Filtering to monitors index	2017-11-13 10:27:24 -08:00
Isaac Connor	8a1e3f1d9a	Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread	2017-11-13 12:38:49 -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	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	ecd86b3fde	cleanup	2017-11-12 15:18:39 -05:00
Isaac Connor	f476c8f2e5	fixes from cppcheck	2017-11-12 13:25:19 -05:00
Isaac Connor	a99c5b54fa	Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas	2017-11-12 13:16:49 -05:00
Isaac Connor	ef0f01d498	more debug, try to get pts/dts right	2017-11-12 13:16:40 -05:00
Isaac Connor	feca6c3df0	add a copy constructor at the advice of cppcheck	2017-11-12 13:16:18 -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
Isaac Connor	29782ee938	Merge branch 'zma_to_thread' of github.com:ConnorTechnology/ZoneMinder into zma_to_thread	2017-11-12 10:30:02 -05:00
Isaac Connor	71f13a7c9a	optimisations/fixes from cppcheck	2017-11-12 10:27:47 -05:00
Isaac Connor	3dafb5c225	don't delete image when destroying zmpacket	2017-11-11 09:25:13 -05:00
Isaac Connor	4c76b74645	decrease debugging	2017-11-11 09:11:05 -05:00
Isaac Connor	3dd8fe072d	add omx	2017-11-10 18:59:58 -05:00
Isaac Connor	8694edb1b6	add :80 default	2017-11-10 16:23:38 -05:00
Isaac Connor	ce8350cbef	add :80 default	2017-11-10 16:22:58 -05:00
APHW2 MFGENG	97058065ff	Merge branch 'storageareas' of http://github.com/connortechnology/ZoneMinder into storageareas	2017-11-10 10:11:03 -08: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
Isaac Connor	57a53f6fdd	spacing and fixes	2017-11-09 15:03:23 -05: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