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 |
|
Isaac Connor
|
e675c8373e
|
Merge branch 'release-1.34'
|
2020-07-07 16:15:56 -04:00 |
|
Isaac Connor
|
916d1ed59e
|
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
|
2020-07-07 16:15:23 -04:00 |
Isaac Connor
|
c79c65e72e
|
spacing fixes
|
2020-07-07 16:14:57 -04:00 |
|
Isaac Connor
|
af74ecac4c
|
Pass along the image linesize to Image constructors so that Image knows about the requirement for it to be 32byte aligned.
|
2020-07-07 16:14:38 -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
|
cae8978501
|
add an alignment variable to ffmpeg_camera to use wherever we want to tell ffmpeg about the buffer and linesize alignment. Figure out linesize in the constructor so that zm_monitor can pass the info along to zm_image.
|
2020-07-07 16:12:14 -04:00 |
|
Isaac Connor
|
209cbe1000
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-07-07 09:23:46 -04:00 |
|
Isaac Connor
|
acf8a30434
|
Merge branch 'release-1.34'
|
2020-07-07 09:22:56 -04:00 |
|
Isaac Connor
|
533876f313
|
rewrite code to use fewer lines. No logic change.
|
2020-07-07 09:16:42 -04:00 |
Andrew Bauer
|
dcab218a2e
|
remove global config item CREATE_ANALYSIS_IMAGES
|
2020-07-06 12:22:41 -05:00 |
|
Isaac Connor
|
864cd4c178
|
introduce a linesize variable which represents the # of bytes to hold a line of the image in the buffer. May be > width * colours
|
2020-07-05 17:51:57 -04:00 |
|
Isaac Connor
|
2eac69dd88
|
fix duplicate extrapad names
|
2020-07-04 17:16:43 -04:00 |
|
Isaac Connor
|
2db65d3821
|
Merge branch 'release-1.34'
|
2020-07-04 09:09:24 -04:00 |
|
Isaac Connor
|
e137e1dacf
|
Don't consult EVENT_CLOSE_MODE if mode is RECORD
|
2020-06-26 19:30:35 -04:00 |
|
Isaac Connor
|
728f41fe9c
|
Log @debug when a linked monitor is disconnected. Use ZM_MAX_RESTART_DELAY instead of hard coded 60 seconds before next reconnect attempt
|
2020-06-23 16:56:35 -04:00 |
|
Isaac Connor
|
31a3be5c8e
|
check shared_data->valid when checking if LinkedMonitor is connected
|
2020-06-23 15:05:17 -04:00 |
|
Isaac Connor
|
7354b4d30f
|
Fix compile on old ffmpeg
|
2020-06-23 14:43:11 -04:00 |
|
Isaac Connor
|
a15aace2fb
|
introduce shared_data->zmc_heartbeat_time and zma_heartbeat_time.
|
2020-06-22 10:40:00 -04:00 |
|
Isaac Connor
|
4d020bab56
|
spacing
|
2020-06-22 10:39:29 -04:00 |
|
Isaac Connor
|
ae5116ff9c
|
improve efficiency of outputting device query. The constant strlen's were terrible.
|
2020-06-15 15:29:26 -04:00 |
|
Isaac Connor
|
bd287d7c7c
|
Fix segfault when timestamp contains an unimplemented character. Fixes #2943
|
2020-05-29 11:45:38 -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
|
662b9894bd
|
Don't delete send_image because it is static. Fixes #2923
|
2020-05-23 16:12:55 -04:00 |
|
Isaac Connor
|
ce9e2c8b27
|
Merge branch 'release-1.34'
|
2020-05-15 11:53:09 -04:00 |
|
Isaac Connor
|
9ea1c637f9
|
Remove debug Exiting message
|
2020-05-15 11:48:41 -04:00 |
|
Isaac Connor
|
6bb2c09a72
|
Merge branch 'release-1.34'
|
2020-05-15 11:41:34 -04:00 |
|
Isaac Connor
|
7a85be59be
|
Remove errant closing db debug output
|
2020-05-15 10:22:58 -04:00 |
|
Isaac Connor
|
d92772343a
|
Merge branch 'release-1.34'
|
2020-05-14 12:02:50 -04:00 |
|
Isaac Connor
|
25a772c5eb
|
reorder logic a bit to make it easier to read. Make exit_zmu not return a value.
|
2020-05-14 12:02:02 -04:00 |
|
Isaac Connor
|
16e7ca5a51
|
failure opening a monitor should not be fatal.
|
2020-05-14 12:01:24 -04:00 |
|
Isaac Connor
|
402c0c6a1b
|
Fix build on older ffmpeg
|
2020-05-14 12:01:03 -04:00 |
|
Isaac Connor
|
efbab4e2bc
|
Dont' call mysql_library_end as it segfaults and hangs.
|
2020-05-14 12:00:36 -04:00 |
|
Isaac Connor
|
bbf64de40e
|
If there is a failure when decoding due to lack of support for the codec profile, re-init without hwaccel
|
2020-05-13 08:04:53 -04:00 |
|
Isaac Connor
|
7e80b33ee0
|
If there is a failure when decoding due to lack of support for the codec profile, re-init without hwaccel
|
2020-05-12 15:10:08 -04:00 |
|
Isaac Connor
|
81cd338545
|
Merge branch 'master' of github.com:zoneminder/ZoneMinder
|
2020-05-11 08:34:19 -04:00 |
|
Isaac Connor
|
3d278eddf8
|
erge branch 'master' into batch_frame_records
|
2020-05-08 20:16:36 -04:00 |
|
Isaac Connor
|
1f6e68c129
|
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
|
2020-05-08 17:26:02 -04:00 |
|
Isaac Connor
|
a798e874fe
|
Spacing
|
2020-05-07 13:44:32 -04:00 |
|
Isaac Connor
|
fcf6eb2631
|
Add setting the codecpar->codec_type as well. Fixes detecting stream type
|
2020-05-07 13:44:02 -04:00 |
|
Isaac Connor
|
40633830d0
|
Code style/spacing
|
2020-05-07 13:43:35 -04:00 |
|
Isaac Connor
|
b1b258ab9b
|
Code Style and use backtick escapes on sql column names, specifically Function
|
2020-05-07 13:43:05 -04:00 |
|
Isaac Connor
|
6939f9953a
|
code style, merge Debug lines and consult zm_terminate in the main while loop
|
2020-05-07 13:41:39 -04:00 |
|
Isaac Connor
|
87d0eb88b7
|
code style, merge Debug lines and consult zm_terminate in the main while loop
|
2020-05-07 13:41:29 -04:00 |
|
Isaac Connor
|
09740d72a4
|
code style, merge Debug lines and consult zm_terminate in the main while loop
|
2020-05-07 13:41:09 -04:00 |
|
Isaac Connor
|
7489d66557
|
use is_video_stream utility function.
|
2020-05-07 13:40:32 -04:00 |
|
Isaac Connor
|
9f73a55087
|
Make params to is_video_* a const because we don
't alter it
|
2020-05-07 13:39:32 -04:00 |
|
Isaac Connor
|
bab15217f5
|
Make zm_terminate available to anyone who includes zm.h
|
2020-05-07 13:38:56 -04:00 |
|
Isaac Connor
|
e9b1eacc6d
|
Fix not finding stream with old libs
|
2020-05-02 11:49:28 -04:00 |