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
a5b77a59d3
allow 0 pre_event_count
2018-03-29 12:35:03 -04:00
82c44da9be
remove some space
2018-03-29 12:24:21 -04:00
0053404553
remove some spaces
2018-03-29 12:24:12 -04:00
a56eafe796
when deleting Logger object, need to reset zmInitialized because we clear all the codes
2018-03-29 12:24:00 -04:00
b22911f554
wait to closeEvent on monitor shutdown
2018-03-28 14:03:56 -04:00
4be64152e8
put mutex around inserting event stats
2018-03-28 09:12:38 -04:00
b8a792cfb7
whitespace google code style
2018-03-27 11:04:40 -04:00
3a5ff289d0
perfect the whitespace
2018-03-27 10:04:32 -04:00
bcc7011871
update sql loading code in Reload, which will automatically do the db locking
2018-03-27 10:04:19 -04:00
161a0c81f3
pull
...
add mutex around log to db
2018-03-23 14:34:50 -04:00
2107e5b223
whitespace
2018-03-23 12:50:53 -04:00
11cf3ce482
whitespace
2018-03-22 11:33:24 -04:00
43bdaff0a3
Merge ../ZoneMinder.master into storageareas
2018-03-22 11:32:22 -04:00
36ca1d417d
code document
2018-03-22 10:26:05 -04:00
ccf0336c9d
whitespace
2018-03-22 10:25:56 -04:00
b220b8f588
mostly white space fixes, but also, unlock on error condition
2018-03-22 10:25:47 -04:00
06f10e0ed3
fix double free of mysql_result
2018-03-22 10:04:41 -04:00
50696319cc
Always error out when stream fails, even on EOF. Just don't log EOF as an error.
2018-03-22 09:25:35 -04:00
ea38f7cca4
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-03-15 11:43:15 -04:00
27736fb5d9
Merge ../ZoneMinder.master into storageareas
2018-03-15 11:04:41 -04:00
6f3d16fe10
label_format can be null
2018-03-13 12:06:03 -07:00
cefd00d1ea
load User and Pass as well
2018-03-13 14:50:41 -04:00
704ccaee73
2059 alarm cause ( #2060 )
...
* added alarm_cause as a test
* initial attempt to integrate with notes
* testing sizeof
* add zone labels
* fixed typo
* fixed typo
* comments and formatting
* Downgraded invalid attribute to error
* Removed Error downgrade. Instead do a undefined check on field params
* Added help text
2018-03-12 19:38:12 -04:00
7fb1c8921b
reorder functions to put them in a better order
2018-03-09 07:50:47 -05:00
d1837a96b4
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-03-09 07:25:28 -05:00
56b2787907
reorder variables to match init order in constructor
2018-03-09 07:24:53 -05:00
dcf7c4fdde
rework loading Monitor using consistent db query
2018-03-09 07:23:40 -05:00
d777f6104f
add a method to access the underlying MYSQL_ROW
2018-03-09 07:23:14 -05:00
a1213142df
whitespace
2018-03-09 07:22:59 -05:00
b4c13d56d6
Merge ../ZoneMinder.master into storageareas
2018-03-06 12:29:59 -05:00
128c4c73e9
Add official sql for loading a Monitor
2018-03-03 13:29:39 -08:00
3fc7ebee6c
Merge ../ZoneMinder.master into storageareas
2018-03-03 09:32:23 -08:00
47ec0abf11
spacing
2018-03-02 18:27:03 -08:00
91c9714e43
cleanup
2018-03-02 18:26:21 -08:00
d980def64f
spacing, increase debug
2018-03-02 18:26:07 -08:00
77ded1f5be
spacing and increase debug
2018-03-02 18:25:46 -08:00
ede13ac41b
put all db access after finishing encoding, because we don
...
't care when they happen, and we need the encoding done.
2018-03-02 18:25:20 -08:00
a6827c97ab
Cleanup, add some sanity checks
2018-03-02 18:24:39 -08:00
9af6dc02bc
better debug of packet pts/dts/duration
2018-03-01 19:22:47 -08:00
28342b907b
add a thread for deleting the event. This is because writing out the final frames of an mp4 can take a long time, during which we are not analyzing.
2018-03-01 19:22:22 -08:00
4d81b7b66b
Do not just reconnect to the input stream on EOF. pts/dts gets outof whack when doing passthrough. Instead treat it as a loss of signal, which will end the event and start a new one
2018-03-01 19:21:41 -08:00
1bc6e40fbc
add mutex locking around mysql functions so that we can go multi-threaded
2018-03-01 19:20:52 -08:00
b3d23ab233
merge zma_to_thread version of db functions, which include a mutex lock
2018-03-01 19:20:29 -08:00
3586825c90
fix preevent_count==0 causing div/0
2018-02-26 17:08:05 -08:00
902f5f098a
remove debug code
2018-02-26 16:10:27 -08:00
e3802954f7
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-02-23 19:01:46 -05:00
a231f500ec
better debug, whitespace
2018-02-23 19:01:42 -05:00
5b55bef721
Add support for h264_mmal
2018-02-22 18:33:11 -05:00
e634e0addc
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-02-17 12:25:42 -05:00
77426a7838
term to terminal for clarity
2018-02-17 12:25:05 -05:00
e6d9292dd0
term to terminal for clarity
2018-02-17 12:25:00 -05:00
9caa71233a
catch another EOF case
2018-02-17 11:07:06 -05:00
8ba02d8e0e
Fix re-opening log file. If there was no change in File Log level, then it wouldn't close and reopen, but the filename might have changed, so we have to.
2018-02-14 13:50:16 -05:00
2e11c12d73
add debugging to logging
2018-02-14 11:56:54 -05:00
9a19a9cddd
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-02-13 10:11:49 -05:00
744d776d9f
return when ReopenFfmpeg fails
2018-02-13 10:11:39 -05:00
162a08e81d
return when ReopenFfmpeg fails
2018-02-13 10:11:05 -05:00
e83586dbe1
Rename Term to Terminal to differentiate between Terminate
2018-02-13 06:23:18 -05:00
ef72e585b9
Include id in the user object
2018-02-13 05:28:00 -05:00
4f57a40cb6
Update Monitor_Status after connection lost and when exiting
2018-02-12 13:24:19 -05:00
cd606dbab8
whitespace
2018-02-07 08:03:01 -05:00
a4c956da7d
Only update db entry when value changes
2018-02-05 22:59:22 -05:00
af67e3b686
whitespace
2018-02-04 11:54:25 -08:00
310193791d
add a 10 second sleep before reconneting
2018-02-04 11:54:11 -08:00
e25af4b40c
cleanup, reset result
2018-02-02 16:07:13 -05:00
868e17a414
Allow Method in Monitors to be NULL
2018-02-02 10:31:55 -05:00
6942aaed15
whitespace
2018-01-31 14:36:01 -05:00
882a242b76
Fix mpeg streaming.
2018-01-31 14:35:00 -05:00
31ad807a90
If ffmpeg is open in PrimeCapture, close it. Turn all Fatals into Errors
2018-01-31 14:34:39 -05:00
bdb5176981
increase debug lvel of dumpPacket
2018-01-31 14:33:42 -05:00
c9bc5a8cd8
if given timestamp is in the future, reset it, it is likely invalid
2018-01-31 14:33:20 -05:00
ba2c111762
restructure to keep trying to open the camera instead of exiting.
2018-01-31 14:32:48 -05:00
218e34a079
Can only have 6 digitals, not 8
2018-01-30 11:23:09 -05:00
8c90a8a47a
Fix Id => MonitorId in MonitorStatus
2018-01-29 23:06:59 -05:00
1d221dff7c
Frame throttling is not an error.
2018-01-29 11:45:33 -05:00
fc4edefd81
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
2018-01-29 07:35:24 -08:00
7e2f132cdd
Better debugging
2018-01-29 07:22:05 -08:00
cfb0461fcf
Rename column Id to MonitorId in MonitorStatus
2018-01-29 09:31:43 -05:00
f98217e62a
remove useless debug code
2018-01-28 15:17:48 -05:00
190d8d1600
remove useless debug code
2018-01-28 15:17:41 -05:00
748f78d7a6
clean out old threaded code that has been #defined out for a long time. When EOF, after re-opening, continue instead of logging the error
2018-01-28 15:17:22 -05:00
057509637a
TUrn a warning into a debug
2018-01-28 15:16:06 -05:00
16c24240f7
clean out old threaded code that has been #defined out for a long time. When EOF, after re-opening, continue instead of logging the error
2018-01-28 15:14:38 -05:00
5a3d0b944e
Detect invalid delta_time and don't exit on failed mysql
2018-01-26 12:21:12 -05:00
50fc4a2d94
Use a memory table called Monitor_Status to store FPS and Status info for Monitors. This is to reduce locking and updates on the main Monitors table.
2018-01-24 11:51:11 -05:00
66fd02a29e
Use dumpPacket
2018-01-23 18:15:29 +01:00
abb2cfbe12
fix zm_av_packet_ref for old ffmpeg. Need to set the size and flags as well as copying the mem.
2018-01-23 18:14:55 +01:00
6bc83ca6a2
Set Default Scheme
2018-01-23 09:07:40 -05:00
bfa0a00e67
dfebug improvements
2018-01-22 03:27:44 +01:00
41a05f5eef
simplify logic, improve debugging
2018-01-22 03:26:36 +01:00
414930cb90
simplify logic, improve debugging
2018-01-22 03:26:33 +01:00
4127aa50f3
simplify logic, improve debugging
2018-01-22 03:26:25 +01:00
18f0610d87
Merge zm_ffmpeg.cpp from zma_to_thread
2018-01-21 17:18:29 -05:00
59a1272307
bump version
2018-01-18 11:39:33 -05:00
360a10276f
Fix. We were deleting the keyframe that we wanted to keep.
2018-01-17 10:01:48 -05:00
687d797303
Only log debug message about excluding audio if there is an audio stream
2018-01-17 09:53:03 -05:00
7f4deef4a9
Move debug comment about opening audio codec into the part where the audio codec is opened
2018-01-17 09:21:17 -05:00
26cea49f1a
handle nulls in event_prefix and label_format in Monitor::Reload
2018-01-16 11:08:35 -05:00
9284e26512
get rid of the snapshot setting. If we aren't storing all frames, then we should always store the snapshot.
2018-01-13 15:15:14 -05:00
2c121fb784
If we get a term signal while waiting for zmc, die.
2018-01-12 07:12:54 -08:00
7d2becee21
add reload on HUP
2018-01-10 12:59:42 -05:00
ae5f4c9d9c
Add log re-init on HUP
2018-01-10 12:58:22 -05:00
727bde752f
Count non-i frames in frames_to_keep. Should reduce the size of the packetqueue
2018-01-07 13:39:13 -05:00
2ec25a20ec
Don't crash if we fail to open the video output stream
2018-01-04 10:07:51 -05:00
2922a86d23
fixes to new Storage Schemes code
2017-12-19 11:01:03 -05:00
8a8001f14a
fix missingc_str()
2017-12-18 13:25:24 -05:00
705a98276f
change StorageScheme to Scheme
2017-12-18 13:17:43 -05:00
d312482a2b
add StorageScheme to Storage and Events. Deprecate ZM_USE_DEEP_STORAGE
2017-12-18 12:52:26 -05:00
a304af727b
debug GetFPS
2017-12-12 14:37:02 -05:00
70d43d2d27
fix strncpy calls
2017-12-12 13:42:48 -05:00
34668db43b
use return value of WriteJpeg
2017-12-12 13:39:36 -05:00
97e3ac046e
close file handle on error
2017-12-12 13:38:31 -05:00
599848346e
close infile on error condition. Make failure to read not be fatal.
2017-12-12 13:35:19 -05:00
7278448b01
remove test for less than zero of uints
2017-12-12 13:30:58 -05:00
6bffc54b77
fix referencing event_data before we test it for null
2017-12-12 13:30:43 -05:00
c40f79097d
fix zeroing of vid_cap, when we want to zero vid_pic!
2017-12-12 13:28:39 -05:00
5f0db60c38
quiet coverity
2017-12-12 13:25:41 -05:00
b246ae4d19
remove less than zero tests for unsigned parameters
2017-12-12 13:25:02 -05:00
2769c1fc54
add missing unlock
2017-12-12 13:20:53 -05:00
5fa7fd4db8
initialize mValue
2017-12-12 13:19:35 -05:00
3c44c1f9be
quiet coverity by returning after Panic
2017-12-12 13:19:23 -05:00
52953d7112
initialize ttl
2017-12-12 13:19:09 -05:00
46094fe6cf
close outfile on error
2017-12-12 13:18:57 -05:00
47f3971f9a
remove unused mDbConnection
2017-12-12 13:18:50 -05:00
568b15a916
initilize things to quiet coverity
2017-12-12 13:09:55 -05:00
23a2f1e609
quiet coverity by initialising last_frame_timestamp
2017-12-12 13:01:57 -05:00
fe8e1ba445
change the order of open/stat. Only stat and check for char device if we can actualy open it
2017-12-12 13:01:38 -05:00
fe74c41723
fix integer division instead of double
2017-12-12 12:56:19 -05:00
716a29545f
fix strncpy not leaving null terminator space
2017-12-12 12:53:05 -05:00
db915b2c56
Don't do an unneccesary assignemnt
2017-12-12 12:52:30 -05:00
43e4421368
fix strncpy not leaving null terminator space
2017-12-12 12:52:20 -05:00
2df96bf6ee
use the return value of stat
2017-12-12 12:51:54 -05:00
007ebd3689
remove unused var
2017-12-12 12:41:17 -05:00
40e4d909c3
turn Fatal into Error
2017-12-12 12:41:11 -05:00
ec99c96587
remove unneccesary assignment
2017-12-12 12:38:40 -05:00
31189bdb11
make an error not fatal and check return to quiet coverity
2017-12-12 12:38:30 -05:00
9085a4b062
remove unused class members
2017-12-12 12:38:05 -05:00
f8738f2387
quiet coverity
2017-12-12 12:37:49 -05:00
8c1159ad56
quiet coverity by initializing everything in constructor
2017-12-12 12:37:36 -05:00
56e879da7b
should only cpoy sizeof(path)-1 to leave space for null terminator
2017-12-12 12:37:04 -05:00
a9bbe3e85c
remove debug lines
2017-12-12 12:36:35 -05:00
16ac341642
locallist return code vars, they don't need to be class members
2017-12-12 12:35:54 -05:00
a0f79b7bf7
add CFG_UNKNOWN and use it in the .cpp to quiet coverity
2017-12-12 12:35:28 -05:00
49be06d641
move freeaddrinfo up before a return to prevent memleak
2017-12-12 12:35:05 -05:00
475d39f1c6
move closedir down so that it always happens. Make coverity quiet
2017-12-12 12:34:43 -05:00
819c2e5190
fix possible not null-terminated strncpy. Wouldn't actually happen because we are copying from the db field which is 1 smaller than the variable but Coverity doesn't know that.
2017-12-12 11:48:12 -05:00
c04ec1b8a8
fix mem corruption
2017-12-03 12:50:57 -05:00
344539f5dc
cleanup
2017-11-28 11:55:47 -05:00
d73f9e8a73
wip, crashes
2017-11-28 11:11:41 -05:00
1e50df741f
fix some memleaks
2017-11-28 09:50:09 -05:00
03c9f88d55
fix build on trusty
2017-11-27 08:24:14 -05:00
7c491bf62e
make compile on trusty
2017-11-26 18:06:12 -05:00
fc27674d76
can't do init in the if statement
2017-11-26 17:50:57 -05:00
4b92a788f7
fix filter execute
2017-11-24 15:37:50 -05:00
0eb2ae60f3
only try to write timecodes if the open was successful
2017-11-22 12:13:28 -08:00
3c55daaf36
Merge branch 'tesla' of github.com:connortechnology/ZoneMinder into tesla
2017-11-22 12:10:54 -08:00
fe42eed1ea
cannot unlink the lock file, it has to stick around.
2017-11-22 11:43:13 -05:00
cd1d2e1721
lots more debugging. re-add status update command on failure
2017-11-22 01:18:07 -05:00
3af52256b8
turn down debug
2017-11-21 23:57:34 -05:00
4d758b7ce9
debugging
2017-11-21 23:57:13 -05:00
ebe3073c59
only update fps if we have an image capture
2017-11-21 23:57:01 -05:00
a1fe0c4de3
store the value of saveJpegs in the event
2017-11-21 23:56:22 -05:00
752990bb0f
improve zms logging
2017-11-21 23:55:53 -05:00
64816aa005
fixes from cppcheck.
2017-11-18 16:00:10 -05:00
1abcb19851
add Copy routing
2017-11-18 09:45:54 -05:00
7d77cd75fe
eliminate redundant code and memleak
2017-11-18 09:45:47 -05:00
159c0a7165
moer cppcheck fixes
2017-11-17 07:52:26 -05:00
22ff831859
more cppcheck recommendations
2017-11-16 21:21:56 -05:00
0318fb54a6
add missing initializers
2017-11-16 18:23:02 -05:00
1686584908
more cppcheck fixes
2017-11-16 09:19:27 -05:00
a956ffe7b3
add Copy and =operators to satisfy cppcheck
2017-11-16 09:15:04 -05:00
d5962b11ff
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-11-14 02:48:38 -05:00
65e7fb0014
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-11-14 02:40:12 -05:00
d07f36a7ee
Merge branch 'storageareas' of http://github.com/connortechnology/ZoneMinder into storageareas
2017-11-13 10:27:27 -08:00
ecd86b3fde
cleanup
2017-11-12 15:18:39 -05:00
f476c8f2e5
fixes from cppcheck
2017-11-12 13:25:19 -05:00
a99c5b54fa
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-11-12 13:16:49 -05:00
feca6c3df0
add a copy constructor at the advice of cppcheck
2017-11-12 13:16:18 -05:00
71f13a7c9a
optimisations/fixes from cppcheck
2017-11-12 10:27:47 -05:00
4c76b74645
decrease debugging
2017-11-11 09:11:05 -05:00
57a53f6fdd
spacing and fixes
2017-11-09 15:03:23 -05:00
402ad0ace3
Merge branch 'storageareas' of http://github.com/connortechnology/ZoneMinder into storageareas
2017-11-07 18:22:12 -08:00
e17bcb9178
updates for mast ffmpeg
2017-11-07 18:21:51 -08:00
a9419064ef
don't calc fps if no time has passed
2017-11-07 09:35:13 -05:00
c3cfd096c7
Don't connect to the monitor when doing an eventStream
2017-11-07 09:34:47 -05:00
4b8a8e7b56
fix new return value from Capture, 1 signals 1 frame captured
2017-11-05 18:02:09 -05:00
0a3327e2d2
move test for h264 into the code that opens the stream instead of comparing on every capture
2017-11-05 09:59:27 -05:00
ee96f58ac4
fix fps reporting value when Capture doesn't return a new frame
2017-11-05 09:59:06 -05:00
cab8c4cd5e
cleanup Monitor::Capture. Cleanup the return values from Capture and CaptureAndRecord. <0 is error, 0 is things ok, but no video frame. > 0 means we have a frame. Plus google code style
2017-11-03 13:49:42 -04:00
fdbd344d74
whitespace
2017-11-03 09:23:08 -04:00
495cd580aa
add more debugging
2017-11-02 11:45:49 -04:00
a8b679e479
set frameCount for audio packets too so that a long period of just audio will return and update lastframesent etc.
2017-11-02 11:45:33 -04:00
f0cfebe719
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-11-01 13:11:49 -04:00
ac9116e78b
add connkey to logging so I can tell which process is which
2017-11-01 12:01:12 -04:00
c9d52b47ba
add debug
2017-10-31 13:29:49 -07:00
ab1c9f7c98
add more debugging
2017-10-31 16:27:43 -04:00
eb48759ff8
wip
2017-10-27 13:37:51 -07:00
0fc6852065
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-10-24 16:25:49 -07:00
df14b3c812
handle failure to connect to zmc in zms gracefully
2017-10-24 16:22:26 -07:00
fdbbc5101e
Merge branch 'storageareas' of http://github.com/connortechnology/ZoneMinder into storageareas
2017-10-24 16:10:20 -07:00
b54d340bda
google code style fix
2017-10-24 16:10:16 -07:00
cfaf10335b
add Monitor status, capturrFPS and AnalysisFPS to processes
2017-10-24 16:08:31 -07:00
2d3aa08303
include <0 in test on event frame timestamp
2017-10-23 09:56:30 -04:00
fece06c9e3
google code style
2017-10-19 17:12:36 -04:00
e0d99018aa
Google code style, add a warning if no sd
2017-10-19 16:08:20 -04:00
666233af54
fix mving capture_file_format to staticCOnfig
2017-10-18 20:46:26 -04:00
10accc4226
google code style
2017-10-18 10:23:40 -07:00
965e1e8bc1
improve readability of debug statement
2017-10-18 10:22:53 -07:00
f81471da09
google code style
2017-10-18 10:22:37 -07:00
3436c65aab
minor logic improvement
2017-10-18 10:22:15 -07:00
4b30dd540c
tabs to spaces
2017-10-18 10:21:54 -07:00
ad97023732
spacing
2017-10-12 08:54:43 -07:00
8ea335d45e
whitespace
2017-10-10 15:08:24 -04:00
7b2163f824
add debug
2017-10-10 12:58:06 -04:00
c654d008f0
add monitor selector to montagereview and montage.
2017-10-10 09:36:56 -04:00
b6974ea373
Add monitor drorpdown to montagereview
2017-10-09 15:32:09 -04:00
219b7e0f36
output failing sql
2017-10-08 09:13:56 -04:00
7b7d477ab2
spacing, increase debug level of discovered formats. Don't crash if device returns more than 64 formats
2017-10-08 09:13:37 -04:00
df1fa97e0c
handle nulls in StorageId and device
2017-10-06 16:17:37 -04:00
c11f310f54
fix
2017-10-03 14:51:57 -07:00
354262c557
wip nvsocket
2017-10-03 13:28:56 -07:00
a1847aff75
add in new experimental nvsocket camera
2017-10-02 12:57:40 -04:00
ddb7305aab
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-10-02 09:11:55 -04:00
8c1cfb28a5
use c-style casts because they work
2017-09-26 16:13:26 -04:00
94fd113b63
use c-style casts because they work
2017-09-26 16:12:20 -04:00
1ba0a52769
remove const... which is preventing us from building on trusty
2017-09-26 12:53:54 -04:00
38a4ca1a6f
use storageareas when outputting zone diag images
2017-09-26 09:33:33 -04:00
e277456682
put parenthesis back in
2017-09-26 09:15:54 -04:00
9f93bfc23b
use Monitor Id in path to diag images instead of monitor name as the name is a convenience link and not guaranteed to exist
2017-09-25 18:45:58 -04:00
1791d3d5b7
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-09-25 16:23:33 -04:00
84be41998a
make debug lines more informative
2017-09-25 16:23:27 -04:00
74bb2da668
remove extra parenthesis
2017-09-25 16:23:15 -04:00
3227599e01
google code style
2017-09-25 16:22:52 -04:00
869d2b4f16
make failure to symlink non-fatal. Someday we may want to use a file store that doesn't do symlinks
2017-09-25 16:22:41 -04:00
8941bc80b8
reduce log level for success debug message
2017-09-25 16:21:46 -04:00
2a39cf2bcd
split videostore opening out of the constructor so that we can test for failure
2017-09-25 15:28:14 -04:00
fef503f90c
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-09-23 13:42:44 -04:00
fa37a55226
if debug is not on, limit the log level to each destination. This makes checks to meffectivelevel work
2017-09-23 13:41:20 -04:00
7d2453e7ac
fix google code style
2017-09-04 15:28:23 -04:00
98590b99f8
Merge branch 'storageareas' into work_on_zms
2017-09-04 14:35:02 -04:00
d11313e6bc
fix build
2017-09-01 18:03:34 -04:00
ed6ff23c2f
Merge branch 'storageareas' into work_on_zms
2017-09-01 17:53:59 -04:00
08bdf5a729
fix build on trusty
2017-08-24 12:19:57 -04:00
2a4f751a4f
ffmpeg versionc heck
2017-08-24 12:00:48 -04:00
2daae43760
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-08-24 10:14:00 -04:00
48e9e12063
assume source=monitor when a monitor_id is specified
2017-08-24 10:13:46 -04:00
789de37d33
fix builds on older ffmpeg
2017-08-24 09:53:40 -04:00
a4cf47b5c3
move swscale into it's own files
2017-08-23 15:06:12 -04:00
a81ff85fbb
add ffmpeg decoding of a .mp4 to get the frames
2017-08-23 15:05:44 -04:00
5c13ae26e3
Merge branch 'storageareas' into work_on_zms
2017-08-23 10:43:19 -04:00
732ebf6df4
shorted some variable names and correct spacing
2017-08-23 10:37:32 -04:00
eb5cee7f3e
use ifdef around uses of AV_CODEC_ID_H265 and fix google code style
2017-08-23 10:14:06 -04:00
e98ea0b891
fix non hwaccel build
2017-08-22 10:47:37 -04:00
676c4b7ddc
Merge branch 'master' into storageareas
2017-08-22 09:52:14 -04:00
d406d9549c
use int instead of unsigned int. Google code style says it's right, and it gets rid of a comparison warning
2017-08-22 09:47:30 -04:00
ac5d1738ea
allow changing of the timestamp char code delimeter ( #1972 )
2017-08-21 11:27:11 -04:00
cf8560b648
fix duration if it's negative
2017-08-21 10:15:56 -04:00
a63d0878b6
remove more hwaccel code
2017-08-16 13:41:44 -04:00
da5438a6ff
detect hardware accel capabilities
2017-08-16 12:16:15 -04:00
9e2aa941fc
rough in vaapi and qsv decoders. More debugging
2017-08-16 11:31:47 -04:00
ad0644b906
Merge branch 'storageareas' into vaapi
2017-08-15 16:05:25 -04:00
e24a2935d2
remove unneeded error message
2017-08-15 13:49:11 -04:00
591fdfe68c
fix
2017-08-15 13:44:23 -04:00
38111e80a5
use AVERROR_EOF instead of EOF
2017-08-15 13:17:51 -04:00
ae579c9649
potentially fix a crash when camera sends aac
2017-08-15 12:16:29 -04:00
adab628af9
fix video speed, various other
2017-08-14 18:22:52 -04:00
b255414bbb
Merge branch 'storageareas' into remove_ffmpeg_thread
2017-08-14 11:15:25 -04:00
0f0ab6170b
Don't decode video until we have received a keyframe.
2017-08-14 11:15:09 -04:00
49464d381a
Merge branch 'master' into storageareas
2017-08-14 10:44:40 -04:00
087b7abb94
Merge branch 'master' into fix_event_viewing
2017-08-14 10:41:04 -04:00
ecb7df0e8b
Support SSL for mysql connections ( #1965 )
...
* Fix install location for config files when building to alternate directory.
With the previous code, we ended up with a directory structure like the following:
$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf
* Omitted README file that should have appeared in /etc/zm/conf.d
* Fix location for configs when building to alternate directory.
* Fix works, but this should go on a branch instead.
* Fix works, but this should go on a branch instead.
* Fix location for configs when building to alternate directory.
With the previous code, we ended up with a directory structure like the following:
$ find /etc/zm/conf.d/
/etc/zm/conf.d/
/etc/zm/conf.d/01-system-paths.conf
/etc/zm/conf.d/conf.d
/etc/zm/conf.d/conf.d/README
/etc/zm/conf.d/conf.d/02-multiserver.conf
* Remove double quotes. This is a list of paths.
* Allow SSL database connection to be secured with SSL.
* Fix incorrect variable name
* Fix PHP syntax errors
* SSL connection parameters must also be passed in API.
* Revert fixes to build files; they should not be in this branch.
2017-08-14 10:30:42 -04:00
014951bf78
fix connect
2017-08-11 13:00:18 -04:00
83f8a240d5
blah
2017-08-11 12:20:46 -04:00
daee5b4450
experiment with no ffmpeg thread
2017-08-11 12:03:37 -04:00
536ccc0cec
maybe fix memleak, maybe fix crash
2017-08-10 15:44:20 -04:00
c5c68d064e
Merge pull request #1930 from connortechnology/split_zmeventstream
...
split EventStream into it's own files
2017-08-09 20:36:17 -05:00
cc28af8ed2
rework things to always start the recording on a video keyframe. Also fix pts/dts of remaining audio frames
2017-08-09 12:50:46 -04:00
b203e10c65
remove some newlines that shouldn't be there. Fix some logic when flushing audio encoder
2017-08-04 14:14:25 -04:00
00533fc624
potentially fix memleaks
2017-08-03 12:41:26 -04:00
5a73c38237
video storage fixes ( #1958 )
...
* use a monitor object instead of just a db array.
* fix braces, spacing, move pod docs to bottom
* Fix memleak by freeing input and output frames
* Always set the packet stream_index to the id of the output stream.
2017-08-02 16:29:23 -04:00
3467b29a0c
fix setting of packet stream index
2017-08-02 16:15:38 -04:00
4f032c8e65
rough in vaapi
2017-08-02 16:15:11 -04:00
259b7f7655
fix memleak
2017-07-31 15:49:27 -04:00
49319990fa
Don't keep setting the event_file unnecessarily. Add some code comments
2017-07-26 10:38:18 -04:00
9fa48954db
more work
2017-07-18 22:30:22 -04:00
e92974c5d4
fix spacing
2017-07-13 09:41:46 -04:00
24a8915699
Merge debug statements into 1
2017-07-11 08:30:44 -04:00
d3ec50aa69
various fixes plus use global db functions in logger
2017-07-06 17:45:23 -04:00
323aedde4e
fix merge
2017-07-06 12:41:15 -04:00
2a71b0f170
Merge branch 'storageareas' into work_on_zms
2017-07-06 12:39:44 -04:00
c3c6459052
Merge branch 'montagereview_rework' into storageareas
2017-07-05 15:34:02 -04:00
95ba837bda
fix braces
2017-07-05 14:25:23 -04:00
0e40897e02
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-07-05 14:24:09 -04:00
8569c7523a
fix braces
2017-07-05 14:11:58 -04:00
2bc679e65e
if a 0 scale is given, default to 100%
2017-07-05 14:11:17 -04:00
834d1dddfa
fix braces
2017-07-05 14:10:09 -04:00
1849b1e69b
fix code spacing, add codecpar dumping when failed to write frame
2017-07-05 13:09:00 -04:00
fdd0e8dc1b
fix spacing
2017-07-05 13:08:31 -04:00
efba7be9c7
switch back to int i... google style guide says to use signed counters in for loops. Ok. Get's rid of compiler warning because i_nales is signed.
2017-07-05 13:08:16 -04:00
121aba0308
add parenthesis around truth value to quieten compiler
2017-06-29 15:41:21 -04:00
90696331a9
Merge branch 'master' into storageareas
2017-06-26 21:58:11 -04:00
62d6394923
finish roughing in ffmpeg_input
2017-06-26 16:55:49 -04:00
24dd3a8c66
fix loading starttime of event
2017-06-26 11:20:10 -04:00
0d8e4656dc
fix braces
2017-06-26 09:46:07 -04:00
52f1e2d235
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-23 10:11:52 -04:00
b73c0ba978
rough in zm_ffmpeg_input and split out eventstream
2017-06-22 17:58:32 -04:00
fcc852c859
fix cpplint.py complaints
2017-06-22 16:06:31 -04:00
4df354dc24
fix order of send_frame and break and fix if ( usleep ) which should be if ( delta_us )
2017-06-22 10:48:15 -04:00
c241b6dddd
Merge branch 'split_zmeventstream' into storageareas
2017-06-22 10:46:32 -04:00
950c8f19d3
Upstream FreeBSD patches ( #1926 )
...
* apply FreeBSD patches
* timeval struct needs time.h
* typo
* added forgotten destination for systemd startup script install
2017-06-22 10:14:24 -04:00
394001604d
add the new files for EventStream
2017-06-22 10:12:04 -04:00
226514e887
split EventStream into it's own files
2017-06-22 10:10:28 -04:00
a29ad958c9
Merge branch 'master' into storageareas
2017-06-22 10:00:28 -04:00
1bba664e3d
whitspace
2017-06-22 09:55:45 -04:00
76f63686cb
Merge branch 'fix_event_viewing' into storageareas
2017-06-22 09:24:31 -04:00
5e75588bfb
Fix event viewing. Output a frame immediately on zoom in/out. Fix recursive loop on play/pause
2017-06-21 17:14:02 -04:00
91a070b835
Merge branch 'master' into storageareas
2017-06-15 13:13:08 -04:00
8527e5f1de
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-15 13:03:09 -04:00
119f8fc86c
Fix version checks to fix build on yaketty
2017-06-15 13:02:54 -04:00
b886a2daa2
Merge branch 'master' into storageareas
2017-06-14 11:25:02 -04:00
3dc9594461
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-14 11:24:54 -04:00
07a2d49a41
Merge branch 'log_no_truncate'
2017-06-14 11:23:39 -04:00
a4b3f6b41a
fix form of delete used
2017-06-14 10:54:21 -04:00
b51d885f66
fix build on old ffmpeg
2017-06-14 10:36:08 -04:00
9f301e3c51
Merge branch 'log_no_truncate' into storageareas
2017-06-14 10:18:27 -04:00
1361b8952f
change mode of opening log files to append instead of overwrite
2017-06-14 10:15:08 -04:00
f0d80ddfd4
fix runstate merge
2017-06-13 21:18:09 -04:00
7a67a5e475
fix merge
2017-06-13 21:15:58 -04:00
085d239a6e
Merge branch 'master' into storageareas
2017-06-13 18:02:28 -04:00
dd70eb3e5f
more deprecation fixes
2017-06-13 17:06:50 -04:00
42100d9a33
introduce current_event in videostore_data so we know which event we are writing a video file for. Also, GetLastEventId so that non-friends can find out the event id of the current event.
2017-06-13 17:05:37 -04:00
3c053b36ef
introduce zm_dump_codecpar and zm_dump_codec to be used for debugging
2017-06-13 16:51:51 -04:00
417421b1d8
move include <sys/uio.h> outside defined(BSD) block ( #1919 )
2017-06-13 15:39:12 -04:00
bf04a68085
Merge pull request #1752 from connortechnology/filter_by_runstate
...
rough in the ability to filter on RunState
2017-06-12 20:54:17 -05:00
bacf65ae9a
Migrate values from Options -> Paths to zm.conf ( #1908 )
...
* initial commit to migrate contents of Options->Paths to zm.conf
* remove paths items from configdata.pm
* remove paths tab from options
* update deb packaging scripts with new cmake vars
* remove extraneous file
* save custom paths variables to config file before dB is freshened
* don't check configs if the dB version is >= 1.31.0
2017-06-12 21:39:37 -04:00
809d20dcd0
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-06-09 14:25:11 -04:00
05d0e0ed71
Merge branch 'master' into storageareas
2017-06-09 14:20:49 -04:00
781d49dfb1
fix merge
2017-06-09 14:19:31 -04:00
3bfac9faff
Merge branch 'master' into storageareas
2017-06-09 13:00:24 -04:00
162cc05a33
when debug is turned on, fflush after every line. Debug logging is almost useless when debugging a crash without this.
2017-06-09 11:05:44 -04:00
f8cb0a5e21
Merge branch 'master' into add_was_alarmed
2017-06-09 10:46:01 -04:00
9669fede18
fix merge by putting back my dbRow object
2017-06-09 10:18:15 -04:00
371b86300a
Merge branch 'master' into storageareas
2017-06-08 14:23:40 -04:00
d7b291f933
add more debug
2017-06-08 13:44:22 -04:00
02b2d8a968
put in ffmpeg version test
2017-06-08 12:22:28 -04:00
01717a5c14
Merge branch 'master' into filter_by_runstate
2017-06-06 20:34:47 -04:00
070f0d5d62
don't init converted_input_samples
2017-06-06 15:57:42 -04:00
1ab5e0e374
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-06 15:36:10 -04:00
7d97267dd2
fix compile on old ffmpeg
2017-06-06 15:35:17 -04:00
2bc6f1627e
Add support for conf.d subfolder ( #1902 )
...
* cmake changes to support conf.d
* php changes to support conf.d
* perl changes to support conf.d
* C changes to support conf.d
* add conf.d support to rpmspecfile
* fix typo
* specify ZM_CONFIG_SUBDIR in relevant target distros
* put back my config_file perl definition
* remove quotes from ZM macros
* fix snprintf
* add README to conf.d folder
* adjust rpm specfile
* remove custom permissions from README in rpmspecfile
* modify rpm README documentation to reflect conf.d support
* set ZM_CONFIG_SUBDIR in debian rules file
2017-06-05 16:39:19 -04:00
b9f65c9f50
remove merge marker
2017-06-05 09:26:05 -04:00
9534c725d6
Merge branch 'master' into storageareas
2017-06-05 09:21:37 -04:00
457a3273b1
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-05 09:05:28 -04:00
187bec40ec
Fix #1906
2017-06-05 09:05:17 -04:00
451714a403
Merge branch 'master' into storageareas
2017-06-04 21:42:56 -04:00
7ae0b4a546
handle older versions of ffmpeg
2017-06-03 10:13:39 -04:00
eeefb2c8e2
need previous_pts and dts for both video and audio. I don't think they can share
2017-06-02 16:53:14 -04:00
0ac26277e3
debug, fix deprecations, fix audio
2017-06-02 16:52:52 -04:00
915450de13
spacing and comments
2017-06-01 17:48:52 -04:00
Isaac Connor
Isaac Connor
rpdrewes
Isaac Connor
Steve Gilvarry
Andrew Bauer
Pliable Pixels
Pliable Pixels
vajonam
Isaac Connor
Andy Bauer
Isaac
Isaac Connor
APHW2 MFGENG
Isaac Connor
Isaac Connor
ralimi
abishai