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
98a9c68b8b
spacing and code documentation
2019-04-15 17:54:30 -04:00
293ec20824
Must unlock mutex before destructor as we do some logging in the mutex destructor when we destroy it while locked.
2019-04-15 17:54:17 -04:00
3664084862
Handle out of order dts in writeAudioFrame
2019-04-15 13:27:13 -04:00
f28af7b729
store diag_path in the object and initialize them in constructor instead of constantly checking to see if they have been initialized in DetectMotion. Also use a string instead of a static char[MAX_PATH]. Also split it into diag_path_r and diag_path_d to fix the bug that only diag_path_r would ever get created and would be overwritten by the delta image.
2019-04-15 13:26:55 -04:00
93f0a03d8b
spacing and code comments
2019-04-15 12:55:28 -04:00
7c8b37e08c
fix mutex hang on Fatal
2019-04-15 11:21:23 -04:00
439a7b3ab3
Don't set bitrate, etc when h264. Causing crashes in ffmpeg 4.11.
2019-04-14 13:50:10 -04:00
69f812f5cc
force section end when seconds % section_length == 0 which is the old behaviour.
2019-04-09 19:42:24 -04:00
7671f59d2f
Add error counting on decoding
2019-04-09 12:27:40 -04:00
fab548b119
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-04-08 16:46:28 -04:00
1b98f3529f
allow non-increasing dts in muxer
2019-04-08 14:18:59 -04:00
7f2440177b
remove duplicate dump_codec
2019-04-08 13:51:55 -04:00
accaeadb18
code cleanup. dump_codecs
2019-04-08 13:51:41 -04:00
e81c216b4a
add more fields in dump_codec.
2019-04-08 13:51:13 -04:00
3c57d79669
Go back to using video_first_dts
2019-04-08 10:04:26 -04:00
f719dd9acc
always commit buffered db_frames when we have a new max score image or alarm cause image
2019-04-07 10:29:02 -04:00
9faaba9300
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-04-05 15:18:39 -04:00
9ae6acf532
Fix for opening audio_in_codec
2019-04-04 17:20:21 -04:00
d97dd6cdd9
Should close videostore before closing input codecs/streams.
2019-04-04 14:11:56 -04:00
7955a1c9b2
fix version check to get rid of deprecated av_register_all
2019-04-04 12:56:00 -04:00
bc62493096
Increase sql buffer space because we are using path strings that are PATH_MAX size.
2019-04-04 12:55:35 -04:00
f6d5038586
we only use event_file if we are writing out a jpg, so only generate the event_file string if we are writing out jpgs
2019-04-04 12:37:25 -04:00
271937f005
store the snapshot_file and alarm_file strings in the boject during construction so that we don't have to do it everytime we write out an image
2019-04-04 12:28:08 -04:00
f3d0c4e643
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2019-04-04 09:37:13 -04:00
8de7d576a5
spacing and use Error instead of fprintf(stderr) so that things get logged.
2019-04-04 09:35:37 -04:00
8d3fa807e2
compilation fixes for old ffmpeg
2019-04-03 16:51:41 -04:00
12631abd46
when copying a packet (for old ffmpeg) copy pts, dts and duration too
2019-04-03 16:51:27 -04:00
94479fc850
copy pkt flags as well. When pts is NOPTS_VALUE set it to zero
2019-04-03 16:03:21 -04:00
055efdc950
Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder
2019-04-03 14:56:18 -04:00
bd9b5afe46
old ffmpeg doesn't have av_frame_unref and it doesn't seem to be needed
2019-04-03 14:56:14 -04:00
2e7fd7c9a2
handle really old ffmpeg not having pkt_duration
2019-04-03 14:55:29 -04:00
b53e4aa803
fix segfault
2019-04-03 14:51:10 -04:00
b6f35db4de
put back codec closing in destructure, testing with bionic
2019-04-03 14:25:18 -04:00
aece64049f
We cannot avcodec_open2 a context that has been duped. This code currently works without crashes and leaks on ffmpeg 2.8
2019-04-03 13:23:00 -04:00
f78e95f5d4
add is_video_context and is_audio_context and use them in zm_revceive_frame to add audio decoding support
2019-04-03 13:21:52 -04:00
bd412fa9ca
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-04-02 14:25:50 -04:00
036560e3e9
Allow packets with pts=AV_NOPTS_VALUE
2019-04-02 14:23:49 -04:00
cd28559c03
when encoding audio, pts and dts have to come from the encoder.
2019-04-02 14:08:46 -04:00
87cb716500
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-04-01 14:02:46 -04:00
cb33318c4a
fix invalid memory access due to incorrect opening/closing/copying of contexts
2019-04-01 14:02:39 -04:00
a6998cbc9e
Use FFMPEGDeInit instead of avformat_network_deinit
2019-04-01 13:39:11 -04:00
c9985107ee
Add a deinit function to handle avformat_network_deinit
2019-04-01 13:38:13 -04:00
ed5a448a1d
Correct pts on audio frame before sending it to the encoder so that when we flush the encoder the resulting packets have the right pts.
2019-04-01 11:13:14 -04:00
90e97ff135
Merge branch 'master' into storageareas
2019-03-28 11:20:29 -04:00
e6547953b0
fix segfault using old ffmpeg
2019-03-28 09:24:32 -04:00
acb9070b04
Add a warning when an event exceeds section length
2019-03-25 12:33:30 -04:00
5615cafc19
fix compile on old ffmpeg
2019-03-21 17:50:17 -04:00
c159dd8d10
cleanup and fix code that assumed H264
2019-03-21 14:13:56 -04:00
c791f136da
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2019-03-21 10:43:54 -04:00
a30c4d9551
rework ffmpeg_input to not use pkt_duration which doesn't exist in avconv
2019-03-21 10:41:59 -04:00
fcb9f76561
Fix out_frame->pts being nothing because we freed in_frame
2019-03-20 16:06:55 -04:00
05976b3227
Add pts to zm_dump_frame
2019-03-20 16:06:31 -04:00
3931baa2b6
fix build on old ffmpeg
2019-03-20 10:21:43 -04:00
a437c407a7
fix video_out_ctx init so that ffmpeg doesn't complain
2019-03-19 13:17:26 -04:00
f89654f442
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2019-03-19 10:50:05 -04:00
520c41da23
Merge ../ZoneMinder.connortechnology.bad into storageareas
2019-03-18 14:40:03 -04:00
b794c2ca20
fix crash by checking username without checking if it is NULL
2019-03-18 12:01:51 -04:00
dde911d16a
add more debug about command queue
2019-03-18 10:55:21 -04:00
8417230690
debug where the comms sock is
2019-03-18 10:55:08 -04:00
9b713a489d
fix sleep time by using a comparison between the frame display time and the distance between now and when we started playing.
...
handle infinite fps
2019-03-06 14:50:36 -05:00
6c8eac1ac8
Merge branch 'storageareas' into h265
2019-03-06 11:10:01 -05:00
abfb5642c8
cleanup and document updateFrameRate
2019-03-06 09:46:28 -05:00
24665264a2
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2019-03-05 20:16:05 -05:00
73ae3f49ed
Merge branch 'master' into storageareas
2019-03-05 11:35:55 -05:00
b1838de701
test turning off frag_custom
2019-03-05 11:35:16 -05:00
0bf001be3c
Fix for file and curl camera sources ( #2545 )
2019-03-05 09:59:36 -05:00
778707c8df
Merge branch 'master' into storageareas
2019-03-04 14:33:28 -05:00
903f5af1ef
invalid parameters should be a debug not a warning
2019-03-04 13:35:36 -05:00
95567e07a4
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2019-02-26 11:43:07 -05:00
a38fcf5297
Add debug and use alternate way of figuring out how long to sleep to maintain fps
2019-02-26 11:41:02 -05:00
f7dd1b049d
Merge branch 'master' into storageareas
2019-02-26 10:16:11 -05:00
705468dfc4
if we don't have a connkey, comms will not be open so don't touch the sock file or call checkCommandQueue
2019-02-26 10:08:07 -05:00
fd310c0f0a
Merge branch 'master' into storageareas
2019-02-22 11:33:47 -05:00
443fd35d99
Fix imagesize requirements ( #2404 )
...
* introduce non-loop-unrolled version of function and use them when the image size is not a multiple of 12 or 16
* Remove tests for imagesize being a multiple of 16 or 12 to handle functions with unrolled loops
* Use non-unrolled functions when image size is not a multiple of 12 or 16
* use std_blend when image is odd size
2019-02-22 09:44:57 -05:00
c626b0fb8e
if adding a closing frame, queue it with the rest of the frames so they get written all at once. Queue 20 frames instead of 10
2019-02-19 12:00:17 -05:00
5029d7214a
Merge branch 'master' into storageareas
2019-02-18 17:00:45 -05:00
9996b3e718
Merge branch 'master' into break_videostorage
2019-02-17 12:10:32 -05:00
baba438ce1
use image_count when reporting earlier than fps_report_interval
2019-02-16 11:49:28 -05:00
9656032906
spacing
2019-02-15 17:52:51 -05:00
96906734b8
add an audio_fifo to handle input audio < 1024 samples per frame
2019-02-15 17:26:30 -05:00
6156aa2af9
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2019-02-15 10:49:06 -05:00
4e463c9354
use swr_convert_frame instead of swr_convert
2019-02-14 17:48:58 -05:00
281775cc80
try setting out_frame pts from in_frame
2019-02-14 15:54:47 -05:00
9e07d5cd17
try setting out_frame pts from in_frame
2019-02-14 15:54:00 -05:00
a11349bffe
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2019-02-13 11:38:44 -05:00
a41e8a8834
Merge branch 'master' into storageareas
2019-02-13 11:38:38 -05:00
31a11a6992
init log earlier in zms
2019-02-13 11:34:47 -05:00
78b97303a3
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2019-02-13 11:32:40 -05:00
2563951c1f
comment out the signal blocking. I still can't figure out why we would want it
2019-02-13 11:32:34 -05:00
42011e96e6
Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas
2019-02-13 11:29:12 -05:00
1aad1f765d
slep for 1 second if there is an error in capturing
2019-02-13 11:28:18 -05:00
924d5235d0
Validate zmu Username and Password lengths ( #2484 )
...
* Validate zmu Username and Password lengths
Ensure user provided values are not larger than allowed and error if
they are, therefore further preventing overflow.
* Check username and password functions for zmu and zms
* Check username and password functions for zmu and zms
2019-02-13 10:40:43 -05:00
060751602b
fix missing ;
2019-02-13 10:34:09 -05:00
d1b3b23c09
Merge branch 'master' into storageareas
2019-02-13 09:42:03 -05:00
0bfaf87d27
Mostly code style and whitespacing. However, I do setup more values in the output frame when doing audio resampling
2019-02-12 16:40:27 -05:00
3177764db4
spacing
2019-02-12 14:20:33 -05:00
ed6b22ac06
spacing
2019-02-11 16:29:36 -05:00
d33e094526
Merge branch 'master' into storageareas
2019-02-06 17:03:41 -05:00
e90f49deb9
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2019-01-30 15:17:32 -05:00
533d021dea
Merge branch 'master' into storageareas
2019-01-30 15:17:27 -05:00
6d7660cdbd
Now that we are dynamically allocating safer_username and safer_password, need to free them. Also, don't strlen them multiple times for efficiency
2019-01-25 08:46:40 -05:00
a81e7c5221
Safer_username and safer_login should be based on the username and login ( #2482 )
...
(lengths * 2)+1. Control input lengths at user input
2019-01-25 08:33:30 -05:00
ad69915e4a
fix build on libav 9, ubuntu trusty
2019-01-22 13:30:40 -05:00
7260f823cb
Merge branch 'master' into storageareas
2019-01-21 13:52:38 -05:00
a81428f701
add a test for a 0 fps passed in to updateFrameRate which would cause an infinite loop. Fixes #2427
2019-01-21 13:30:00 -05:00
189e78b42d
add comments and a test for zm_terminate in the checkCommandQueue while loop
2019-01-21 13:29:20 -05:00
83a652aade
add comments and a test for zm_terminate in the checkCommandQueue while loop
2019-01-21 13:29:14 -05:00
9f588d5758
prevent returning infinity from GetFPS
2019-01-21 13:00:10 -05:00
a39b92154c
wip
2019-01-17 08:49:48 -05:00
87d1390fed
Merge branch 'storageareas' into h265
2019-01-16 15:20:17 -05:00
f49dd93b6a
Merge branch 'master' into storageareas
2019-01-16 14:39:56 -05:00
2b21fe3640
increase sql var size to MED to hold the largest possible sql string.
2019-01-16 11:48:31 -05:00
3560d6247f
whitespace and comments.
2019-01-16 11:20:10 -05:00
345e2fef0f
start only used in eventstream
2019-01-15 16:44:58 -05:00
92066aaf4f
add stream start timeval
2019-01-15 16:33:27 -05:00
34224a957b
cleanup error string
2019-01-15 11:36:13 -05:00
5f6bcec4ca
Use start_pts instead of start_dts when calculating output pkt.dts. Because start_dts is often lower than start_pts, we can get into a situation where we calculate a dts that is > pts.
2019-01-15 11:35:37 -05:00
d068d019fb
turn section_length into seconds instead of frames
2019-01-15 11:34:17 -05:00
8c53f778b6
Start and stop events not just on keyframe. This means we must always queue packets
2019-01-15 11:32:44 -05:00
6608cb4e35
use frame delta to determine how much to sleep
2019-01-15 11:25:22 -05:00
84c812725e
spacing, improve debug. WHen looking for starting keyframe in packetqueue, use <= instead of <.
2019-01-14 14:00:45 -05:00
f726666f54
Merge branch 'master' into h265
2019-01-14 12:36:11 -05:00
9f8be169f9
set channels and sample rate in output frame. Use new zm_dump_frame()
2019-01-14 10:48:29 -05:00
a46b443d4a
create zm_dump_frame to print out useful frame info.
2019-01-14 10:48:06 -05:00
d0cca01c4c
setup url instead of filename in the AVFormatContext to satisfy filename being deprecated
2019-01-14 10:47:53 -05:00
c97eb16942
create zm_dump_frame to print out useful frame info.
2019-01-14 10:47:22 -05:00
fc7403fe3d
Merge branch 'master' into storageareas
2019-01-13 14:53:34 -05:00
730ced60d8
specify which input we are setting standard on. Not sure it is required, but the api docs do it
2019-01-10 12:08:51 -05:00
4a82f460b2
add some parenthesis to make logic at more clear if not more correct. Potentially fix #2405
2019-01-09 16:39:53 -05:00
9811679cc0
Merge pull request #2401 from connortechnology/vlc_logging
...
add a logging callback to the libvlc camera
2019-01-08 13:49:51 -06:00
a5de51478e
The termination callback should be private
2019-01-08 13:12:22 -05:00
ae1f00f2a1
add a logging callback to the libvlc camera
2019-01-08 13:06:19 -05:00
c4c6d5b642
switch to swr_convert_frame as a test
2019-01-05 10:15:22 -05:00
5060358870
Merge branch 'master' into storageareas
2018-12-29 09:56:53 -05:00
751c312609
fix non-ascii char
2018-12-29 09:56:33 -05:00
3258d8e590
remove ZM_DIR_IMAGES ( #2374 )
2018-12-29 09:52:58 -05:00
3d9c8814f9
increase error_count logging
2018-12-27 13:52:41 -05:00
3e06bbcef8
Merge branch 'master' into storageareas
2018-12-27 13:50:29 -05:00
32c88a3a41
Update status as well as fps when updating fps
2018-12-27 13:50:17 -05:00
db6d943854
If failure in connect, close the fd before returning
2018-12-27 11:53:21 -05:00
b87ae53a83
merge debug lines and correct spacing
2018-12-27 11:50:43 -05:00
55e0d82f20
spacing
2018-12-24 11:30:22 -05:00
6eb7892fc7
Merge pull request #2357 from connortechnology/libswresample
...
Implement libswresample support as an alternative to libavresample, w…
2018-12-20 16:44:06 -06:00
7a8beffdcc
Merge branch 'master' into storageareas
2018-12-20 15:10:52 -05:00
48865f124b
cap AAC bitrate at 96000 to prevent the aac encoder from complaining
2018-12-20 15:10:04 -05:00
e626049f6b
Merge branch 'swresample' into storageareas
2018-12-20 14:08:40 -05:00
6ee72aa2d9
Implement libswresample support as an alternative to libavresample, which is deprecated
2018-12-20 14:06:56 -05:00
8b239752ae
Merge branch 'master' into swresample
2018-12-20 13:48:37 -05:00
1d371b7a17
Fix small memleak of linked_monitors not getting freed on Monitor destruction. Fix unlocking db mutex before logging
2018-12-20 13:41:57 -05:00
62ce3c1f65
Implement libswresample in place of libavresample which is deprecated
2018-12-20 13:38:11 -05:00
19e4ef99bc
add get_fps to Monitor and use it to adjust the # of frames to cache before writing to db
2018-12-16 16:22:25 -05:00
3a068ae6a3
Merge branch 'master' into swresample
2018-12-16 16:15:28 -05:00
89c9a28614
Merge branch 'master' into storageareas
2018-12-14 12:25:06 -05:00
ad4f131284
Must unlock before logging
2018-12-14 12:22:10 -05:00
0bfe1007c8
Merge branch 'master' into storageareas
2018-12-14 10:16:08 -05:00
1a05e777c0
fix path not being constructed properly for shallow event storage
2018-12-14 08:54:29 -05:00
83e74aec55
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-12-14 08:40:45 -05:00
70388753ea
COmment out logging in signal handlers. Logging is too complex.
2018-12-14 08:40:32 -05:00
e9ae2e6968
COmment out logging in signal handlers. Logging is too complex.
2018-12-14 08:39:55 -05:00
ebaafef607
Ffmpeg logs optional ( #2345 )
...
* make ffmpeg logs configurable via web
* fix Info
2018-12-14 08:01:23 -05:00
a1e9058729
adjust ffmpeg logging levels
2018-12-13 16:19:55 -05:00
0784a8a5a1
reduce ffmpeg log levels from error to warning and warning to info. Ffmpeg outputs a lot of errors that don't significantly affect video recording.
2018-12-13 10:27:44 -05:00
22460f580b
Merge pull request #2305 from pliablepixels/save-first-alarm
...
Save first alarm
2018-12-11 09:35:40 -06:00
b563968ce2
Merge pull request #2321 from connortechnology/av_logging
...
Av logging
2018-12-11 09:30:08 -06:00
db81465fa2
allow one to set manpage destination
2018-12-07 09:47:00 -06:00
51fcede45c
Merge branch 'batch_frame_records' into storageareas
2018-12-05 13:18:35 -05:00
ab9081e1bf
create a simple Frame class. Add a queue of Frames to the Event. When we get 10 of them write them out to the db.
2018-12-05 13:18:21 -05:00
bc5f8d0d8d
rework pts/dts of audio stream. Spacing. Fix crash
2018-12-04 18:23:08 -05:00
23124d634c
improve ImageBufferCount too small message
2018-12-03 11:02:45 -05:00
d837b42836
fix ffmpeg warnings. We have to copy parameters from the context to the stream AFTER we open the codec
2018-12-03 10:33:53 -05:00
ddd2e24dcb
fix ffmpeg warnings. We have to copy parameters from the context to the stream AFTER we open the codec
2018-12-03 10:32:37 -05:00
0cf56f186c
add frame_size to stream dump
2018-12-03 10:32:01 -05:00
4272225a17
Merge branch 'master' into h265
2018-11-30 16:42:16 -05:00
e8622b68dc
whitespace, delete dead code
2018-11-29 13:17:41 -05:00
9cbc3352b9
Implement an error count. Return -1 when it gets over 100 so that the camera will be reopened.
2018-11-29 13:09:29 -05:00
af501128f2
fix invalid use of %s. Pass the buffer as the format string instead of a ... param
2018-11-29 10:54:01 -05:00
d4acc9e205
Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas
2018-11-29 10:24:58 -05:00
4625f7c879
Merge branch 'master' into storageareas
2018-11-28 10:46:49 -05:00
8404f0ef64
When forcing an alarm, print out the event id
2018-11-26 16:21:32 -05:00
251ccc0ba9
remove extra ()
2018-11-26 16:20:52 -05:00
1273cb863c
send logPrint a pre-formatted string
2018-11-23 13:04:46 -05:00
817a760559
send logPrint a pre-formatted string
2018-11-23 13:04:20 -05:00
c89bb8bc16
Merge branch 'av_logging' into storageareas
2018-11-23 12:46:27 -05:00
522ecaddd8
remove extra include unistd.h and we have to pre-define RecursiveMutex because we use it in zm_logger.
2018-11-23 12:46:10 -05:00
4d4666f5e0
add a mutex in logging functions so that multiple threads can log at the same time
2018-11-23 12:45:41 -05:00
61759a1f2d
older libavcodecs don't have AV_LOG_TRACE AND AV_LOG_MAX_OFFSET
2018-11-23 12:45:21 -05:00
af8626158d
zm_exception doesn't use anything from zm.h so don't include it
2018-11-23 12:44:54 -05:00
48564da915
zm_config.h shouldn't include zm.h. zm.h includs zm_config.h
2018-11-23 12:44:34 -05:00
5ad753b6b4
zm_comms uses logging functions, so include zm_logger.h
2018-11-23 12:44:10 -05:00
9241c26f2f
Move PATH_MAX to zm_config where all the other defines are
2018-11-23 12:43:51 -05:00
dea5db9dd9
Merge branch 'zmaudit_check_other_storageareas' into storageareas
2018-11-23 11:11:39 -05:00
b291c06035
Working zms h265 playing.
2018-11-19 16:45:56 -05:00
62e511cfd1
Merge branch 'master' into h265
2018-11-17 10:41:20 -05:00
87140ecdb5
white space and quiet warning
2018-11-17 10:39:42 -05:00
e24a308481
Merge branch 'master' into h265
2018-11-14 17:15:37 -05:00
64ce035129
Merge branch 'av_logging' into storageareas
2018-11-14 17:03:32 -05:00
70d9fda758
Implement a logging callback for avcodec to use our logging functions
2018-11-14 17:02:52 -05:00
9d5772b517
Merge branch 'fix_multiserver_daemon_restarting' into storageareas
2018-11-14 13:02:30 -05:00
35b439629c
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-11-13 18:14:35 -05:00
5120c6f540
remove compile warning by assigning AV_CODEC_NONE to the codec_id.
2018-11-13 18:13:55 -05:00
73c52705f2
Merge branch 'fix_32bit_alignment' into storageareas
2018-11-13 14:22:06 -05:00
e8ed1367d7
Merge branch 'master' into storageareas
2018-11-13 14:22:00 -05:00
31b0ed107d
remove epadding2, to restore the 64bit alignment of startup_time. A proper fix instead of #2258
2018-11-13 14:02:44 -05:00
e06f5b0f90
removed static
2018-11-12 13:34:29 -05:00
01a57222d3
keep track if we have written alarmed frame incase savejpeg is off
2018-11-12 12:43:20 -05:00
a95a012fa5
fix #2302
2018-11-12 11:56:18 -05:00
230ce61dc4
fix #2296 by prepending bind with ::
2018-11-07 11:54:18 -05:00
be0767b4cd
Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas
2018-11-06 15:27:17 -05:00
5a933a93c2
clean up static vars and google code style
2018-11-06 15:27:10 -05:00
6d6d25261f
Merge branch 'zmrecover' into storageareas
2018-11-06 12:14:54 -05:00
d973d55d2f
Use SaveJPEGs from the Event record instead of the Monitor Object
2018-11-06 11:45:34 -05:00
09fab280ea
SOCKS dir creation logs should be debug
2018-11-02 10:57:47 -04:00
17c091f9f9
Google code style and add a debug showing the # of addresses in hp
2018-11-02 10:26:39 -04:00
33235a19ba
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2018-10-28 15:11:32 -04:00
9e999294df
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2018-10-28 15:09:32 -04:00
ed50856d40
Merge branch 'master' into storageareas
2018-10-24 13:45:54 -04:00
bca2b30518
Add a test for channel layout and correct it if not set
2018-10-24 13:45:33 -04:00
c48ce09068
Turn back on ffmpeg debug logging
2018-10-24 13:11:09 -04:00
15f89c4b50
Turn ffmpeg logging back on
2018-10-24 12:44:14 -04:00
ca8770bd5a
Merge branch 'fix_rce' into storageareas
2018-10-24 10:17:16 -04:00
0f14df64e2
google code style and whitespace
2018-10-22 10:41:27 -04:00
a8329465fb
Merge branch 'master' into h265
2018-10-22 10:30:01 -04:00
17726bbe38
Actually say how big the ImageBufferCOunt should be
2018-10-17 17:19:27 -04:00
c2af380e29
Merge branch 'master' into storageareas
2018-10-16 11:39:26 -04:00
5fce783b65
Merge branch 'smarter_packetqueue' into storageareas
2018-10-15 11:34:05 -04:00
990c4b1b45
Add a warning when there are more videoframes in the packetqueue than image_buffers
2018-10-15 11:33:58 -04:00
dae31d226b
add GetImageBufferCount to monitor
2018-10-15 11:33:16 -04:00
33c903a644
properly initialize packet_counts
2018-10-15 11:13:10 -04:00
7149576a7c
Merge branch 'smarter_packetqueue' into storageareas
2018-10-15 10:59:50 -04:00
45a1a1b1e8
Make packetqueue keep track of audio vs video packet counts.
2018-10-15 10:51:56 -04:00
ba10c431f7
check for __ARM_PCS_VFP instead of __armel__
2018-10-12 09:34:16 -05:00
c7f9ffa521
Merge pull request #2217 from connortechnology/touch_lockfile
...
Touch lockfile
2018-10-11 08:45:09 -05:00
2881d2af3f
Merge branch 'master' into storageareas
2018-10-10 14:13:27 -04:00
ad70648cb3
don't build neon instructions on armel ( #2246 )
2018-10-10 14:10:02 -04:00
e8316a0aea
Add detection of packets with massively negative pts. Just skip them
2018-09-28 14:19:36 -04:00
33bd30fbbd
Merge branch 'master' into storageareas
2018-09-28 13:40:18 -04:00
fe444218cc
Implement replay mode = none in zms. This mode was only handled for video html tag viewing.
2018-09-28 12:31:53 -04:00
7768b4eeef
Don't need to delete videoStore in destructor, as it gets done in CLose()
2018-09-28 11:37:16 -04:00
c481fc868f
be more robust when curFrames is empty.
2018-09-28 11:25:19 -04:00
e0dc8a5f6b
Merge branch 'master' into storageareas
2018-09-27 13:54:53 -04:00
49a7614504
revert change that breaks building on newer ffmpeg libs.
2018-09-26 18:35:29 -04:00
5ef64bf256
fix memleak on old libav distros
2018-09-26 16:20:29 -04:00
51f0e7e5c8
Add a default timebase if the codec timebase is invalid. Also fix crash when we can't open the .mp4
2018-09-26 15:34:01 -04:00
1419f20dcc
add setting rtsp_transport to udp. It is the default but we print out an error otherwise
2018-09-26 15:33:29 -04:00
2385c80a4a
cleanup code a bit
2018-09-26 15:32:54 -04:00
8f6db1c279
Merge branch 'master' into storageareas
2018-09-25 13:54:44 -04:00
b55224be30
fix setting mFlush. Just have it on for DEBUG levels
2018-09-24 14:17:16 -04:00
fd2e8a530c
When changing log levels by SIGUSR1 turn on flushing
2018-09-24 09:40:05 -04:00
45056c3602
fix deprecation warning
2018-09-23 16:51:54 -04:00
53057eae25
Always make SOCK_DIR as it may not exist due to running under systemd and being chrooted
2018-09-23 16:51:06 -04:00
94796aea2c
Always make SWAP_PATH dir as under systemd it may be chrooted
2018-09-23 16:49:57 -04:00
ee168bf427
Properly initialize preevent frames data structures. Always update analysis fps. Make some warnings on loss of signal be Info's.
2018-09-23 16:49:06 -04:00
89cd7ceaf8
Whitespace, extra parentheses, google code style
2018-09-23 16:47:06 -04:00
c8549e41da
touch the zms lock file every hour so that we can determine which ones are stale
2018-09-21 15:58:14 -04:00
f61a1b7ebd
implement a touch() utility function
2018-09-21 15:57:48 -04:00
7abe4c40d5
Merge branch 'fix_2213' into storageareas
2018-09-19 20:02:27 -04:00
c8b10b2e3b
factor out some common code when creating the event directory and add a mkdir for creating the monitor directory. Should make event writing more robust when monitor dirs do not exist for some reason.
2018-09-19 19:50:26 -04:00
60b952ab86
Merge branch 'master' into storageareas
2018-09-13 16:20:36 -04:00
0ec391354c
Merge branch 'fix_zms_from_mp4' into h265
2018-09-13 16:18:28 -04:00
f972df167b
Merge branch 'master' into fix_zms_from_mp4
2018-09-11 13:22:42 -04:00
498435886f
improve debug message
2018-09-11 13:22:35 -04:00
b3ef347fd5
slight optimisations in frame skipping
2018-09-11 13:22:01 -04:00
e98603885d
Show # of frames, not the # of frames decoded already
2018-09-11 13:21:42 -04:00
0efc45fa93
implement a getFrame function that takes a timestamp and will seek to the appropriate time in the mp4 before getting a frame
2018-09-11 13:21:12 -04:00
ec6317bd66
change how frame data is stored to be more useful, pass frame time offset to getFrame to tell ffmpeg which frame to get
2018-09-11 13:20:41 -04:00
cc417cf3e7
reverse order of tests to be more efficient
2018-09-11 13:19:33 -04:00
c70fb2f195
When signal loss occurs, trigger an event close so that the event stops because we are no longer writing to the mp4
2018-09-10 17:11:16 -04:00
0bb672b86b
dick around reverting ffmpeg 3.4 deprecations to try to get fps correct
2018-09-10 17:10:39 -04:00
bf1fbd169c
return uninformative debug statement
2018-09-10 15:12:19 -04:00
5eec7e00c5
Merge branch 'master' into storageareas
2018-09-09 14:09:52 -04:00
a296b2b777
fix crash when savind audio on ffmpeg 2.8
2018-09-09 14:01:03 -04:00
e4c87ce256
Merge branch 'master' into storageareas
2018-09-09 11:36:52 -04:00
d945e2ba54
Fix context allocation on ffmpeg 2.8. Fixes #41 on connorTechnology fork.
2018-09-09 11:34:12 -04:00
fe1e17d097
Capture can reasonably return -1 for EOF.
2018-09-05 11:16:17 -04:00
14b5fc3660
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-08-31 18:43:29 -04:00
df3da6dd93
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-08-30 14:53:39 -04:00
0eaa539dc6
ZM_SWAP_PATH may not exist, so always try to create it
2018-08-30 14:53:27 -04:00
f2d4739838
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-08-24 17:11:39 -04:00
4be2a0501c
Merge branch 'master' into storageareas
2018-08-22 17:22:54 -04:00
d296d59625
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-08-22 16:34:29 -04:00
d97eea886a
fix scoring algorithim, to use max_alarm_size when specified instead of the size of the zone. ( #2186 )
2018-08-22 12:58:26 -04:00
90eda0b88b
spacing, remove extra parenthesis
2018-08-22 11:14:00 -04:00
871e3807e6
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-08-17 12:57:27 -04:00
3ab542199c
Merge branch 'master' into storageareas
2018-08-13 11:17:04 -04:00
17a02d66f7
google code style
2018-08-11 13:35:37 -04:00
3dc424282b
Support quoting config variables ( #2175 )
...
* allow handling of quotes in config files
* copy paste error
* surround zm_arptool in quotes
2018-08-11 12:56:16 -04:00
3b86d9255b
adjust some spacing
2018-08-10 11:16:27 -04:00
744884203c
adjust some spacing
2018-08-10 11:16:20 -04:00
a335eb66de
remove some extra braces
2018-08-10 11:16:04 -04:00
f2525253bb
spacing, remove excess parenthesis etc
2018-08-10 11:15:51 -04:00
185586ecd4
we must try to create the SOCK_DIR because nowadays systemd is chrooting processes and PATH_SOCKS may not exist
2018-08-10 11:15:15 -04:00
97a6a28182
You should just mkdir and handle EEXIST because stating first is a race condition
2018-08-10 11:14:41 -04:00
3962c52288
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-08-09 11:23:37 -04:00
9f183f5df7
google code style, improve debugging, add bandwidth code
2018-08-09 11:23:13 -04:00
f089f7d4bd
Add a mkdir for the ZM_SOCKS_PATH
2018-08-06 10:34:08 -04:00
a44df858be
Merge branch 'master' into storageareas
2018-08-02 15:40:44 -04:00
a0e67da51d
Improve loging around writing out analysis frames
2018-08-02 15:40:33 -04:00
50c7eec0ff
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-08-02 05:25:53 -04:00
246070793b
Fix crash in zma dur to images array not being allocated when analysis_fps not being set
2018-07-31 13:36:03 -04:00
908f81c6ef
Add some more debug
2018-07-31 13:22:52 -04:00
639717eb7b
If mysql gets restarted, and there is no change in fps, then the monitor_status record never gets updated. So just always update it.
2018-07-31 12:07:57 -04:00
61e7136857
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-07-12 17:03:21 -04:00
315b1bc11e
Implement a GetData function and use it to simplify the code everywhere we want to get more data.
2018-07-10 11:48:08 -04:00
d3034670a0
Merge branch 'master' into storageareas
2018-07-10 11:03:33 -04:00
974e42a610
spacing
2018-07-09 13:07:49 -04:00
dd479c9e55
remove () around return
2018-07-04 14:50:47 -04:00
ea86cb1181
Add debugging line to try to figure out starttime in the future problem
2018-06-15 10:16:28 -04:00
a594a1b6f1
Merge branch 'master' into storageareas
2018-06-15 09:45:11 -04:00
593209edd2
turn off passthrough for remote rtsp as it doesn't work at this time.
2018-06-14 13:28:05 -04:00
a745790541
Use 1 for successful return from CaptureAndRecord
2018-06-14 13:27:46 -04:00
8450d532b4
Add STDC_FORMAT_MACROS and include cinttypes so that PRIu64 works on centos7
2018-06-14 12:24:58 -04:00
09dae432ce
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-06-09 12:19:50 -04:00
934ce654f9
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-06-08 15:21:43 -04:00
794c6b641c
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-06-04 14:59:56 -04:00
b071aaad7b
Merge pull request #2111 from connortechnology/recursive_mutex
...
Implement a RecursiveMutex class which is an explicit Recursive Mutex…
2018-06-02 17:30:21 -05:00
173121b645
Merge branch 'recursive_mutex' into storageareas
2018-06-01 11:30:08 -04:00
87d9fc447e
google code style
2018-06-01 11:27:53 -04:00
316dbb5eb8
Implement a RecursiveMutex class which is an explicit Recursive Mutex. Change the db mutex to a recursive Mutex
2018-06-01 11:27:35 -04:00
64d5f180c8
add Disconnect to Close
2018-05-26 13:03:13 -04:00
84db1be31d
add version test to get rid of deprecation warning for refcounted_frames
2018-05-26 13:01:51 -04:00
39db8136b3
move pre_event_images init to constructor, getting rid of static_undef tests. Initialize timestamps to 0. Clean up some logic in Analyze
2018-05-26 13:01:30 -04:00
8792190f75
use 0 for return code when exiting cleanly
2018-05-25 14:21:41 -04:00
dd8e4da9ba
google code style
2018-05-25 14:21:06 -04:00
52de6ef7ea
delete authenticator when destructing. reduce memleak
2018-05-25 14:20:54 -04:00
e831c1563d
pretty the code structure
2018-05-24 10:59:26 -04:00
b7129578c1
fix case where pre_event_count=0 and analysis_fps is set because there are no pre_event_buffers
2018-05-24 10:59:15 -04:00
dc5ccd04ef
Update thumbnail with high scoring image.
2018-05-22 11:31:03 -04:00
5df2fbfff2
fix logic to handle no pre_event frames
2018-05-15 15:53:25 -04:00
4ca77fdd69
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-05-15 12:44:36 -04:00
98b2a3f6f0
improve structure/spacing
2018-05-15 12:44:24 -04:00
038c5f4e1a
log the log line not the uninitialized sql
2018-05-14 13:57:26 -04:00
945825cdcb
Google code style, fix join() in that we weren't using the delimitere parameter
2018-05-12 14:37:41 -07:00
d9fff848e7
change Groups to a vector, add GroupNames function
2018-05-12 14:37:26 -07:00
1ef5226316
cleanup
2018-05-12 14:37:13 -07:00
0a5980ce2e
Fix prealarmcount > alarm_frames. If Alarm frames is 1 and PreEventCount == 0, then the old line would have evaluated to true. By making it > alarm_count instead of >= alarm_count-1, we get the same behaviour for non-zero preevent counts, and also since alarm_frames >= 1 always, we handle the preeventcount=0 case.
2018-05-11 12:18:24 -04:00
190ac69975
reintroduce FfmpegInterruptCallBack so that av_read_frame can be made to quit
2018-05-08 12:02:08 -04:00
055be6b613
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-05-07 10:14:04 -07:00
ced208457d
spacing, google code style
2018-05-07 10:13:36 -07:00
4f1cc02f58
Merge ../ZoneMinder.master into storageareas
2018-05-07 11:08:10 -04:00
d31b33ffc6
add a code comment
2018-05-07 11:08:06 -04:00
cdf53e36e9
Google code style
2018-05-07 11:07:58 -04:00
b6887c277d
google code style
2018-05-07 10:27:40 -04:00
8ed015966b
add zm_terminate to main while loop
2018-05-07 10:27:26 -04:00
4d4a7a4221
Initialize bytes to zero in camera constructor.
2018-05-07 10:27:06 -04:00
f2c099f1e4
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-05-04 16:01:25 -04:00
7bc2c6dbc5
Downgrade Unable to send stream to warning
...
Downgraded this from en Error to a Warning. This message can trigger following the normal closing of a monitor. Thus, it's not necessarily an error.
2018-05-04 12:04:28 -05:00
375af59657
use unsigned for formatting
2018-05-04 09:58:22 -04:00
62f8f5cfdb
whitespace
2018-05-03 13:54:18 -04:00
6d5e46e91f
whitspace
2018-05-03 13:54:05 -04:00
67adad5d5c
use trylock instead of lock because our signal handler may try to log while the db is locked
2018-05-03 13:53:53 -04:00
c6fde10766
Implement trylock
2018-05-03 13:53:32 -04:00
29140a3012
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-05-02 14:13:11 -07:00
5988bed825
make encodeloop return frame_size to indicate error so that we can bail
2018-05-02 12:21:01 -07:00
eea58091c8
add groups
2018-05-02 12:20:36 -07:00
548cbd2b66
add groups
2018-05-02 12:20:07 -07:00
1cd7b73114
turn off closing event in a separate thread, add Groups
2018-05-02 12:20:01 -07:00
d8b461806a
fix StartTime in the future log
2018-05-02 11:37:54 -04:00
d46c06d201
remove extra event=NULL and spaces
2018-05-01 12:19:46 -04:00
fb9a12ddba
add locking around loading Zone
2018-05-01 12:19:34 -04:00
11ce50925c
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-05-01 09:42:11 -04:00
c8eab2d275
remove debug log to stdout that shouldn't be there. It messes up zms
2018-05-01 09:41:46 -04:00
cae2c9e237
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-30 15:11:32 -04:00
469a7347e8
include zm_terminate to make Capture break out of process is TERM'd
2018-04-30 15:09:00 -04:00
2845f891bc
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-04-30 10:12:41 -04:00
e55846e716
Log start_time when its > Now
2018-04-30 10:12:34 -04:00
a4da624f4c
break out of loops when zm-terminate is set
2018-04-27 13:20:38 -07:00
8a80cf686b
Merge branch 'master' into storageareas
2018-04-26 21:58:34 -04:00
356badf21d
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-04-26 11:57:46 -04:00
ee8f371deb
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-25 11:13:25 -04:00
8bdc68dc65
include zm_signal.h so that we have access to zm_terminate. Use zm_terminate to break out of endless loops. Add incoming bytes counts
2018-04-25 10:49:35 -04:00
117555a857
Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas
2018-04-25 09:39:10 -04:00
61fe2a734b
Add SIGHUP handler so that zmc reloads instead of dies
2018-04-25 09:38:18 -04:00
371f5dbc00
a zero duration will lead to a non-monotonic non-incrementing pts, so we have to use 1 instead.
2018-04-25 09:37:04 -04:00
f04bccceb2
handle out of order pts better
2018-04-25 04:59:08 -04:00
184596ed4b
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-04-25 04:29:35 -04:00
20f6985dff
implement capturing bandwidth
2018-04-24 14:11:27 -04:00
678503b992
fix ftbs on el7
2018-04-24 12:16:19 -05:00
bbb10fa4b4
Turn off ffmpeg debugging output, as it seems to conflict with the code at zm_db.cpp 34
2018-04-24 12:40:15 -04:00
21413c0fe6
comment out corrupting code
2018-04-24 11:49:10 -04:00
cc525b2397
Output more detailed shared mem size info
2018-04-24 11:41:54 -04:00
4d95498664
Prevent double init of Ffmpeg by using FFMPEGInit()
2018-04-24 11:41:31 -04:00
cc77561826
fix last_event being uint64
2018-04-24 11:40:38 -04:00
b5ff820c61
Test that shm is always valid in zma so that zma dies if zmc does.
2018-04-23 16:24:44 -04:00
5f7d404a0c
spacing & style. Put locking around db accesses in RealoadLinkedMonitors
2018-04-23 16:24:15 -04:00
e8eaf5fc80
quiten build error
2018-04-23 14:43:16 -04:00
c0d04521d4
cleanup. Google Code Style. Move diag_path from a static to a class member so that multiple zones will create different diag files.
2018-04-23 14:36:54 -04:00
18b015903a
cleanup. Google Code Style. Move diag_path from a static to a class member so that multiple zones will create different diag files.
2018-04-23 14:36:46 -04:00
3ab0755e03
google code style plus other cleanups
2018-04-23 13:50:10 -04:00
a110ae71f5
put lines back preventing double open of mysql
2018-04-23 13:48:14 -04:00
235fc640be
exit_zmu must come before use
2018-04-23 11:15:33 -04:00
11cacebb3b
use a function called exit_zmu instead of exit() to properly close logs and db. The reason is just to reduce connection lost logs in mysql.
2018-04-23 11:14:44 -04:00
3b9f7b38c5
Use int instead of long. Monitor->GetCaptureDelay returns an int, so no reason to use long.
2018-04-23 10:40:42 -04:00
609244857d
google styleguide updates
2018-04-23 10:39:32 -04:00
9c0600cace
Add a HUP Handler
2018-04-23 10:29:42 -04:00
35dcedb2ad
fix ftbs on el7
...
adds compiler support for PRIu64
2018-04-21 20:55:21 -05:00
56186a42ef
change signal_check_points to a per-monitor variable instead of parts of config. Only call SignalCheck if signal_check_points is > 0
2018-04-19 10:10:14 -04:00
eb21a5113e
Add a debug line in SignaCheck function
2018-04-19 09:34:14 -04:00
bd69f6a2ca
close the videoStore when closing FFmpegCamera
2018-04-18 15:30:42 -04:00
e56cf0b31c
switch to uint64_t for event_id because long long can actually be 128 bit
2018-04-17 13:57:19 -04:00
fd1c69d48a
switch to uint64_t for event_id because long long can actually be 128 bit
2018-04-17 13:51:20 -04:00
3b0282f6ec
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-04-17 12:32:10 -04:00
0198ac832d
improve logging around loss of signal and lock around static sql
2018-04-17 12:30:58 -04:00
34111251d9
Introduce Close() to camera and monitor api. Use it to close a camera when there is an error with capturing. Remove the sleep10 on error.
2018-04-17 07:02:52 -07:00
0b0fbae1c5
Add output of paused image when paused
2018-04-12 18:43:57 -04:00
f9f78e9aa3
Convert event_id to a 64bit unsigned int
2018-04-12 13:40:11 -07:00
b974b4dcd1
google code style, and when paused, don't die after 10 seconds
2018-04-12 13:14:00 -04:00
2af539e916
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-04-12 11:39:30 -04:00
8518278476
coverity scan fixes/cleanups
2018-04-12 11:29:35 -04:00
c766c1ddd1
spacing cleanup
2018-04-12 10:28:22 -04:00
71d5984eb0
delete stream after use
2018-04-12 10:26:18 -04:00
ea8a132289
use swscale's new init function
2018-04-12 10:25:06 -04:00
65c69d419b
google code style and remove throws from constructors and destructors
2018-04-12 10:24:47 -04:00
c6635b8096
make swscale more robust by moving bits that can fail into an init function instead of the constructor
2018-04-12 10:24:10 -04:00
3130a21a28
google code style
2018-04-12 10:23:20 -04:00
f17c8475be
clean up order of declarations
2018-04-12 10:23:10 -04:00
3b7992a39b
converity scan fixes, and close the .mp4 after updating the db record.
2018-04-12 10:22:46 -04:00
c466f50255
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-04-11 13:50:50 -07:00
989ed65f52
spacing and braces, remove a dead unused function
2018-04-11 10:50:28 -04:00
db0dac6eb2
Don't use static sql when multiple threads might be using it
2018-04-10 13:06:36 -07:00
06fed41d5a
whitespace
2018-04-06 23:21:47 +02:00
da9d4c2a5c
whitespace, don't pre-allocate mFormatContext
2018-04-06 23:21:40 +02:00
64cfb39043
do an initial fps report early on
2018-04-06 23:21:22 +02:00
d8171750cd
only call avformat_close_input if mformatContext still has a value. On falure it should have been freed and NULL'd
2018-04-06 23:02:15 +02:00
668c515b21
remove unused code that doesn't compile
2018-04-06 19:48:00 +02:00
b9da309904
remove spaces
2018-04-05 11:33:09 -04:00
ec5f955d26
more db locking
2018-04-05 11:30:14 -04:00
fc38fdcc56
remove extra spaces
2018-04-05 11:30:01 -04:00
a493fd4dd7
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-04-03 17:41:49 -04:00
9fde052d39
merge
2018-04-03 14:41:32 -07:00
a1def1dfe9
whitespace
2018-04-03 12:23:54 -07:00
5a08fcc1db
whitespace, handle file not found
2018-04-03 12:23:38 -07:00
dfc35721f9
ensure that sections are always > section_length
2018-04-03 07:03:12 -07:00
ceb12cdd81
undo a debug thing that shouldn't have been committed
2018-04-03 09:12:18 -04:00
Isaac Connor
Isaac Connor
Pliable Pixels
Isaac Connor
Pliable Pixels
rpdrewes
Steve Gilvarry
Andrew Bauer
vajonam
Isaac Connor
Andy Bauer
Isaac