ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
8,382 Commits
32 Branches
93 Tags
161 MiB
Commit Graph

1798 Commits (d1f04a60f9e342875bbda6ab1e96dc8cf9f33c1b)

Author SHA1 Message Date
Isaac Connor d1f04a60f9 fix errors calculating dts 2017-04-12 16:16:37 -04:00
Isaac Connor d039227f79 Merge branch 'master' into storageareas 2017-04-12 13:51:10 -04:00
Isaac Connor 51d5bfc8d5 introduce a helper function to print out a timeval 2017-04-12 13:40:38 -04:00
Isaac Connor ecb57f8f04 change bool recording to a timeval. 2017-04-12 13:40:17 -04:00
Isaac Connor 575b3138de change it from a queue to a list. Implement a clearQueue that keeps some frames, and a function clear out unwanted frames 2017-04-12 13:39:47 -04:00
Isaac Connor a0b57cedeb change bool recording to a timeval. and add GetPreEventCount 2017-04-12 13:39:12 -04:00
Isaac Connor e3d3fc3411 change bool recording to a timeval. 2017-04-12 13:38:56 -04:00
Isaac Connor 59c85c1fbb change bool recording to a timeval. 2017-04-12 13:38:39 -04:00
Isaac Connor 8efeb41f7d use new clear_unwanted_packets and a clearQueue version that keeps the approprate # of frames 2017-04-12 13:38:12 -04:00
Isaac Connor 954c863ad8 add a non-const version of StartTime() which we need in order to assign to video_data->recording 2017-04-12 13:36:49 -04:00
Isaac Connor 7e920eb5d3 add a non-const version of StartTime() which we need in order to assign to video_data->recording 2017-04-12 13:36:39 -04:00
Isaac Connor 669a23c408 change type of width and height to unsigned int and recording from bool to timeval 2017-04-12 13:35:07 -04:00
Isaac Connor bdb6dd63a3 change type of width and height to unsigned int and recording from bool to timeval 2017-04-12 13:32:22 -04:00
Isaac Connor eb390c323e Merge branch 'storageareas' into ffmpeg_321 2017-04-11 11:14:23 -04:00
Isaac Connor 161aaac3f2 cleanup swsresample stuff. resampling now works 2017-04-11 10:39:43 -04:00
Isaac Connor a2a823e3ec Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-04-11 08:54:54 -04:00
Isaac Connor 9291c154a1 Merge branch 'split_monitor_stream' into storageareas 2017-04-10 21:58:01 -04:00
Isaac Connor 42e94d1a7c contains the MonitorStream class 2017-04-10 21:57:31 -04:00
Isaac Connor 620797ac18 replace swresample with libavresample 2017-04-10 21:54:23 -04:00
Isaac Connor 2220b04203 need to include zm_monitorstream.h now 2017-04-10 21:52:29 -04:00
Isaac Connor 766925d9a7 Split MonitorStream into it's own files. 2017-04-10 21:51:18 -04:00
Isaac Connor 48d658790a Merge branch 'storageareas' into optimisations 2017-04-09 17:36:24 -04:00
Isaac Connor 4215f227da Merge branch 'mastertheknife-ssse3_improvements' into storageareas 2017-04-07 13:43:09 -04:00
Isaac Connor 6ec340d525 Merge branch 'ssse3_improvements' of https://github.com/mastertheknife/ZoneMinder into mastertheknife-ssse3_improvements 2017-04-07 13:38:50 -04:00
Isaac Connor 68ab2cb756 Merge pull request #1837 from DarkDeepBlue/fix-format-string-local-cam 
zm_local_camera.cpp: Improve format strings
 2017-04-06 08:54:20 -04:00
Isaac Connor 6a9819e16b whitespace, comments 2017-04-05 16:10:21 -04:00
Isaac Connor 452e9571ee add a different size warning 2017-04-05 16:08:29 -04:00
Isaac Connor 15e69fc817 fix . to -> 2017-04-05 10:39:38 -04:00
Isaac Connor 1dbf599f10 add a cast to get rid of build warning 2017-04-05 10:36:44 -04:00
Isaac Connor 1f3eecbd6c change how opkt.pts/dts are calculated by using the diff since the last input packet instead of the diff since the beginning of stream. This should allow us to handle input pts/dts wrapping. 2017-04-04 15:15:37 -04:00
Andrew Bauer b609b9ad4c Merge pull request #1826 from connortechnology/uri_decode_in_zms 
Uri decode in zms
 2017-04-03 20:13:30 -05:00
Isaac Connor e70c7fa1ef whitespace and comments 2017-03-31 23:34:58 -04:00
Isaac Connor 30455feef7 code style 2017-03-31 11:12:52 -04:00
Isaac Connor 9c495b07dd code style, whitespace, comments 2017-03-31 11:12:42 -04:00
Isaac Connor 26dfe45ec6 delete the videostore on camera delete so that the .mp4 gets written to disk 2017-03-31 11:06:15 -04:00
Isaac Connor f2dcd18297 Merge branch 'armv7_neon' of https://github.com/mastertheknife/ZoneMinder into storageareas 2017-03-30 13:46:30 -04:00
Kfir Itzhak 5f6332f313 Fixed the assembly in hwcaps_detect() to compile with -fpic & -fPIC and added SSE4.1, SSE4.2 and AVX detection 2017-03-30 20:35:31 +03:00
Isaac Connor 1d146b112a remark out some code that detects when the pts is < last_pts. The rest isn't implemented yet so it's bogus 2017-03-30 13:04:54 -04:00
Isaac Connor 8b7acb68a3 fix password and add debug 2017-03-29 20:07:58 -04:00
Michael Schupikov 184eb507a7
zm_local_camera.cpp: Improve format strings 
This avoids printing '0x0' as char and hence terminating the output too
early.
 2017-03-29 12:45:44 +02:00
Kfir Itzhak 7162c62d26 Implemented a fix to get the Neon code to compile successfully with GCC < 6.0 2017-03-25 21:49:15 +03:00
Isaac Connor 5800598666 put back code that got merged out 2017-03-24 13:43:56 -04:00
Isaac Connor a33a8402ef Merge branch 'armv7_neon' of https://github.com/mastertheknife/ZoneMinder into neon 
Conflicts:
	src/zmf.cpp
	src/zms.cpp
 2017-03-24 12:14:16 -04:00
Kfir Itzhak 3431cf7732 Reduce code duplication in the SSSE3 functions: a single function for delta and a single function for RGB32->grayscale convert 2017-03-22 11:38:15 +02:00
Isaac Connor df5a238857 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-03-20 15:14:50 -04:00
Isaac Connor 0a1b2eab01 Merge branch 'uri_decode_in_zms' into storageareas 2017-03-20 15:13:19 -04:00
Isaac Connor f5dc896a45 missed one case 2017-03-20 15:12:23 -04:00
Isaac Connor 7b8ff44163 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-03-20 15:04:54 -04:00
Isaac Connor 816b0a9e01 add getsockopt test 2017-03-20 15:04:05 -04:00
Isaac Connor a546c9e37f merge uri_decode in zms 2017-03-20 12:00:14 -04:00