09b12a7dac
Remove extra space in event name
2020-08-13 10:51:10 -05:00
d42424d6d8
Merge branch 'release-1.34'
2020-08-11 11:41:11 -04:00
afae319c94
Fix MOCORD not going into ALARM state.
2020-08-11 11:02:26 -04:00
bf2cb5fb1f
Add PrimeCapture to zm_remote_camera_http. PrimeCapture is used to determine if we can connect and so by not implementing it, monitors like this say capturing even though they are not.
2020-08-08 10:21:06 -04:00
c0ab8bf90d
Merge branch 'master' into zma_to_thread
2020-08-07 17:53:32 -04:00
5fb56c9f57
Merge branch 'master' into zma_to_thread
2020-08-07 17:52:43 -04:00
98f315951e
Merge pull request #3003 from marillat/patch-1
...
Don't prefix manpage with zoneminder-
2020-08-07 12:34:30 -07:00
ed496e74fc
Update CMakeLists.txt
2020-08-07 07:54:58 +02:00
a19990f4d7
Merge branch 'release-1.34'
2020-08-06 11:57:35 -04:00
302189a65e
Don't use camera->LineSize when allocating shared images. It doesn't work because other processes don't know about it.
2020-08-06 10:11:00 -04:00
4d4fab46d6
Spacing, use FFMpegInit instead of deprecated ffmpeg calls
2020-08-05 19:17:00 -04:00
b867d0c463
Fix image copy when line sizes are not the same.
2020-08-05 11:33:22 -04:00
be05040a47
fix rotated images
2020-07-30 19:50:25 -04:00
05107bb2f7
Add debug of unused options
2020-07-30 15:16:31 -04:00
d8cd4386cf
rename GetOptEncoderParams to GetOptEncoderParams to GetOptEncoderParamsVec so that we can get at the std::string if we want to.
...
Use EncoderParams when setting movflags in VideoStore.
Move the content of this option to a help popup so that we can remove the comments from it. av_dict_parse doesn't handle the hash tag as a comment.
2020-07-30 15:06:05 -04:00
2f57ccc9b9
Merge branch 'release-1.34'
2020-07-29 16:27:01 -04:00
4ed0ad26a7
bail early if fwrite fails
2020-07-29 14:01:52 -04:00
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
7511b1fd7e
Fix for saving jpegs
2020-07-25 14:25:45 -04:00
859428db51
remove debug
2020-07-24 15:42:53 -04:00
f4a0f91d7f
nothing
2020-07-24 15:27:05 -04:00
1f889bd086
def don't use linesize when allocating share images
2020-07-24 15:26:48 -04:00
4ecfa32601
remove uneccessary multiplications from jpeg compression.
2020-07-24 15:26:28 -04:00
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
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
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
490009446d
fix use of int or unsigned long instead of int for monitor id
2020-07-23 19:32:30 -04:00
559fe15e3f
fix use of int or unsigned long instead of int for monitor id
2020-07-23 19:32:25 -04:00
e9681fcdcf
fix use of int or unsigned long instead of int for monitor id
2020-07-23 19:31:12 -04:00
ee4d90d906
remove debug
2020-07-23 17:15:43 -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
4f3b6a063e
don't cast fps to an int... values like 2.038 become 1.
2020-07-23 16:08:57 -04:00
e3a2099ca8
fix crash because we weren't setting alarm status
2020-07-23 16:08:35 -04:00
18272b9587
add debug for prealarmcount
2020-07-23 12:05:53 -04:00
7aa46df50f
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
2020-07-23 12:05:32 -04:00
09d02e94d9
fix lack of c_str on path
2020-07-23 11:53:54 -04:00
27fed8b227
spacing
2020-07-23 11:53:33 -04:00
172eaad8bd
fix capture jpeg saving due to use of std::string
2020-07-22 22:45:11 -04:00
1416bc547e
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-22 17:37:52 -04:00
f635afe00f
spacing
2020-07-22 17:30:39 -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
d23dc42981
fix merge from master, make it compile
2020-07-21 18:48:45 -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
13e8ed1924
Clean up code that updates event with video_name. Fix video_file assignment missing /
2020-07-21 16:34:46 -04:00
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
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
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
785087022d
Clear PerAlarmFrames on shutdown
2020-07-20 21:09:07 -04:00
a0be7b1fcb
fixup EmptyPreAlarmFrames
2020-07-20 21:02:49 -04:00
41dfb8ae38
fix duplicate jpeg_create_compress memleak
2020-07-20 21:02:06 -04:00
d716d1d686
Merge branch 'release-1.34'
2020-07-20 16:25:41 -04:00
5c844f9cae
remove extra space
2020-07-20 10:22:40 -04:00
01892352da
rename sseversion to sse_version
2020-07-19 17:50:47 -04:00
6b39f59b3a
use delete[] instead of delete.
2020-07-16 16:00:23 -04:00
2c056c188f
Fix compile on old ffmpeg
2020-07-16 15:59:08 -04:00
4e2732e12d
Priming capture logs should be debug not Info
2020-07-16 15:51:24 -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
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
a8e46feb12
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-16 15:42:56 -04:00
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
c2a025300f
Remove debug
2020-07-16 15:34:29 -04:00
9e06385f26
Update linesize when using AssignDirect. Fixes #2979
2020-07-16 14:50:50 -04:00
9b05337e57
Priming capture logs should be debug level, especially if they ar egoing to log passwords
2020-07-13 15:03:04 -04:00
880219bb0f
Merge branch 'release-1.34'
2020-07-07 18:58:32 -04:00
9b447bde8e
remove extra {
2020-07-07 18:56:51 -04:00
e675c8373e
Merge branch 'release-1.34'
2020-07-07 16:15:56 -04:00
916d1ed59e
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
2020-07-07 16:15:23 -04:00
c79c65e72e
spacing fixes
2020-07-07 16:14:57 -04:00
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
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
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
209cbe1000
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-07 09:23:46 -04:00
acf8a30434
Merge branch 'release-1.34'
2020-07-07 09:22:56 -04:00
533876f313
rewrite code to use fewer lines. No logic change.
2020-07-07 09:16:42 -04:00
dcab218a2e
remove global config item CREATE_ANALYSIS_IMAGES
2020-07-06 12:22:41 -05:00
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
2eac69dd88
fix duplicate extrapad names
2020-07-04 17:16:43 -04:00
2db65d3821
Merge branch 'release-1.34'
2020-07-04 09:09:24 -04:00
e137e1dacf
Don't consult EVENT_CLOSE_MODE if mode is RECORD
2020-06-26 19:30:35 -04:00
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
31a3be5c8e
check shared_data->valid when checking if LinkedMonitor is connected
2020-06-23 15:05:17 -04:00
7354b4d30f
Fix compile on old ffmpeg
2020-06-23 14:43:11 -04:00
a15aace2fb
introduce shared_data->zmc_heartbeat_time and zma_heartbeat_time.
2020-06-22 10:40:00 -04:00
4d020bab56
spacing
2020-06-22 10:39:29 -04:00
ae5116ff9c
improve efficiency of outputting device query. The constant strlen's were terrible.
2020-06-15 15:29:26 -04:00
bd287d7c7c
Fix segfault when timestamp contains an unimplemented character. Fixes #2943
2020-05-29 11:45:38 -04:00
2637c887f8
Fix segfault when timestamp contains an unimplemented character. Fixes #2943
2020-05-29 11:44:34 -04:00
662b9894bd
Don't delete send_image because it is static. Fixes #2923
2020-05-23 16:12:55 -04:00
ce9e2c8b27
Merge branch 'release-1.34'
2020-05-15 11:53:09 -04:00
9ea1c637f9
Remove debug Exiting message
2020-05-15 11:48:41 -04:00
6bb2c09a72
Merge branch 'release-1.34'
2020-05-15 11:41:34 -04:00
7a85be59be
Remove errant closing db debug output
2020-05-15 10:22:58 -04:00
d92772343a
Merge branch 'release-1.34'
2020-05-14 12:02:50 -04:00
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
16e7ca5a51
failure opening a monitor should not be fatal.
2020-05-14 12:01:24 -04:00
402c0c6a1b
Fix build on older ffmpeg
2020-05-14 12:01:03 -04:00
efbab4e2bc
Dont' call mysql_library_end as it segfaults and hangs.
2020-05-14 12:00:36 -04:00
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
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
81cd338545
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2020-05-11 08:34:19 -04:00
3d278eddf8
erge branch 'master' into batch_frame_records
2020-05-08 20:16:36 -04:00
1f6e68c129
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
2020-05-08 17:26:02 -04:00
a798e874fe
Spacing
2020-05-07 13:44:32 -04:00
fcf6eb2631
Add setting the codecpar->codec_type as well. Fixes detecting stream type
2020-05-07 13:44:02 -04:00
40633830d0
Code style/spacing
2020-05-07 13:43:35 -04:00
b1b258ab9b
Code Style and use backtick escapes on sql column names, specifically Function
2020-05-07 13:43:05 -04:00
6939f9953a
code style, merge Debug lines and consult zm_terminate in the main while loop
2020-05-07 13:41:39 -04:00
87d0eb88b7
code style, merge Debug lines and consult zm_terminate in the main while loop
2020-05-07 13:41:29 -04:00
09740d72a4
code style, merge Debug lines and consult zm_terminate in the main while loop
2020-05-07 13:41:09 -04:00
7489d66557
use is_video_stream utility function.
2020-05-07 13:40:32 -04:00
9f73a55087
Make params to is_video_* a const because we don
...
't alter it
2020-05-07 13:39:32 -04:00
bab15217f5
Make zm_terminate available to anyone who includes zm.h
2020-05-07 13:38:56 -04:00
4ff341a0f5
Merge branch 'master' into zma_to_thread
2020-05-02 18:03:42 -04:00
e9b1eacc6d
Fix not finding stream with old libs
2020-05-02 11:49:28 -04:00
eca56c7123
Provide a more useful error message when the monitor's function is set to NONE. Fixes #2877
2020-05-01 19:21:20 -04:00
ef540aa972
sun_path is defined to be 108 bytes. No need for 4095. Quiets compiler warnings
2020-05-01 19:13:50 -04:00
c9f04c9136
Support event_close_mode for record mode
...
Support event_close_mode for record mode (with linked monitor)
2020-05-01 19:10:23 -04:00
6098c4c961
properly close streams and free memory in ffmpeg_input destructor
2020-05-01 19:03:18 -04:00
c5cf6e1a74
undo random addition
2020-05-01 19:01:09 -04:00
050868fad1
fix build on libavtools < 12
2020-05-01 19:00:40 -04:00
9beb5cee3a
use delete[] instead of delete.
2020-05-01 18:55:48 -04:00
24aaeee155
dynamically load monitor Object when loading event data. Also dynamically load Storage, but only when the Id is different. Free the various objects in the destructor. Sync up some spacing issues with master.
2020-05-01 18:44:35 -04:00
2071b2a71e
Guess video file name for in progress events
2020-05-01 18:14:58 -04:00
917c43a54b
If can't connect to db, bail instead of loading config
2020-05-01 18:08:32 -04:00
f96cc66b9d
google code style
2020-05-01 18:06:27 -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
ffd7970b07
Merge branch 'release-1.34'
2020-05-01 13:17:10 -04:00
14b90903a9
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
2020-05-01 12:50:10 -04:00
3675ee1c33
Properly delete FramesData as well.
2020-05-01 09:56:27 -04:00
434f34f027
use delete[] instead of delete.
2020-04-30 11:04:55 -04:00
a6ee817bc4
Fix auth by hash
2020-04-28 19:00:42 -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
3b11258fbc
Make checkEventLoaded return true if a new event was loaded, false otherwise. The idea is to give more information back to whoever calls it
2020-04-26 15:22:29 -04:00
a7363a4b36
reduce compiler deprecation warnings by using our zm api's that hide support for older ffmpeg versions
2020-04-24 19:05:58 -04:00
7a7f366eb1
Change semantics of zm_send_packetreceive_frame to return the # of bytes consumed. This is inline with how to old deprecated api used to work. The new api consumes the packet, so just return packet size.
2020-04-24 19:05:17 -04:00
c6c8a23c02
sun_path is defined to be 108 bytes. No need for 4095. Quiets compiler warnings
2020-04-24 18:03:00 -04:00
b0c5abc2c2
Quiet compiler warnings.
2020-04-24 17:51:00 -04:00
ed7c0815de
Merge branch 'release-1.34'
2020-04-24 17:05:32 -04:00
3dd5ac8146
shrink buffers for writing timestamp into. Don't need 64 when 28 will do. Quiets compiler warnings
2020-04-24 16:43:27 -04:00
e274aa471a
Use fputc instead of printf for separator to be a tiny bit more efficient. Report current state when forcing alarm on
2020-04-23 18:13:34 -04:00
00dad82b46
Fix use of strncpy using the entire size of the buffer. You have to -1 for the null char
2020-04-23 18:12:54 -04:00
4aaa02dc24
fix cpplint complaints and remove casts that are unnecessary. Micro-optimisation by using fputs for date_string instead of fprintf
2020-04-23 18:12:44 -04:00
df4fab5fbf
re-enable fragmented mp4 recordings
2020-04-23 18:11:10 -04:00
b8781301f8
Drop lock around openFile so that we don't hang
2020-04-23 18:08:14 -04:00
d31216330c
Only align buffers to 32bit if using a 32bit pix format. Fixes #2819
2020-04-23 18:07:07 -04:00
5bf068791b
Merge branch 'rate_dropdown' into release-1.34
2020-04-23 16:11:59 -04:00
9b77f77ac3
better logs
2020-04-23 11:09:39 -04:00
098ab4faae
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-04-23 10:26:25 -04:00
4b53c7660e
Merge pull request #2911 from hax0kartik/dl-curl
...
Dynamically load libcurl, libvlc and libvnc
2020-04-22 09:49:37 -04:00
76d88621ac
clean up Stream and EventStream Object initializers
2020-04-21 08:28:44 -04:00
37c829f2bf
cleanup code a bit. Move BlobStats to the Zone Object so that it isn't constantly being allocated/freed from the heap. Improve ParsePolygon.
2020-04-20 11:19:33 -04:00
924841ae71
Merge pull request #2913 from connortechnology/fix_monitor_loading
...
Fix monitor loading
2020-04-18 17:49:34 -04:00
d0c36c9888
Merge pull request #2913 from connortechnology/fix_monitor_loading
...
Fix monitor loading
2020-04-17 10:26:03 -04:00
b504110825
Correct loading monitor values from db
2020-04-16 17:54:20 -04:00
f60f91c834
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-04-14 17:01:58 -04:00
c50509d22a
Fix use of strncpy using the entire size of the buffer. You have to -1 for the null char
2020-04-14 17:01:50 -04:00
17356a7b3a
Use a BOUNDARY define to construct boundary strings. Get rid of code that kills zms when the frame rate drops too low, as dying doesn't help, and some cameras just have a really low frame rate.
2020-04-14 17:01:12 -04:00
9193ef4a62
Send the first frame twice to fix low framerate display in Chrome
2020-04-14 16:44:03 -04:00
640dfdd4a0
Dynamically load libvnc at runtime
2020-04-14 02:46:01 +05:30
143ad394a9
Dynamically load libvlc
2020-04-14 00:15:06 +05:30
f4c4441308
Convert all fatals in lincurl camera to errors
2020-04-13 18:55:29 +05:30
657a353c34
Support event_close_mode for record mode
...
Support event_close_mode for record mode (with linked monitor)
2020-04-12 20:42:43 -04:00
3a8b931cda
Fix stuff
2020-04-08 12:52:09 -04:00
64f57aa373
Dynamically load libcurl at runtime
2020-04-08 05:18:16 -04:00
8193e4ea4e
replace snprintf with hex table lookup for speed
2020-04-06 11:46:14 -04:00
1e38ba871d
Merge branch 'master' into fix_use_of_sprintf
2020-04-06 11:23:12 -04:00
c6e0b9be39
Merge branch 'master' into fix_use_of_sprintf
2020-04-06 11:21:43 -04:00
98e9355723
snprintf will put the terminator in. We don't have to.
2020-04-06 11:21:02 -04:00
face73ad7e
Fix compilation
2020-04-05 22:45:47 -04:00
2827ba38cd
use snprintf instead of sprintf. Fix putting a \0 terminator
2020-04-05 13:41:03 -04:00
9441fe833f
satisfy cpplint
2020-04-05 13:23:12 -04:00
04a6d5e42e
Fix a memory leak, shift rfbClientCleanup to Terminate()
2020-03-30 10:11:42 -07:00
6886b2b375
Modify Convert to scale as well
2020-03-28 15:17:19 -07:00
b93f5d970c
sws_scale directly into the image. Allocate and de-allocate sws in Prime and Close. Seems to fix scaling.
2020-03-28 16:03:52 -04:00
e894102cb7
debug
2020-03-28 11:59:05 -04:00
a781cc2c87
WIP scaling
2020-03-27 14:32:50 -04:00
b615eada41
Add a missing endif
2020-03-27 14:32:50 -04:00
d61e5e42ca
Use preprocessors to ensure libvnc monitor is only built when libvnc is found
2020-03-27 14:32:50 -04:00
ae80b3b859
Start implementing VNC
2020-03-27 14:32:50 -04:00
bc950c9a34
Remove <set> and <map> as they are not used
2020-03-26 15:11:39 -04:00
79ad2ec87d
better debug logging for SLOWFWD and SLOWREV listing new frame_id
2020-03-26 15:08:32 -04:00
e98f422730
Use %d for values that are actually integer in debug statements
2020-03-26 15:04:28 -04:00
45299955a1
Fix SLOW FWD not working
2020-03-26 12:21:42 -04:00
ea7bea4c6e
fix warnings because length() returns long unsigned int, but gnutls_datum_t size is unsigned int.
2020-03-26 12:08:21 -04:00
a5ec89ab1b
use bool instead of my_bool to fix #2886
2020-03-26 12:07:58 -04:00
cbda9848ab
Fix SLOW FWD not working
2020-03-26 12:06:07 -04:00
adf953dcdd
use bool instead of my_bool to fix #2886
2020-03-24 15:30:52 -04:00
0ecd35e1c6
fix warnings because length() returns long unsigned int, but gnutls_datum_t size is unsigned int.
2020-03-24 15:30:16 -04:00
7fcd71e684
Use fputc instead of printf for separator to be a tiny bit more efficient. Report current state when forcing alarm on
2020-03-24 15:19:16 -04:00
4aaaeda6ed
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-03-16 21:06:39 -04:00
ad61a0e385
Escape Function to fix mysql8. Fixes #2885
2020-03-16 21:06:31 -04:00
30d45aee8f
formatting/comment
2020-03-13 15:11:00 -04:00
dd76ee2c9f
spacing
2020-03-13 15:01:19 -04:00
6b61f4ac84
when an event is created, write video name if applicable so image.php can extract frames while recording is in progress
2020-03-13 14:47:22 -04:00
ff7defa84e
re-enable fragmented mp4 recordings
2020-03-13 14:46:20 -04:00
11b1bf1100
undo random addition
2020-03-11 10:54:52 -04:00
c90655d178
fix build on libavtools < 12
2020-03-11 10:54:35 -04:00
9a3127da06
Merge branch 'rate_dropdown'
2020-03-10 18:47:19 -04:00
84d719f2dd
Merge branch 'release-1.34' into rate_dropdown
2020-03-10 16:06:11 -04:00
d055d40bfb
Merge branch 'release-1.34'
2020-03-09 13:15:16 -04:00
ffed88454f
Provide a more useful error message when the monitor's function is set to NONE. Fixes #2877
2020-03-09 13:14:09 -04:00
3a129a8818
Merge pull request #2874 from hax0kartik/2810-libjwt
...
Add libjwt and remove gnutls-openssl wrapper
2020-03-06 14:48:45 -05:00
835966eb24
Merge pull request #2874 from hax0kartik/2810-libjwt
...
Add libjwt and remove gnutls-openssl wrapper
2020-03-05 15:30:27 -05:00
a53f67cd31
Remove a extra file added by mistake
2020-03-05 09:53:07 -08:00
15aec7b109
Add libjwt
2020-03-05 09:51:33 -08:00
2091ad8c92
Add libjwt and remove gnutls-openssl wrapper
2020-03-05 09:29:27 -08:00
b78acd7b95
google code style
2020-03-04 14:14:38 -05:00
6d4ed20745
Drop lock around openFile so that we don't hang
2020-03-04 14:14:28 -05:00
2882693791
If can't connect to db, bail instead of loading config
2020-03-04 14:13:44 -05:00
444c6fd372
Revert "Add libjwt as a optional library"
2020-03-04 13:57:27 -05:00
5443e6385b
Merge pull request #2844 from hax0kartik/2810-libjwt
...
Add libjwt as a optional library
2020-03-04 11:58:27 -05:00
4c7178b78b
fix cpplint complaints and remove casts that are unnecessary. Micro-optimisation by using fputs for date_string instead of fprintf
2020-03-04 11:02:21 -05:00
54c14db863
better logs
2020-03-01 14:02:44 -05:00
182120343f
Fix an issue while finding libjwt-gnutls and add a missing include
2020-03-01 06:17:43 -08:00
81f8f85be5
Revert "use CONCAT when updating event notes so that we don't overwrite notes set by other processes."
...
This reverts commit a90033e026
2020-02-25 16:38:31 -05:00
20d1cc99f4
Merge branch 'fix_zmu_using_token_auth'
2020-02-25 14:41:01 -05:00
f05dbd3b89
Fix zmu not respecting jwt token auth when AUTH_RELAY set to none
2020-02-25 14:40:47 -05:00
4798fba807
Merge branch 'use_concat_when_updating_event_notes'
2020-02-25 14:16:46 -05:00
a90033e026
use CONCAT when updating event notes so that we don't overwrite notes set by other processes.
2020-02-25 14:16:30 -05:00
5ed6d36afe
Merge branch 'release-1.34'
2020-02-24 14:12:21 -05:00
f4521d20e0
Fix applying rotation to x264encoded video which has already been rotated.
2020-02-24 14:12:10 -05:00
c1dfb8571a
revert bogus code in Image(AvFrame)
2020-02-24 14:10:54 -05:00
d2872becfc
Only align buffers to 32bit if using a 32bit pix format. Fixes #2819
2020-02-23 18:14:17 -05:00
b1ce0ec0e8
Fix cmake
2020-02-23 06:18:32 -08:00
d2f852b9db
Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread
2020-02-22 18:01:00 -05:00
bca4108396
Merge branch 'storageareas' into zma_to_thread
2020-02-22 17:58:30 -05:00
d51fdafbc0
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-02-21 09:37:45 -05:00
b4729f5aa8
Handle other colours and subpixel formats in Image::Image(AvFrame*) than 32bit RGBA
2020-02-21 09:34:44 -05:00
46d77ee849
Add libjwt as a optional library
2020-02-20 07:55:59 -08:00
1959b2e070
Add optional library jwt
2020-02-20 07:45:33 -08:00
c488756eb8
Merge branch 'master' into fix_remote_http
2020-02-19 14:42:24 -05:00
4f25426b1f
load event orientation as well and if it's an mp4 do the rotation on the image before outputting. Fixes #2829
2020-02-10 16:22:01 -05:00
d0003215b1
Merge branch 'master' into rate_dropdown
2020-01-17 12:30:35 -05:00
9525268192
Wait 5 seconds instead of 1 after failure to connect. Reduces error logs filling up db.
2020-01-13 12:52:34 -05:00
0afcbe626c
remove redundant logging line. Connect() will do the logging
2020-01-13 12:51:30 -05:00
6da998b0c0
code comments and parenthesis
2020-01-10 16:42:18 -05:00
1bdabefb2d
fix single stepping in reverse but actually modifying curr_frame_id
2020-01-07 17:07:35 -05:00
1c197db619
Merge branch 'master' into rate_dropdown
2020-01-07 14:49:58 -05:00
b85cf7d8a1
include error message when complaining about failing to create the hwaccell device
2020-01-07 11:03:45 -05:00
fd633a2175
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2020-01-05 17:28:50 -05:00
05ac82b0bb
Handle failure to init hwdevice when trying to use hwaccel.
2020-01-05 17:27:45 -05:00
e039b136c0
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-12-29 16:46:45 -05:00
f065daf940
spacing, move some variables deeper in scope, merge fprintf calls
2019-12-29 16:46:30 -05:00
b5e3dbd415
put back 32bit alignment with a comment as to why
2019-12-29 12:52:34 -05:00
2581b86195
add more content to the error message when can't sws_scale.
...
Also fix problem when using 32bit on arm instead of 24bit, apparently 0 is a valid return result from sws_scale.
Also change the alignment in av_image_fill_arrays. At some point we cahnged it to 32bit aligned, but in 1.32 we didn't align at all. Not sure if it matters
.
2019-12-29 12:44:59 -05:00
bbcd1846e7
Fix hang caused by using %d instead of PRIu64 in formatting string
2019-12-29 12:44:30 -05:00
00cedc92d2
fix typo
2019-12-28 08:37:16 -06:00
16a73d6d5a
don't seek back when not neccesary
2019-12-13 18:12:33 -05:00
5fcd6361bc
fix segfault reading frames for .mp4 in zms
2019-12-13 17:47:18 -05:00
9972a2fd0c
wip work on fixing zms mp4 to mjpeg
2019-12-02 15:51:08 -05:00
3b9b49c44d
wip work on fixing zms mp4 to mjpeg
2019-12-02 15:51:03 -05:00
0947c3ef24
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-11-30 15:37:09 -05:00
927165a934
debug the recording_started timestamp and warning when we can't fine a frame before the requested time
2019-11-30 15:37:05 -05:00
09fcbad666
Merge branch 'master' into zma_to_thread
2019-11-30 14:59:39 -05:00
00b67ec352
Merge pull request #2768 from selvanair/fix-video-start
...
Correct video buffer length when analysis and capture fps differ
2019-11-30 14:53:22 -05:00
50986ce3b4
Merge branch 'zma_to_thread' of github.com:ConnorTechnology/ZoneMinder into zma_to_thread
2019-11-30 13:53:05 -05:00
d1458108f4
Add dimensions wrong check. Add bytes count
2019-11-20 12:43:17 -05:00
5260563ec4
Update frame deltas in the database to be relative to the video start time
...
Currenltly the frames written to database have delta time measured
from the event start time. As these deltas are also used to generate
any frame on the fly from the recorded video, these should be relative
to the video start time.
Adjust by subtracting the offset of the video start from event start.
Done when the event is closed.
If video is not stored, this has no effect.
Signed-off-by: Selva Nair <selva.nair@gmail.com>
2019-11-15 21:55:40 -05:00
dd31279ca3
Fix the recorded video start time
...
The event start time already includes the duration of the
pre_event frames. Do not back track the video by a further
pre_event_count.
Signed-off-by: Selva Nair <selva.nair@gmail.com>
2019-11-15 21:55:40 -05:00
2e7fad68d1
Properly compute video buffer length when analysis fps is set
...
Currently the number of video frames kept in the buffer is set as the
pre_event_count. This falls short when the capture fps is larger
than the analysis fps. Fix by computing the retained video duration
as pre_event_count/analysis_fps
No change if analysis fps is not set.
Signed-off-by: Selva Nair <selva.nair@gmail.com>
2019-11-15 21:55:40 -05:00
fdf5150a16
fix build on jessie
2019-11-13 13:51:22 -05:00
46991f04e6
better debugging when fail to sws_scale
2019-11-01 09:24:22 -04:00
21df2c6ac7
Always write snapshot.jpg and alarm.jpg instead of only when using video storage
2019-10-30 16:25:09 -04:00
35ae81d985
dynamically allocate next_dts and use it in write_packet to store the next dts value. write_interleaved_packet destroys the passed in packet so we need to store next_dts before writing out the packet.
2019-10-23 09:25:16 -04:00
76fd32b427
more debug, and ensure that pts != AV_NOPTS_VALUE
2019-10-22 10:01:24 -04:00
dfe2f55ebe
More debugging to figure out #2720
2019-10-20 13:50:24 -04:00
d9d91c4a8d
Fix #2728 by resetting the frame size before reading from the fifo
2019-10-20 13:32:16 -04:00
21dd9b527d
when ipkt->pts is AV_NOPTS_VALUE should still set opkt.pts to AV_NOPTS_VALUE
2019-10-19 17:12:19 -04:00
7068769a90
zm_send_packet_receive_frame sends 0 as success
2019-10-18 13:52:07 -04:00
6a56de41f0
fix parameter order
2019-10-18 13:39:52 -04:00
17a7d02275
fix reversal of in_frame/out_frame in VideoStore destructor
2019-10-18 10:16:18 -04:00
60ec545683
fix compile warning due to snprintf into a too small char array
2019-10-18 09:43:25 -04:00
a0f021ee12
Handle the case of flushing resampler by sending NULL
2019-10-17 17:37:36 -04:00
f938fd83ac
keep track of video_next_dts. Use it when packet dts is AV_NOPTS_VALUE. Also handle EAGAIN in send_packet_get_frame etc
2019-10-16 09:01:59 -04:00
d03de98317
remove carriage returns in ffmpeg log lines
2019-10-16 09:00:39 -04:00
90d6e11fb9
If we try to write a packet with dts == AV_NOPTS_VALUE, set it to stream->cur_dts. This might at least give us a playable file.
2019-10-11 14:04:51 -04:00
3b586a2abe
include stream index and packet queue size in debug message
2019-10-11 13:53:18 -04:00
30b5612691
fix case of sql
2019-09-28 12:57:00 -04:00
492be7cc33
make last_zoom last_scale last_x and last_y members of the StreamBase object instead of static vars so that we can access them in monitorStream
2019-09-26 13:51:49 -04:00
b787682fa9
Fix play from pause when not buffering. When change of zoom, send two paused images so that response is instant. Fix some misplaced line feeds.
2019-09-26 13:51:13 -04:00
1dda79af46
remove debug
2019-09-25 12:00:00 -04:00
15a1b19b42
spaces
2019-09-23 10:53:21 -04:00
83e477e6be
CaptureAndRecord in remote camera rtsp doesn't work. Remove it.
2019-09-23 10:52:57 -04:00
ce37fce99c
spacing
2019-09-20 08:19:57 -04:00
09533c19af
Fix %d to %s
2019-09-20 08:19:44 -04:00
17e00cec94
Fix setting rtsp_transport when rtsp
2019-09-17 14:58:16 -04:00
e8e29d62b2
Use dts instead of pts for first values
2019-09-17 12:53:29 -04:00
0d347f0cf5
init log early so that we create zmc_m.log instead of undef.log
2019-09-17 11:37:48 -04:00
6041616efc
add string_toupper function
2019-09-17 11:37:20 -04:00
33aa6abf59
Only open log file if we are going to write to it.
2019-09-17 11:36:57 -04:00
ecde0a7ae0
Add a string_toupper function
2019-09-17 11:11:22 -04:00
1a94479751
Cleanup/rework. Handle database connection failure. This can happen if we init logging before config reading. Default terminal log level to warning. Cleanup logInit copying the options in order to populate mLogPath from config. We can handle this in the constructor now.
2019-09-17 11:10:59 -04:00
9a3765f6aa
spacing and google code style
2019-09-17 10:31:48 -04:00
4509c6a239
Don't set rtsp options unless we are using rtsp. Should prevent everyone from reporting the warning about unsupported options. Note that I removed some extra includs that have no business in zm_ffmpeg_camera.
2019-09-17 10:31:31 -04:00
Andrew Bauer
Isaac Connor
dmo
Isaac Connor
Isaac Connor
Joe540
Pliable Pixels
hax0kartik
Selva Nair
Isaac Connor