Isaac Connor
|
7cc21b0d0b
|
Always load AvFrame to RGBA
|
2021-01-26 12:22:07 -05:00 |
|
Isaac Connor
|
0f7c46e2cc
|
Merge branch 'master' into zma_to_thread
|
2021-01-15 14:56:00 -05:00 |
|
hax0kartik
|
6845c2cab4
|
Fix padding issue in timestamp code
|
2021-01-15 11:46:30 +05:30 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
ee8f940acf
|
Add some debug
|
2020-12-23 18:18:16 -05:00 |
|
Isaac Connor
|
39212d8ca0
|
Remove or increase debug level
|
2020-12-15 15:59:22 -05:00 |
|
Isaac Connor
|
b261fbb397
|
Merge branch 'master' into zma_to_thread
|
2020-12-07 16:26:26 -05:00 |
|
hax0kartik
|
8012438573
|
Fix font rendering issue
|
2020-12-04 05:22:54 +05:30 |
|
Isaac Connor
|
b2e5df1854
|
Need to -1 to size parameter when calling SetFontSize
|
2020-12-03 18:31:41 -05:00 |
|
Isaac Connor
|
1bbcf4ea31
|
spacing and make assignments a little more readable/efficient maybe
|
2020-12-03 16:43:27 -05:00 |
|
Isaac Connor
|
cfd4c17953
|
Include invalid font path in the error message
|
2020-12-03 13:35:12 -05:00 |
|
Isaac Connor
|
836cd2d58d
|
Merge branch 'Font' of https://github.com/hax0kartik/zoneminder into font
|
2020-11-30 09:45:39 -05:00 |
|
hax0kartik
|
d290ffc1b3
|
Set individual rgb components instead of memset which is wrong
|
2020-11-30 17:57:59 +05:30 |
|
hax0kartik
|
32e2563643
|
Free font data when destructor is called
|
2020-11-29 10:53:20 +05:30 |
|
hax0kartik
|
890a52605f
|
Satisfy cpplint
|
2020-11-29 10:25:06 +05:30 |
|
hax0kartik
|
bbeb599fce
|
Remove bigfont
|
2020-11-28 20:28:34 +05:30 |
|
hax0kartik
|
b212b0e450
|
Allow modifying font file location
|
2020-11-28 20:18:17 +05:30 |
|
hax0kartik
|
0a7b7b9661
|
Bound check values
|
2020-11-28 19:44:45 +05:30 |
|
hax0kartik
|
528699f942
|
Use ctzll + new font format for improving drawing speed
|
2020-11-28 18:46:20 +05:30 |
|
Isaac Connor
|
58ccea6aa8
|
use better c++ class initialisation. Use ZM_BUFTYPE_DONTFREE instead of 0 for init buffertype.
|
2020-11-19 16:37:28 -05:00 |
|
Isaac Connor
|
2eda49333f
|
Merge branch 'master' into zma_to_thread
|
2020-10-20 16:20:29 -04:00 |
|
Isaac Connor
|
059d7d388f
|
Make centerCoord take a font size parameter to fix centering when using large font.
|
2020-10-05 13:15:39 -04:00 |
|
Isaac Connor
|
a39a656373
|
Merge branch 'master' into zma_to_thread
|
2020-09-29 11:02:40 -04:00 |
|
Peter Keresztes Schmidt
|
8f980a1168
|
Convert NULL/0 to nullptr
The 0 -> nullptr changes should definitely improve readability.
|
2020-08-26 22:03:40 +02:00 |
|
Isaac Connor
|
5fb56c9f57
|
Merge branch 'master' into zma_to_thread
|
2020-08-07 17:52:43 -04:00 |
|
Isaac Connor
|
2f57ccc9b9
|
Merge branch 'release-1.34'
|
2020-07-29 16:27:01 -04:00 |
|
Isaac Connor
|
7511b1fd7e
|
Fix for saving jpegs
|
2020-07-25 14:25:45 -04:00 |
|
Isaac Connor
|
4ecfa32601
|
remove uneccessary multiplications from jpeg compression.
|
2020-07-24 15:26:28 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
1416bc547e
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-07-22 17:37:52 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
cf07e0a089
|
fix crashes, current status is: local camera works and can be viewed. Amazing
|
2020-07-22 13:41:27 -04:00 |
|
Isaac Connor
|
3641797500
|
Merge branch 'master' into zma_to_thread
|
2020-07-22 13:14:40 -04:00 |
|
Isaac Connor
|
7e6c637ec3
|
Unexpected colours while bad should only cause failure to annotate, not panic
|
2020-07-22 11:34:54 -04:00 |
|
Isaac Connor
|
869860bb26
|
Merge branch 'master' into zma_to_thread
|
2020-07-21 17:49:39 -04:00 |
|
Isaac Connor
|
7575afc8d5
|
Merge branch 'master' into zma_to_thread
|
2020-07-21 17:38:32 -04:00 |
|
Isaac Connor
|
41dfb8ae38
|
fix duplicate jpeg_create_compress memleak
|
2020-07-20 21:02:06 -04:00 |
|
Isaac Connor
|
01892352da
|
rename sseversion to sse_version
|
2020-07-19 17:50:47 -04:00 |
|
Isaac Connor
|
a7b76dfe41
|
Remove debug
|
2020-07-16 15:48:09 -04:00 |
|
Isaac Connor
|
0a6321ee56
|
Update linesize when using AssignDirect. Fixes #2979
|
2020-07-16 15:48:06 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
2637c887f8
|
Fix segfault when timestamp contains an unimplemented character. Fixes #2943
|
2020-05-29 11:44:34 -04:00 |
|
Isaac Connor
|
4ff341a0f5
|
Merge branch 'master' into zma_to_thread
|
2020-05-02 18:03:42 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
e21ffbea7d
|
Merge branch 'fix_zms'
|
2020-04-26 18:43:39 -04:00 |
|
Isaac Connor
|
ae9a5766f5
|
Merge branch 'release-1.34' into fix_zms
|
2020-04-26 18:19:30 -04:00 |
|
Isaac Connor
|
c1dfb8571a
|
revert bogus code in Image(AvFrame)
|
2020-02-24 14:10:54 -05:00 |
|
Isaac Connor
|
b4729f5aa8
|
Handle other colours and subpixel formats in Image::Image(AvFrame*) than 32bit RGBA
|
2020-02-21 09:34:44 -05:00 |
|