726e5c6dd5
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-07-03 09:50:49 -04:00
a9579484b8
gracefully handle failure to config hw pix fmt and debug a bit more
2019-07-03 09:49:53 -04:00
5ea5bd9bde
Only do audio_first_pts if we have audio_in_stream
2019-07-02 12:26:33 -04:00
4e8ac47060
Use the video_first_pts to set the audio_first_pts
2019-07-02 11:58:22 -04:00
2dc60196c5
Code cleanup and cpplint
2019-07-02 11:14:24 -04:00
268bc2264b
Merge branch 'storageareas'
2019-07-02 10:19:03 -04:00
d972ab6006
add min_section_length test to alarmed events that go unalarmed
2019-06-27 21:50:12 -04:00
0ab4f9fce0
More debugging in packetqueue.
2019-06-27 21:49:43 -04:00
3bd4486b65
Start event when alarm frames >= alarm_frame_count-1 because it is 1based. Add some debug.
2019-06-27 15:48:10 -04:00
ac7d4869de
We need to seek back pre_event_count video frames, not any frames
2019-06-27 15:36:13 -04:00
158b9438d7
Explicitly link with libdl ( #2649 )
...
Otherwise on some systems linking would fail with
undefined reference to symbol 'dlclose@@GLIBC_2.2.5'
2019-06-27 15:08:29 -04:00
dd57fd95ce
Clean up cruft from videostore api. Fix packetqueue clear_unwanted_packets to take a pre_event_count and take it into consideration when finding the right spot in the queue to start recording.
2019-06-27 11:11:14 -04:00
6ed29a3d56
Google code style, ifdef out all the extra includs that shouldn't be in the .h
2019-06-27 10:29:47 -04:00
6a87ae0fa7
fix compile warning by copying two bytes, which will grab the \0 after the \n
2019-06-27 10:24:51 -04:00
763fe16a04
Google code style, merge some fprintf's
2019-06-27 10:20:23 -04:00
0686f487ac
%s => %d for error count
2019-06-27 04:18:25 -04:00
d26286a170
fix test for hwtransfer needed
2019-06-27 03:40:18 -04:00
2a65b339c1
init hw_pix_fmt in constructor
2019-06-25 22:19:09 -04:00
86e8b58561
move hw_device_ctx under ifdef for HWCONTEXT_H
2019-06-25 22:06:00 -04:00
7389bbcb25
better debug in selecting hw_format, add CUDA, add setting device for hwaccel
2019-06-25 21:47:19 -04:00
a44631a59d
rough in support for ffmpeg 3.4
2019-06-25 16:35:07 -04:00
5ab4414b11
Only include hwaccel support if LIBAVUTIL_HWCONTEXT_H is deifned
2019-06-25 15:58:55 -04:00
679b6b1b2d
remove old qsv code
2019-06-25 15:47:23 -04:00
46f3aabc25
Merge branch 'hwdecode' into storageareas
2019-06-25 15:35:56 -04:00
86c4051c44
handle zm_receive_frame returning AVERROR instead of boolean
2019-06-25 15:34:36 -04:00
434bbce954
Add loading decoder_hwaccel in Monitor
2019-06-25 15:34:17 -04:00
d0abd16494
add passing hwaccel name and device. use av_make_error_string(ret).c_str() to reduce code and increase consistency
2019-06-25 15:34:01 -04:00
cf7f3e8a88
add passing hwaccel name and device. use av_make_error_string(ret).c_str() to reduce code and increase consistency
2019-06-25 15:33:54 -04:00
6a87d9a875
change zm_receive_frame to return AVERROR instead of boolean
2019-06-25 15:32:47 -04:00
2cbcaeebbc
clean out old hwdecode stuff. refactor common code out
2019-06-25 14:11:59 -04:00
bfb7238edb
Merge branch 'master' into hwdecode
2019-06-25 09:09:57 -04:00
c3135accbb
Make events close on a section length time boundary only if event_close_mode == CLOSE_TIME. When an alarm happens in event_close_mode==ALARM, close the continuous event regardless of the # of pre-event frames in the event. Add some debugging
2019-06-24 21:11:52 -04:00
246b4cb9d1
working hwdecode
2019-06-24 17:22:59 -04:00
2d80283844
simplify some logic in Analyze and prevent segfault when we close continuous event to start alarm event
2019-06-24 13:13:46 -04:00
9a353d0b6d
don't set frame size
2019-06-24 11:44:21 -04:00
44e4d93445
Merge branch 'master' into storageareas
2019-06-24 11:35:36 -04:00
6ed0074077
End continuous events on alarm ( #2644 )
...
* Reference /run/zm instead of /var/run/zm because systemd-tmpfiles complains about it
* Spacing, google code style and tabs to spaces
* add update script to add MinSectionLength
* Add min_section_length to enforce a minimum event length when closing continuous events on alarm
2019-06-24 11:29:00 -04:00
299f994506
Fix zmcrypt message ( #2645 )
...
* added more clarity on zm_crypt authentication errors
* fixed variable name
2019-06-24 11:28:32 -04:00
dab9544845
Revert audio sync fixes ( #2646 )
...
* Reference /run/zm instead of /var/run/zm because systemd-tmpfiles complains about it
* Spacing, google code style and tabs to spaces
* Revert the work I did to srt packets by dts after changing their time_base. It doesn't work. Instead since dts doesn't actually matter to playback, only ffmpeg storing, munge it to whatever is neccessary to make ffmpeg happy.
2019-06-24 11:27:47 -04:00
9713d908fb
Spacing, google code style and tabs to spaces
2019-06-24 10:28:11 -04:00
00183b535a
rename bcrypt to libbcrypt to reflect name of the project
2019-06-23 12:56:04 -05:00
8b37c0e9b0
remove bcrypt & jwt-cpp as submodules, bring in statically under src
2019-06-23 12:12:12 -05:00
55d98e4a9f
fix crash
2019-06-20 15:56:25 -04:00
470da03322
Merge sync fixes from storageareas
2019-06-20 15:14:20 -04:00
f6960726b8
Don't check cause.length because we know it hasn't been used yet. check event_close_mode before closing the continuous unalarmed event
2019-06-20 15:12:32 -04:00
4c8b8d0c16
Only check pts vs dts if pts isn't AV_NOPTS_VALUE. Also set frame_size in output codec when doing passthrough
2019-06-20 15:09:30 -04:00
8b95ba8b3c
it is ok for pts to be AV_NOPT_VALUE. It is not yet deprecated and doesn't mess anything up.
2019-06-20 15:08:38 -04:00
540a114c4b
spacing google code style
2019-06-19 10:31:53 -04:00
cc35e3f187
add dumpQueue to packetqueue to print out the contents
2019-06-19 09:51:06 -04:00
16b035f76c
Use common first_dts/pts instead of separate video and audio first pts/dts
2019-06-19 09:22:21 -04:00
9727d0ed9f
spaces
2019-06-19 09:22:21 -04:00
847cd9f347
Print out an error when a monitor is in MONITOR mode because we can't handle alarms. Allow signals to terminate zmu by checking zm_terminate.
2019-06-19 09:22:21 -04:00
33951ae584
Print out an error when a monitor is in MONITOR mode because we can't handle alarms. Allow signals to terminate zmu by checking zm_terminate.
2019-06-19 08:36:37 -04:00
695bdfc1c6
big ::Analyze logic cleanup. Also implement close continuous event before starting motion event in MOCORD
2019-06-13 15:48:41 -04:00
b073505146
If either pts or dts is AV_NOPTS_VALUE then set equal to the other
2019-06-13 15:47:58 -04:00
30a210f68f
also need to adjust dts of last packet when switching events
2019-06-12 10:05:08 -04:00
222f145230
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-06-11 13:56:13 -04:00
0a9ae1d4f9
Include pixdesc.h to get av_get_pix_fmt_name(AVPixelFormat)
2019-06-11 13:55:57 -04:00
acb95709e6
Fix issues with too much audio in events by storing packets in the queue with their timestamps converted to AV_TIME_BASE_Q, so that we can sort video and audio packets together.
2019-06-11 10:19:42 -04:00
ee80b086af
log the # of db entries being written before doing the writing so that we know the # being written
2019-06-10 14:13:21 -04:00
50436c5ea1
Correct debug line listing how many frames are being written to db
2019-06-10 13:59:01 -04:00
ebc9a77c9d
When saving jpegs, do a db write on the first frame. Fix test for writing frame info to db. Because we increment frames, it is essentially 1-based. So the test needs to be ==1 instead of !
2019-06-10 12:57:57 -04:00
a16d29740c
Fix final frame of event having same id as the second last
2019-06-06 13:49:01 -04:00
4b8a2a94e3
reduce frame send time too slow to a warning instead of error
2019-06-05 10:12:56 -04:00
1d132b5923
When writing MP4 sample, save buffer.size() into a temporary variable before calling buffer.extract(). ( #2628 )
2019-06-01 16:43:29 -04:00
7b06f58559
Limit Connection error logs to every 10 minutes instead of every 10 seconds. Connection attempts still happen at 10 second intervals
2019-05-27 17:16:23 -04:00
049b70a624
junk bad code in zm_eventstream that tried to figure out how long to sleep by considering the wall clock time since play start. No good as soon as we seek.
2019-05-27 17:15:46 -04:00
c44967f770
fix push to push_front
2019-05-27 12:47:38 -04:00
663f941963
If we can't find a packet before ours in the queue, then stick it at the front of the queue, not the end.
2019-05-27 12:31:18 -04:00
8b4fddadfb
out_frame->pts is calculated in resample_audio
2019-05-27 12:29:29 -04:00
67b8ca8bfb
Fix superfast playback after replay
2019-05-24 13:45:48 -04:00
0a8b7c24db
don't check for alarmed zones to record stats for unless we are alarmed
2019-05-24 10:52:31 -04:00
93aeceecfc
Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement
2019-05-17 10:18:15 -04:00
3888d140a8
Merge branch 'master' into storageareas
2019-05-17 10:16:29 -04:00
06eb9a3bb2
merge typo
2019-05-16 16:15:16 -04:00
915e9f05a9
merged fifo changes
2019-05-16 16:14:06 -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
4f44db8cbf
ifdef HAVE_ZLIB_H around code that uses Image->Zip ( #2597 )
2019-05-16 15:35:19 -04:00
c257fb46f6
Merge branch 'storageareas' of github.com:connortechnology/zoneminder into storageareas
2019-05-13 10:34:45 -04:00
74095963cc
Merge branch 'master' into storageareas
2019-05-12 19:39:09 -04:00
21710b6e49
demote logs
2019-05-12 15:45:39 -04:00
cc0d23ce4e
move token index after adding password
2019-05-12 15:01:49 -04:00
9a8aa5453b
add Password back so User object indexes don't change
2019-05-12 14:48:23 -04:00
22c5d46c65
rescale audio packet duration and pts before feeding to codec after resample
2019-05-12 12:14:03 -04:00
d7daf8550f
Merge branch 'master' into storageareas
2019-05-12 09:37:41 -04:00
453bc2afd8
more frame dumping in resample
2019-05-12 09:36:26 -04:00
aada171440
clean up some logic in Analyse
2019-05-12 09:35:48 -04:00
8499958767
typo
2019-05-12 05:57:17 -04:00
225893fcd6
add mintokenexpiry to DB seek
2019-05-12 05:50:19 -04:00
1f22c38453
more fixes
2019-05-12 05:10:20 -04:00
6ab31dfe4b
more fixes
2019-05-12 05:03:16 -04:00
3e66be27a8
use strtoul for conversion
2019-05-11 16:09:42 -04:00
053e57af62
use strtoul for conversion
2019-05-11 16:01:05 -04:00
96fa6149a8
use strtoul for conversion
2019-05-11 15:58:07 -04:00
ae14be916c
initial plumbing to introduce token expiry and API bans per user
2019-05-11 13:39:40 -04:00
67c20aa976
fix frame->duration to frame->pkt_duration
2019-05-10 12:58:54 -04:00
d3a680aaa3
Set out_frame duration when resampling. Better error message if failed to write to fifo
2019-05-10 12:31:10 -04:00
8461852e27
move out sha header
2019-05-08 19:32:58 -04:00
0bb5ff934e
move sha headers out
2019-05-08 19:17:31 -04:00
4ab0c35962
move JWT/Bcrypt inside zm_crypt
2019-05-08 16:45:28 -04:00
2212244882
fix absolute path
2019-05-08 15:47:38 -04:00
c41a2d067c
fixed type conversion
2019-05-08 14:29:44 -04:00
bc050fe330
support refresh tokens as well for increased security
2019-05-08 13:38:42 -04:00
27e6e46f84
remove allowing auth_hash_ip for token
2019-05-08 12:11:32 -04:00
3c6d0131ff
fix db read, forgot to exec query
2019-05-08 12:06:37 -04:00
04c3bebef9
exception handling for try/catch
2019-05-08 11:44:15 -04:00
3a67217972
move decode inside try/catch
2019-05-08 11:29:34 -04:00
bb18c305ab
add token to command line for zmu
2019-05-08 11:08:27 -04:00
b293592e4c
added token validation to zms/zmu/zmuser
2019-05-08 10:55:32 -04:00
4c8a29e8d3
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2019-05-08 06:06:28 -04:00
3a7b49560a
spacing
2019-05-06 12:16:06 -04:00
9469ce8c71
Merge branch 'section_length_when_modect' into storageareas
2019-05-06 10:50:41 -04:00
9ef912f2ba
add missing new event status info
2019-05-06 10:50:12 -04:00
4c8d20db64
typo
2019-05-04 15:27:00 -04:00
983e050fd7
fixed SHA1 algo
2019-05-04 15:20:31 -04:00
d952fe7117
Moved to openSSL SHA1, initial JWT plugin
2019-05-04 11:52:53 -04:00
50070a9a7c
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2019-05-03 14:59:14 -04:00
1e08b333b4
choose cur_dts instead of 0 for dts
2019-05-03 14:59:09 -04:00
4ecf41f2b4
Merge branch 'sort_packets' into storageareas
2019-05-03 14:58:34 -04:00
c91da4a7f5
if no packet found, still append to end
2019-05-03 14:58:29 -04:00
21999cf943
Merge branch 'sort_packets' into storageareas
2019-05-03 13:48:23 -04:00
aec8311deb
implement sorting incoming packets in the packetqueue
2019-05-03 13:48:05 -04:00
ca2e7ea97c
logs tweak
2019-05-03 12:01:13 -04:00
72325d12b7
move to wrapper
2019-05-03 11:40:35 -04:00
63a970d49f
Merge branch 'fix_no_zlib' into storageareas
2019-05-03 09:42:06 -04:00
aaf4665909
Merge branch 'section_length_when_modect' into storageareas
2019-05-03 09:41:41 -04:00
f6b6daafab
close and reopen event when we hit section_length
2019-05-03 09:41:29 -04:00
fee95c2316
ifdef HAVE_ZLIB_H around code that uses Image->Zip
2019-05-03 09:04:31 -04:00
45b7814124
absolute path
2019-05-01 14:33:36 -04:00
65a57feedb
absolute path
2019-05-01 14:30:00 -04:00
c663246f0a
try add_library instead
2019-05-01 14:22:10 -04:00
ca24b504d4
fixed typo
2019-05-01 13:46:54 -04:00
8bbddadc12
put link_dir ahead of add_executable
2019-05-01 13:43:41 -04:00
07be830f94
added bcrypt to others
2019-05-01 13:35:18 -04:00
dd63fe86ce
add sha source
2019-05-01 13:28:39 -04:00
ddb7752226
added include path
2019-05-01 13:24:50 -04:00
1ba1bf0c45
added test sha1 and bcrypt code to validate working
2019-05-01 13:18:51 -04:00
c4b1bc19e0
added bcrypt and sha to src build process
2019-05-01 13:15:07 -04:00
25614bb75e
Merge branch 'master' into storageareas
2019-05-01 08:57:20 -04:00
847d4c5e80
Merge branch 'master' of github.com:/ZoneMinder/ZoneMinder
2019-04-29 12:50:31 -04:00
28269eccc3
Fix Remote RTSP Method on newer ffmpeg
2019-04-28 12:05:32 -04:00
626342f00e
Merge branch 'master' into storageareas
2019-04-26 10:44:00 -04:00
c4fb2cc407
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-04-25 18:45:54 -04:00
18285e1b94
fix using in_frame->nb_samples instead of out_frame->nb_samples in resample fifo.
2019-04-25 18:45:43 -04:00
ea7c38ceff
Alarm cause fix ( #2582 )
...
* move alarm cause code to when the alarm flag is set
* formatting
* added temp info log
* char* not string in log
* merged alarm clause into info message about alarm
* add a comma only if there are more active zones
* JB tweak to slightly optimize leading comma processing
2019-04-24 13:55:57 -04:00
eb76cd87bb
Revert "Alarm cause fix ( #2580 )" ( #2581 )
...
This reverts commit 6923382485
2019-04-17 13:53:11 -04:00
6923382485
Alarm cause fix ( #2580 )
...
* move alarm cause code to when the alarm flag is set
* formatting
* added temp info log
* char* not string in log
2019-04-17 13:33:38 -04:00
70ed4a4646
Must unlock mutex before destructor as we do some logging in the mutex destructor when we destroy it while locked.
2019-04-16 11:51:10 -04:00
22adb243ec
Fix crash when reporting an event longer than section length when event was just closed so event is null.
2019-04-16 11:50:41 -04:00
2ff1e7ed6d
Fix crash when reporting an event longer than section length when event was just closed so event is null.
2019-04-16 11:30:18 -04:00
Isaac Connor
Daniel Schaefer
Isaac Connor
Isaac Connor
Pliable Pixels
Andrew Bauer
Gleb Popov
Pliable Pixels
Mitch Capper