Isaac Connor
|
2f57ccc9b9
|
Merge branch 'release-1.34'
|
2020-07-29 16:27:01 -04:00 |
Isaac Connor
|
4ed0ad26a7
|
bail early if fwrite fails
|
2020-07-29 14:01:52 -04:00 |
Isaac Connor
|
b1054a7db6
|
bail earlier if writing content-length fails. Dropped connections aren't really errors, make them Info. Fixes #2996
|
2020-07-29 13:39:00 -04:00 |
Isaac Connor
|
7511b1fd7e
|
Fix for saving jpegs
|
2020-07-25 14:25:45 -04:00 |
Isaac Connor
|
859428db51
|
remove debug
|
2020-07-24 15:42:53 -04:00 |
Isaac Connor
|
f4a0f91d7f
|
nothing
|
2020-07-24 15:27:05 -04:00 |
Isaac Connor
|
1f889bd086
|
def don't use linesize when allocating share images
|
2020-07-24 15:26:48 -04:00 |
Isaac Connor
|
4ecfa32601
|
remove uneccessary multiplications from jpeg compression.
|
2020-07-24 15:26:28 -04:00 |
Isaac Connor
|
0e9da28a97
|
Don't pass linesize to shared images. Shared images have to have a contiguous chunk of memory.
|
2020-07-24 12:48:38 -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
|
d9a9aeef1d
|
if linesizes don't match, allocate a frame buffer and use that when sws_scaleing and then copy to the image buffer.
|
2020-07-24 12:37:24 -04:00 |
Isaac Connor
|
490009446d
|
fix use of int or unsigned long instead of int for monitor id
|
2020-07-23 19:32:30 -04:00 |
Isaac Connor
|
559fe15e3f
|
fix use of int or unsigned long instead of int for monitor id
|
2020-07-23 19:32:25 -04:00 |
Isaac Connor
|
e9681fcdcf
|
fix use of int or unsigned long instead of int for monitor id
|
2020-07-23 19:31:12 -04:00 |
Isaac Connor
|
ee4d90d906
|
remove debug
|
2020-07-23 17:15:43 -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
|
4f3b6a063e
|
don't cast fps to an int... values like 2.038 become 1.
|
2020-07-23 16:08:57 -04:00 |
Isaac Connor
|
e3a2099ca8
|
fix crash because we weren't setting alarm status
|
2020-07-23 16:08:35 -04:00 |
Isaac Connor
|
18272b9587
|
add debug for prealarmcount
|
2020-07-23 12:05:53 -04:00 |
Isaac Connor
|
7aa46df50f
|
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
|
2020-07-23 12:05:32 -04:00 |
Isaac Connor
|
09d02e94d9
|
fix lack of c_str on path
|
2020-07-23 11:53:54 -04:00 |
Isaac Connor
|
27fed8b227
|
spacing
|
2020-07-23 11:53:33 -04:00 |
Isaac Connor
|
172eaad8bd
|
fix capture jpeg saving due to use of std::string
|
2020-07-22 22:45:11 -04:00 |
Isaac Connor
|
1416bc547e
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-07-22 17:37:52 -04:00 |
Isaac Connor
|
f635afe00f
|
spacing
|
2020-07-22 17:30:39 -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
|
7e6c637ec3
|
Unexpected colours while bad should only cause failure to annotate, not panic
|
2020-07-22 11:34:54 -04:00 |
Isaac Connor
|
13e8ed1924
|
Clean up code that updates event with video_name. Fix video_file assignment missing /
|
2020-07-21 16:34:46 -04:00 |
Isaac Connor
|
f217ab54a3
|
When event_close_mode == CLOSE_ALARM and so we want to close the recording and start a new one, don't do it when alarm_frame_count > 1 until alarm_frames > alarm_frame_count. I believe this fixes a mem leak
|
2020-07-21 16:17:46 -04:00 |
Isaac Connor
|
f593261136
|
Convert use of char path[PATH_MAX] to std::string. Fixes potential overflows, quiets compile, should reduce ram quite a bit and might event be faster. Code is also more readable.
|
2020-07-21 16:16:16 -04:00 |
Isaac Connor
|
2eec85eaff
|
Convert use of char path[PATH_MAX] to std::string. Fixes potential overflows, quiets compile, should reduce ram quite a bit and might event be faster. Code is also more readable.
|
2020-07-21 16:10:05 -04:00 |
Isaac Connor
|
785087022d
|
Clear PerAlarmFrames on shutdown
|
2020-07-20 21:09:07 -04:00 |
Isaac Connor
|
a0be7b1fcb
|
fixup EmptyPreAlarmFrames
|
2020-07-20 21:02:49 -04:00 |
Isaac Connor
|
41dfb8ae38
|
fix duplicate jpeg_create_compress memleak
|
2020-07-20 21:02:06 -04:00 |
Isaac Connor
|
d716d1d686
|
Merge branch 'release-1.34'
|
2020-07-20 16:25:41 -04:00 |
Isaac Connor
|
5c844f9cae
|
remove extra space
|
2020-07-20 10:22:40 -04:00 |
Isaac Connor
|
01892352da
|
rename sseversion to sse_version
|
2020-07-19 17:50:47 -04:00 |
Isaac Connor
|
6b39f59b3a
|
use delete[] instead of delete.
|
2020-07-16 16:00:23 -04:00 |
Isaac Connor
|
2c056c188f
|
Fix compile on old ffmpeg
|
2020-07-16 15:59:08 -04:00 |
Isaac Connor
|
4e2732e12d
|
Priming capture logs should be debug not Info
|
2020-07-16 15:51:24 -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
|
d849ee54a4
|
Update state to ALARM AFTER we have opened the event, so that we get the correct event Id. Fixes #2978 Fixes #2894
|
2020-07-16 15:47:01 -04:00 |
Isaac Connor
|
a8e46feb12
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-07-16 15:42:56 -04:00 |
Isaac Connor
|
3658c3b589
|
Update state to ALARM AFTER we have opened the event, so that we get the correct event Id. Fixes #2978 Fixes #2894
|
2020-07-16 15:36:26 -04:00 |
Isaac Connor
|
c2a025300f
|
Remove debug
|
2020-07-16 15:34:29 -04:00 |
Isaac Connor
|
9e06385f26
|
Update linesize when using AssignDirect. Fixes #2979
|
2020-07-16 14:50:50 -04:00 |
Isaac Connor
|
9b05337e57
|
Priming capture logs should be debug level, especially if they ar egoing to log passwords
|
2020-07-13 15:03:04 -04:00 |
Isaac Connor
|
880219bb0f
|
Merge branch 'release-1.34'
|
2020-07-07 18:58:32 -04:00 |
Isaac Connor
|
9b447bde8e
|
remove extra {
|
2020-07-07 18:56:51 -04:00 |