0f7c46e2cc
Merge branch 'master' into zma_to_thread
2021-01-15 14:56:00 -05:00
6845c2cab4
Fix padding issue in timestamp code
2021-01-15 11:46:30 +05:30
f3c4bb0027
Add AVBufferRef setup when Populating AVFrame from Image. This allows hwtranfer to work because it relies on AVBuffer AVFrame. Please note that we don't want AVBuffer to free the buffer so we pass an empty function to it.
2021-01-11 13:46:50 -05:00
9fb8e51ff2
Set imagePixFormat everywhere. Add PopulateFrame which creates and AVFrame pointing to the image's buffer. Will do this with proper refcounting eventually
2021-01-11 13:46:50 -05:00
ee8f940acf
Add some debug
2020-12-23 18:18:16 -05:00
39212d8ca0
Remove or increase debug level
2020-12-15 15:59:22 -05:00
b261fbb397
Merge branch 'master' into zma_to_thread
2020-12-07 16:26:26 -05:00
8012438573
Fix font rendering issue
2020-12-04 05:22:54 +05:30
b2e5df1854
Need to -1 to size parameter when calling SetFontSize
2020-12-03 18:31:41 -05:00
1bbcf4ea31
spacing and make assignments a little more readable/efficient maybe
2020-12-03 16:43:27 -05:00
cfd4c17953
Include invalid font path in the error message
2020-12-03 13:35:12 -05:00
836cd2d58d
Merge branch 'Font' of https://github.com/hax0kartik/zoneminder into font
2020-11-30 09:45:39 -05:00
d290ffc1b3
Set individual rgb components instead of memset which is wrong
2020-11-30 17:57:59 +05:30
32e2563643
Free font data when destructor is called
2020-11-29 10:53:20 +05:30
890a52605f
Satisfy cpplint
2020-11-29 10:25:06 +05:30
bbeb599fce
Remove bigfont
2020-11-28 20:28:34 +05:30
b212b0e450
Allow modifying font file location
2020-11-28 20:18:17 +05:30
0a7b7b9661
Bound check values
2020-11-28 19:44:45 +05:30
528699f942
Use ctzll + new font format for improving drawing speed
2020-11-28 18:46:20 +05:30
58ccea6aa8
use better c++ class initialisation. Use ZM_BUFTYPE_DONTFREE instead of 0 for init buffertype.
2020-11-19 16:37:28 -05:00
2eda49333f
Merge branch 'master' into zma_to_thread
2020-10-20 16:20:29 -04:00
059d7d388f
Make centerCoord take a font size parameter to fix centering when using large font.
2020-10-05 13:15:39 -04:00
a39a656373
Merge branch 'master' into zma_to_thread
2020-09-29 11:02:40 -04:00
8f980a1168
Convert NULL/0 to nullptr
...
The 0 -> nullptr changes should definitely improve readability.
2020-08-26 22:03:40 +02:00
5fb56c9f57
Merge branch 'master' into zma_to_thread
2020-08-07 17:52:43 -04:00
2f57ccc9b9
Merge branch 'release-1.34'
2020-07-29 16:27:01 -04:00
7511b1fd7e
Fix for saving jpegs
2020-07-25 14:25:45 -04:00
4ecfa32601
remove uneccessary multiplications from jpeg compression.
2020-07-24 15:26:28 -04:00
0a9fdb4eb3
Fix second jump by matching final WriteJpeg destination. Just use linesize instead of assigning to row_stride
2020-07-24 12:41:27 -04:00
cceb010048
set linesize in WriteBuffer which also sets colours, width, etc. Fixes segfault when streaming from jpegs
2020-07-23 17:14:56 -04:00
1416bc547e
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-22 17:37:52 -04:00
07165aed98
mostly spacing. Also set new_size from line_size in Assign(Image&) and set linesize in the assigned image
2020-07-22 17:30:28 -04:00
cf07e0a089
fix crashes, current status is: local camera works and can be viewed. Amazing
2020-07-22 13:41:27 -04:00
3641797500
Merge branch 'master' into zma_to_thread
2020-07-22 13:14:40 -04:00
7e6c637ec3
Unexpected colours while bad should only cause failure to annotate, not panic
2020-07-22 11:34:54 -04:00
869860bb26
Merge branch 'master' into zma_to_thread
2020-07-21 17:49:39 -04:00
7575afc8d5
Merge branch 'master' into zma_to_thread
2020-07-21 17:38:32 -04:00
41dfb8ae38
fix duplicate jpeg_create_compress memleak
2020-07-20 21:02:06 -04:00
01892352da
rename sseversion to sse_version
2020-07-19 17:50:47 -04:00
a7b76dfe41
Remove debug
2020-07-16 15:48:09 -04:00
0a6321ee56
Update linesize when using AssignDirect. Fixes #2979
2020-07-16 15:48:06 -04:00
fd9272241a
Introduce constructors that can be passed a linesize which is the # of bytes to use to store a line of image. This can be different from the image width * colours as it should be 32byte aligned for use with sws_scale.
2020-07-07 16:13:41 -04:00
2637c887f8
Fix segfault when timestamp contains an unimplemented character. Fixes #2943
2020-05-29 11:44:34 -04:00
4ff341a0f5
Merge branch 'master' into zma_to_thread
2020-05-02 18:03:42 -04:00
ffcef8a42a
spacing and make sws_context static global so we don't have to keep initializing it when playing back from mp4 in eventstream.
2020-05-01 15:22:32 -04:00
e21ffbea7d
Merge branch 'fix_zms'
2020-04-26 18:43:39 -04:00
ae9a5766f5
Merge branch 'release-1.34' into fix_zms
2020-04-26 18:19:30 -04:00
c1dfb8571a
revert bogus code in Image(AvFrame)
2020-02-24 14:10:54 -05:00
b4729f5aa8
Handle other colours and subpixel formats in Image::Image(AvFrame*) than 32bit RGBA
2020-02-21 09:34:44 -05:00
09fcbad666
Merge branch 'master' into zma_to_thread
2019-11-30 14:59:39 -05:00
60ec545683
fix compile warning due to snprintf into a too small char array
2019-10-18 09:43:25 -04:00
9a3765f6aa
spacing and google code style
2019-09-17 10:31:48 -04:00
85e0a086b3
fixes #2694
2019-09-03 11:55:37 -04:00
396be10d6f
Merge branch 'master' into zma_to_thread
2019-08-22 12:57:00 -04:00
5b62c91cc2
Improve some debugging to try to diagnose recent segfault report
2019-08-10 14:46:05 -04:00
eb005e8b9c
FIFO support for zoneminder zone debugging ( #2594 )
...
Adds fifo options for diagnostic images for much lower impact diagnostics mode. Diagnostic images are only written when there is a client listening for them (otherwise they are skipped). Also added a json stream for the detection data so you can see in real time the pixels or blobs detected for the motion. This allows for easy real time stream of both delta and reference images (as video streams) along with the detection numbers.
2019-05-16 15:37:03 -04:00
bddef3ad59
Add required update_function_points to Assign
2019-02-26 09:38:26 -05:00
279e0d8bcf
Merge branch 'storageareas' into zma_to_thread
2019-02-22 11:39:58 -05:00
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
Isaac Connor
hax0kartik
Isaac Connor
Peter Keresztes Schmidt
Isaac Connor
Mitch Capper
Andrew Bauer
Isaac Connor
APHW2 MFGENG
Kfir Itzhak