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
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
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
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
Isaac Connor
9f30ccfa75
Use new UriDecode function to decode username and password
2017-03-20 11:16:39 -04:00
Isaac Connor
3b15ba91d1
Rough in a CURL based UriDecode
2017-03-20 11:16:21 -04:00
Kfir Itzhak
ca99d84995
Only include sys/auxv.h on ARM systems. That way the code can compile with glibc < 2.16
2017-03-20 15:12:28 +02:00
Kfir Itzhak
8b593b701b
Fixed hwcaps_detect() failing to compile on x86-64
2017-03-19 15:11:06 +02:00
Kfir Itzhak
29885135a6
Corrected issues in last two ARM Neon commits
2017-03-19 13:39:24 +02:00
Kfir Itzhak
510f65c414
Added ARM Neon (AArch32) FastBlend function
2017-03-19 13:31:44 +02:00
Kfir Itzhak
c5c9b52d18
Added ARM Neon (AArch32) Delta functions for 32bit color and 8bit grayscale
2017-03-19 13:02:42 +02:00
Kfir Itzhak
e02e033cc8
Renamed ssedetect() to hwcaps_detect() and added ARM Neon and AVX2 detection
2017-03-19 02:05:01 +02:00
Isaac Connor
b041e299fc
Merge branch 'adam900710-compile_fix' into storageareas
2017-03-17 09:41:42 -04:00
Isaac Connor
654282d82e
fix merge
2017-03-17 09:41:04 -04:00
Isaac Connor
d9c665b021
Merge branch 'fix_crash_with_invalid_zones' into storageareas
2017-03-17 09:35:11 -04:00
Isaac Connor
6a447194eb
Fix zmc crashing when zones are no good bby decreasing n_zone before continuing
2017-03-16 10:55:13 -04:00
Qu Wenruo
0b9853e1d4
ZoneMinder: Rename public enum CHAR_WIDTH/CHAR_HEIGHT to avoid conflicts
...
CHAR_WIDTH is defined by limits.h, and class Image redefines it to 6,
which causes gcc6, clang, gcc5 to complain about it.
Fix by adding ZM_ prefix to CHAR_WIDTH and CHAR_HEIGHT, so it can be
compiled.
Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com >
2017-03-12 22:00:46 +08:00
Isaac Connor
3f7583ebda
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-03-06 16:22:25 -05:00
Isaac Connor
a97941edd3
change level from error to debug on message about not supporting non-FLTP
2017-02-16 13:30:34 -05:00
Isaac Connor
d135216ac7
Merge branch 'master' into storageareas
2017-02-15 09:30:35 -05:00
Isaac Connor
808d070414
don't copy smCodes, just get a pointer to it.
2017-02-14 11:29:43 -05:00
Isaac Connor
4ca2bcacde
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-02-13 17:02:59 -05:00
Isaac Connor
d5bb6f3210
remove line that causes endless reading when doing single image mode
2017-02-11 09:57:36 -05:00
Isaac Connor
aae4a1f83b
remove extraneous setting of NULL to videowriter which is already NULL
2017-02-04 11:20:21 -05:00
Isaac Connor
f73bf0aee0
add a cast to fix compilation with clang
2017-02-02 12:43:13 -05:00
Isaac Connor
1102f449aa
don't do extra copy of classString
2017-02-02 09:22:13 -05:00
Isaac Connor
7ab6818fa0
Merge branch 'sanitize_image_path' of https://github.com/knnniggett/ZoneMinder into storageareas_sanitize
2017-01-25 17:14:30 -05:00
Isaac Connor
61827fec0c
remove redundant mkdir eventdir.
2017-01-18 09:31:08 -05:00
Isaac Connor
7116d66500
use the correct pointer casts
2017-01-16 21:57:21 -05:00
Isaac Connor
1f3644f6bd
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-01-16 21:14:39 -05:00
Isaac Connor
19bc79a5ec
move nRet into the block where it is used. Add a comment.
2017-01-16 21:11:28 -05:00
Isaac Connor
f6d1707382
fix event insert
2017-01-16 21:08:13 -05:00
Andrew Bauer
5833196a84
packpack - change error code handling
2017-01-16 08:36:46 -06:00
Isaac Connor
c5ad62b9fc
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-01-15 14:24:58 -05:00
Isaac Connor
29acad163c
Add some casts to quiet warnings. The warnings happen because we are doing arithmetic on pointers.
2017-01-15 14:24:50 -05:00
Isaac Connor
b7ee64ff41
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-01-15 13:35:45 -05:00
