443fd35d99
Fix imagesize requirements ( #2404 )
...
* introduce non-loop-unrolled version of function and use them when the image size is not a multiple of 12 or 16
* Remove tests for imagesize being a multiple of 16 or 12 to handle functions with unrolled loops
* Use non-unrolled functions when image size is not a multiple of 12 or 16
* use std_blend when image is odd size
2019-02-22 09:44:57 -05:00
b16cd7ec84
Merge branch 'h265' into zma_to_thread
2018-11-20 12:38:17 -05:00
0f14df64e2
google code style and whitespace
2018-10-22 10:41:27 -04:00
5ab1126260
Merge branch 'storageareas' into zma_to_thread
2018-10-20 17:31:14 -04:00
ba10c431f7
check for __ARM_PCS_VFP instead of __armel__
2018-10-12 09:34:16 -05:00
ad70648cb3
don't build neon instructions on armel ( #2246 )
2018-10-10 14:10:02 -04:00
89cd7ceaf8
Whitespace, extra parentheses, google code style
2018-09-23 16:47:06 -04:00
672b4affe1
Merge branch 'storageareas' into zma_to_thread
2018-08-31 19:05:22 -04:00
17a02d66f7
google code style
2018-08-11 13:35:37 -04:00
94377a4652
Merge branch 'storageareas' into zma_to_thread
2018-05-05 12:57:50 -04:00
62f8f5cfdb
whitespace
2018-05-03 13:54:18 -04:00
cd3046abb3
Merge branch 'storageareas' into zma_to_thread
2018-04-14 11:03:08 -04:00
8518278476
coverity scan fixes/cleanups
2018-04-12 11:29:35 -04:00
a1def1dfe9
whitespace
2018-04-03 12:23:54 -07:00
6cfb550cf4
add cast to remove compile warning
2018-03-20 14:49:01 -04:00
bcdadc67bf
Merge branch 'storageareas' into zma_to_thread
2017-12-12 15:29:19 -05:00
599848346e
close infile on error condition. Make failure to read not be fatal.
2017-12-12 13:35:19 -05:00
7278448b01
remove test for less than zero of uints
2017-12-12 13:30:58 -05:00
b246ae4d19
remove less than zero tests for unsigned parameters
2017-12-12 13:25:02 -05:00
46094fe6cf
close outfile on error
2017-12-12 13:18:57 -05:00
43e4421368
fix strncpy not leaving null terminator space
2017-12-12 12:52:20 -05:00
74650ebc70
simplify Analysis
2017-11-20 11:48:56 -05:00
64816aa005
fixes from cppcheck.
2017-11-18 16:00:10 -05:00
ef5e296144
some fixes
2017-11-17 14:30:38 -05:00
159c0a7165
moer cppcheck fixes
2017-11-17 07:52:26 -05:00
3129afa5d6
fixup decoding when recording from a non-ffmpeg suorce
2017-11-14 13:16:07 -08:00
043e44d273
fix, must clear the frame
2017-11-13 14:24:28 -08:00
d15d36f389
rework, compiles, won't open h264
2017-11-09 11:50:20 -08:00
3227599e01
google code style
2017-09-25 16:22:52 -04:00
08bdf5a729
fix build on trusty
2017-08-24 12:19:57 -04:00
a81ff85fbb
add ffmpeg decoding of a .mp4 to get the frames
2017-08-23 15:05:44 -04:00
536ccc0cec
maybe fix memleak, maybe fix crash
2017-08-10 15:44:20 -04:00
9bd6c99586
Merge branch 'master' into storageareas
2017-05-15 12:52:35 -04:00
1e45146db8
Merge pull request #1881 from mastertheknife/aarch64_neon
...
Add AArch64 ARM Neon code (complements #1823 )
2017-05-14 07:49:19 -05:00
5df7499da4
Move ARM Neon data prefetches to be after the loads
2017-05-13 19:08:18 +03:00
c66deb564f
Added ARM Neon AArch64 versions of delta
2017-05-13 09:19:13 +03:00
8315be69de
Update zm_image.cpp
...
remove extra }
2017-05-12 18:46:19 -05:00
ec2b6235a0
Added ARM Neon AArch64 version of fastblend
2017-05-12 22:59:08 +03:00
1ddf4e32cf
Merge branch 'master' into storageareas
2017-05-11 08:55:42 -04:00
0d864b2c6c
Fix delta self-test introduced in #1823 failing ( #1878 )
...
* Fix self-test introduced in #1823 failing and improve logging about the failure
* Remove unnecessary newline added by previous commit
2017-05-11 07:13:04 -04:00
fd44ff4e60
Merge branch 'master' into storageareas
2017-05-10 13:16:08 -04:00
0584454aa8
Fix conflicts in Image::Initialise() caused by merging #1810 and #1823
2017-05-10 17:37:25 +03:00
c4f471d967
Merge branch 'master' of https://github.com/abishai/ZoneMinder into abishai-master
2017-05-10 08:06:48 -05:00
ccc2cc832f
Merge branch 'armv7_neon' of https://github.com/mastertheknife/ZoneMinder into mastertheknife-armv7_neon
2017-05-10 07:45:58 -05:00
747583e9f4
Merge pull request #1810 from mastertheknife/ssse3_improvements
...
Minor zm_image SSSE3 improvements
2017-05-10 07:06:33 -05:00
6827e0412c
white and google style
2017-04-28 10:34:48 -04:00
71e6735b60
Neon32 functions now work on 64 bytes at a time. This results in 4-6x performance increase over standard functions
...
Memory allocations and image size requirements changed to be as needed for 64 byte alignment.
Self-test code for Blend modified accordingly and added Self-test for the delta functions.
2017-04-16 10:57:37 +03:00
4215f227da
Merge branch 'mastertheknife-ssse3_improvements' into storageareas
2017-04-07 13:43:09 -04:00
6ec340d525
Merge branch 'ssse3_improvements' of https://github.com/mastertheknife/ZoneMinder into mastertheknife-ssse3_improvements
2017-04-07 13:38:50 -04:00
f2dcd18297
Merge branch 'armv7_neon' of https://github.com/mastertheknife/ZoneMinder into storageareas
2017-03-30 13:46:30 -04:00
7162c62d26
Implemented a fix to get the Neon code to compile successfully with GCC < 6.0
2017-03-25 21:49:15 +03:00
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
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
29885135a6
Corrected issues in last two ARM Neon commits
2017-03-19 13:39:24 +02:00
510f65c414
Added ARM Neon (AArch32) FastBlend function
2017-03-19 13:31:44 +02:00
c5c9b52d18
Added ARM Neon (AArch32) Delta functions for 32bit color and 8bit grayscale
2017-03-19 13:02:42 +02:00
f7fcab24c4
Fixed a mistake in recent commit e7a681b8ff
2017-03-14 22:46:36 +02:00
f30192e5da
Use standard memcpy() on x86-64, as it behaves similar performs the equal or better
2017-03-14 22:41:35 +02:00
67f7ad40ae
Removed SSSE3 deinterlacing functions, as they were typically equal or slower than the standard code (when compiled with -O2 or better)
...
The function is too complicated to be vectorized efficiently
2017-03-14 22:36:26 +02:00
e7a681b8ff
Added BGRA, ARGB and ABGR variants of SSSE3 32bit color to grayscale conversion and made the code actually use them all
2017-03-14 22:29:55 +02:00
20604c2150
SSSE3 rgba->gray8 convert function now uses less instructions and is 10-20% faster
2017-03-14 16:54:00 +02:00
844b4bb5ee
SSSE3 delta functions now use less instructions and are 5-10% faster
2017-03-14 12:17:01 +02:00
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
97380f009b
implement platform-agnostic comparison without abs()
2017-01-31 10:42:57 +03:00
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06:00
006fcad10a
move jpeg context freeing to a Deinitialise function instead of ~Image. Turn down the logging
2016-10-07 11:35:14 -04:00
0950ecbcb9
Replaced loops to create color tables during initialization with statically declared arrays.
2016-08-31 19:36:14 -05:00
f1acc52913
spellcheck/codespell
2016-07-14 00:30:39 +10:00
75a98601ef
fix jpeg buffer too small
2016-07-03 14:59:05 -05:00
03b1ced568
tabs to spaces and use 2space indenting
2016-04-04 10:11:48 -04:00
8125ef0334
change types and move things around to remove compile warnings
2015-10-02 09:49:09 -04:00
5b465194f8
Renamed 'Blacken' zone type to 'Privacy'
2015-08-20 17:37:59 +02:00
acacd247c8
Really blacken all pixel colours
2015-08-20 17:17:58 +02:00
52be185fc9
Support blacken zones in all colour depths
2015-08-20 15:58:13 +02:00
6fc4525784
Blacken Zones are now correctly displayed
2015-08-20 15:01:07 +02:00
8f9ed96585
First try to implement blacken areas for monitors
2015-08-20 14:20:41 +02:00
68adcc9e67
Merge branch 'large-timestamp' of https://github.com/schrorg/ZoneMinder into schrorg-large-timestamp
...
Conflicts:
CMakeLists.txt
configure.ac
src/zm_monitor.cpp
src/zm_monitor.h
version
2015-08-18 14:07:38 -05:00
99c8af4a17
Bring up to date with master (mostly)
2015-08-17 22:52:51 -04:00
3368d4f474
Removed untranslated "Font size" from language files, corrected white
...
space and make font size a const int
2015-08-10 15:35:19 +02:00
7f3a07f21b
Add label size to monitor options (database and backend part)
...
This commit bumps version to 1.28.101 because of database schema change
2015-08-10 15:35:18 +02:00
5a0d0ca5a3
Made large font selectable by a constant
2015-08-06 17:42:52 +02:00
c733fec476
First (working) steps for adding large timestamp to images
2015-08-06 14:43:10 +02:00
3e5f6c65d3
Fix to scale, moving the +1's into the buffer allocation instead of calculation of new_width and new_height
2015-07-24 13:30:58 -04:00
72a92ee9d5
Add exif to jpg images saved
2015-07-23 19:34:39 -04:00
602f703df8
roudn up when calculating buffer size for scaled image. Fixes #932
2015-07-15 10:22:57 -04:00
12516da3dc
Patched in changes to 1.28.1 to allow OmniOS/Illumos to build and work
...
haven't attempted to build yet, there are some changes
2015-05-17 17:18:54 -07:00
eddada011c
spelling corrections (thanks, /usr/bin/codespell)
2015-04-19 20:38:23 +10:00
065a372678
one small fix for a log line where the 4th parameter wasn't included. The rest are very small optimisations.
2015-04-10 13:26:17 -04:00
41edb4d958
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into memory_fix_leaks
2014-11-29 03:38:45 +01:00
00287ab5dd
more debug output when buffer is undersized.
2014-11-25 14:51:20 -05:00
9eee62c6d2
Fix memory leaks in Image class
2014-11-15 12:58:08 +01:00
c9e04e48bb
Am remarking out some Debugs that would only be useful to someone debugging image code. Of no use to end users and get called so much that must cause a performance problem, especially when debug logging is actually turned on
2014-09-18 15:44:53 -04:00
4de46c7988
Fix wrong values used for type boolean
2014-05-05 09:26:32 +03:00
69f6af93d1
Patch for Debian bug 736516 - FTBFS on powerpc arch.
2014-03-16 10:51:54 -05:00
5786af0d4e
Added missing x86 compile guards to zm_image.cpp. This should allow ZoneMinder to at least build again on non-x86 architectures.
2014-01-23 14:49:46 +11:00
f6bf3743f7
very sub-optimisation, removing duplicate comparisons
2013-11-04 10:50:40 -05:00
8cecadadc2
Fix rotation bug caused by commit 5a9364703c
2013-10-10 06:55:45 +03:00
c526fcedd7
Fix an issue created by commit 2b568906e5: Log flooded with image dimensions differ errors
2013-09-24 07:15:37 +03:00
5a9364703c
a better fix for the sign comparison warnings during compilation
2013-09-17 10:28:59 +03:00
c3f7af7cd1
Fix sign warning during compilation
2013-09-15 04:13:09 +03:00
2b568906e5
Fixed greyscale four field deinterlacing not processing last line, broken ssse3 color->greyscale conversion and improved error handling when reading\decoding jpegs
2013-09-10 18:37:56 +03:00
33cbd89212
Migrate svn to git
2013-03-17 00:45:21 +01:00
Isaac Connor
Isaac Connor
Andrew Bauer
Isaac Connor
APHW2 MFGENG
Kfir Itzhak
Andrew Bauer
Qu Wenruo
abishai
Andy Bauer
Isaac Connor
Matt Durant
Dmitry Smirnov
Robin Daermann
Linwood-F
Rick Sayre
Emmanuel Papin
Peter Howard
nextime