751c312609
fix non-ascii char
2018-12-29 09:56:33 -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
28dafd5931
Merge branch 'storageareas' into zma_to_thread
2018-12-26 12:02:00 -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
bc5f8d0d8d
rework pts/dts of audio stream. Spacing. Fix crash
2018-12-04 18:23:08 -05:00
4272225a17
Merge branch 'master' into h265
2018-11-30 16:42:16 -05:00
251ccc0ba9
remove extra ()
2018-11-26 16:20:52 -05:00
b16cd7ec84
Merge branch 'h265' into zma_to_thread
2018-11-20 12:38:17 -05:00
b291c06035
Working zms h265 playing.
2018-11-19 16:45:56 -05:00
e24a308481
Merge branch 'master' into h265
2018-11-14 17:15:37 -05:00
a95a012fa5
fix #2302
2018-11-12 11:56:18 -05:00
a8329465fb
Merge branch 'master' into h265
2018-10-22 10:30:01 -04:00
5ab1126260
Merge branch 'storageareas' into zma_to_thread
2018-10-20 17:31:14 -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
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
b3ef347fd5
slight optimisations in frame skipping
2018-09-11 13:22:01 -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
fe1e17d097
Capture can reasonably return -1 for EOF.
2018-09-05 11:16:17 -04:00
672b4affe1
Merge branch 'storageareas' into zma_to_thread
2018-08-31 19:05:22 -04:00
53eae61883
Mostly spacing, but simplified logic removing assumption that local cameras give keyframes. They might not in future.
2018-08-17 16:05:02 -04:00
4297d39df6
spacing, code style, remove useless debug logging
2018-08-11 18:49:48 -04:00
979b31ffc3
Merge branch 'storageareas' into zma_to_thread
2018-08-11 10:08:30 -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
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
ea86cb1181
Add debugging line to try to figure out starttime in the future problem
2018-06-15 10:16:28 -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
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
4454ca0072
Merge branch 'storageareas' into zma_to_thread
2018-05-20 10:39:14 -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
da8a232f01
Merge branch 'storageareas' into zma_to_thread
2018-05-12 19:45:48 -04:00
d9fff848e7
change Groups to a vector, add GroupNames function
2018-05-12 14:37:26 -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
94377a4652
Merge branch 'storageareas' into zma_to_thread
2018-05-05 12:57:50 -04:00
f6139d33ed
Merge branch 'storageareas' into zma_to_thread
2018-05-05 12:25:11 -04:00
1cd7b73114
turn off closing event in a separate thread, add Groups
2018-05-02 12:20:01 -07:00
d46c06d201
remove extra event=NULL and spaces
2018-05-01 12:19:46 -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
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
cc525b2397
Output more detailed shared mem size info
2018-04-24 11:41:54 -04:00
5f7d404a0c
spacing & style. Put locking around db accesses in RealoadLinkedMonitors
2018-04-23 16:24:15 -04: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
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
73239a0dba
If no progress in analysis, bail
2018-04-14 17:03:45 -04:00
c7deb91319
Merge branch 'zma_to_thread' of github.com:ConnorTechnology/ZoneMinder into zma_to_thread
2018-04-14 14:58:25 -04:00
cd3046abb3
Merge branch 'storageareas' into zma_to_thread
2018-04-14 11:03:08 -04:00
f9f78e9aa3
Convert event_id to a 64bit unsigned int
2018-04-12 13:40:11 -07: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
64cfb39043
do an initial fps report early on
2018-04-06 23:21:22 +02:00
ec5f955d26
more db locking
2018-04-05 11:30:14 -04:00
dfc35721f9
ensure that sections are always > section_length
2018-04-03 07:03:12 -07:00
a5b77a59d3
allow 0 pre_event_count
2018-03-29 12:35:03 -04:00
b22911f554
wait to closeEvent on monitor shutdown
2018-03-28 14:03:56 -04:00
b8a792cfb7
whitespace google code style
2018-03-27 11:04:40 -04:00
bcc7011871
update sql loading code in Reload, which will automatically do the db locking
2018-03-27 10:04:19 -04:00
11cf3ce482
whitespace
2018-03-22 11:33:24 -04:00
e8e310b156
Merge branch 'storageareas' into zma_to_thread
2018-03-15 11:45:32 -04:00
ea38f7cca4
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-03-15 11:43:15 -04:00
e523067df7
Merge branch 'storageareas' into zma_to_thread
2018-03-15 11:28:14 -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
5ca7871510
Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread
2018-03-10 10:12:22 -05:00
2291816f4e
fix memleak
2018-03-10 10:12:12 -05:00
a419906361
Merge branch 'storageareas' into zma_to_thread
2018-03-09 09:03:19 -05:00
7fb1c8921b
reorder functions to put them in a better order
2018-03-09 07:50:47 -05:00
dcf7c4fdde
rework loading Monitor using consistent db query
2018-03-09 07:23:40 -05:00
80127cbf81
Merge branch 'storageareas' into zma_to_thread
2018-03-06 10:57:49 -05:00
03d3f5e665
Merge branch 'storageareas' into zma_to_thread
2018-03-03 13:28:01 -08:00
91c9714e43
cleanup
2018-03-02 18:26:21 -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
c443168389
split out codec and encoder, allowing one to specify which encoder to use
2018-02-28 07:17:16 -08:00
f00983b450
Don't setup snap and timestamp if it's an audio packet
2018-02-27 20:19:39 -05:00
3586825c90
fix preevent_count==0 causing div/0
2018-02-26 17:08:05 -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
ee1eef50cb
Merge branch 'zma_to_thread' of github.com:ConnorTechnology/ZoneMinder into zma_to_thread
2018-02-18 11:00:55 -05:00
d514e95606
Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread
2018-02-17 12:26:08 -05:00
ec7f2e48d0
add back AnalysisFPS reporting and move the gettimeofday in after it is actually needed
2018-02-17 10:54:53 -05:00
84b7e85259
Add a mutex around mysql operations
2018-02-15 15:54:13 -05:00
9fd2b6be52
fix fps reporting
2018-02-15 14:07:55 -05:00
b5e0745ac7
Merge branch 'storageareas' into zma_to_thread
2018-02-14 13:56:03 -05:00
657fda818b
code docs
2018-02-13 05:26:30 -05:00
cd606dbab8
whitespace
2018-02-07 08:03:01 -05:00
d8e4b0abfb
Merge branch 'storageareas' into zma_to_thread
...
Conflicts:
scripts/zmwatch.pl.in
src/zm_ffmpeg_camera.cpp
src/zm_monitor.cpp
src/zmc.cpp
2018-02-06 10:34:17 -05:00
a4c956da7d
Only update db entry when value changes
2018-02-05 22:59:22 -05:00
e25af4b40c
cleanup, reset result
2018-02-02 16:07:13 -05:00
4b7ddd81bf
Merge branch 'storageareas' into zma_to_thread
2018-02-02 14:24:02 -05:00
868e17a414
Allow Method in Monitors to be NULL
2018-02-02 10:31:55 -05:00
67b365948e
Merge branch 'storageareas' into zma_to_thread
...
Conflicts:
src/zm_ffmpeg_camera.cpp
src/zm_monitor.cpp
web/includes/Monitor.php
web/skins/classic/views/js/add_monitors.js
web/skins/classic/views/js/console.js
2018-01-29 15:53:26 -05:00
cfb0461fcf
Rename column Id to MonitorId in MonitorStatus
2018-01-29 09:31:43 -05:00
057509637a
TUrn a warning into a debug
2018-01-28 15:16:06 -05:00
6a42dab4e8
Fix
2018-01-24 12:18:39 -05:00
71263c525b
:Merge branch 'storageareas' into zma_to_thread
...
Conflicts:
src/zm_ffmpeg_camera.cpp
src/zm_monitor.cpp
2018-01-24 11:55:32 -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
e37d27e972
Merge branch 'storageareas' into zma_to_thread
...
Conflicts:
src/zm_monitor.cpp
2018-01-18 13:44:26 -05:00
59a1272307
bump version
2018-01-18 11:39:33 -05:00
a2211bf438
Merge branch 'storageareas' into zma_to_thread
...
Conflicts:
src/zm_event.cpp
src/zm_monitor.cpp
2018-01-16 13:36:57 -05:00
26cea49f1a
handle nulls in event_prefix and label_format in Monitor::Reload
2018-01-16 11:08:35 -05:00
2c121fb784
If we get a term signal while waiting for zmc, die.
2018-01-12 07:12:54 -08:00
0ea6fd9807
Merge branch 'storageareas' into zma_to_thread
2017-12-19 14:06:58 -05:00
e16852ee8e
fix compile, impose minimum 10 second event length
2017-12-18 13:39:08 -05:00
14eedf4927
rework state machine
2017-12-16 17:07:53 -05:00
49214a8902
Merge branch 'zma_to_thread' of github.com:/ConnorTechnology/ZoneMinder into zma_to_thread
2017-12-15 10:47:53 -05:00
ebcd63f280
fixes to compile using avconv
2017-12-15 10:47:44 -05:00
212cd7e6c4
tidy ups
2017-12-15 10:46:43 -05:00
bcdadc67bf
Merge branch 'storageareas' into zma_to_thread
2017-12-12 15:29:19 -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
fe74c41723
fix integer division instead of double
2017-12-12 12:56:19 -05:00
db915b2c56
Don't do an unneccesary assignemnt
2017-12-12 12:52:30 -05:00
f8738f2387
quiet coverity
2017-12-12 12:37:49 -05:00
dd384e9e6d
reduce wait time when waiting for first frame
2017-12-08 21:29:05 -05:00
af37eeeeed
fix int64 = int*int multiply
2017-12-08 15:17:45 -05:00
aff08358f4
more debug
2017-12-08 13:46:02 -05:00
0cfc42b9fd
some cleanups/fixes
2017-12-05 13:16:52 -08:00
4d73ce4109
rework locking to have a per-packet mutex
2017-12-03 11:09:01 -05:00
0ef9d13dbd
Merge branch 'zma_to_thread' of github.com:/ConnorTechnology/ZoneMinder into zma_to_thread
2017-12-01 18:50:46 -05:00
3ca9b36877
fixes to compile on old ffmpeg
2017-12-01 18:50:28 -05:00
4a9c31a15d
wip
2017-12-01 15:42:19 -08:00
b87e459125
still corrupting memory
2017-12-01 14:48:30 -05:00
2e3fda488e
more debug
2017-12-01 14:33:51 -05:00
0865201e1e
seems to work
2017-12-01 07:26:34 -05:00
967368ce07
testing
2017-11-30 22:18:33 -05:00
556c4d8851
debug
2017-11-30 16:10:30 -05:00
f2efc80f22
works?
2017-11-30 14:37:36 -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
6e4abf83d0
wip
2017-11-28 08:29:03 -05:00
81fa201910
init last_signal
2017-11-27 15:43:06 -05:00
d1886b5536
wip
2017-11-27 14:57:24 -05:00
99968dfa2a
Merge branch 'storageareas' into zma_to_thread
2017-11-27 11:28:36 -05:00
4b92a788f7
fix filter execute
2017-11-24 15:37:50 -05:00
8e494ef431
Merge branch 'storageareas' into zma_to_thread
2017-11-23 08:40:49 -05:00
ebe3073c59
only update fps if we have an image capture
2017-11-21 23:57:01 -05:00
24a0d717c5
wip
2017-11-21 19:55:40 -05:00
7ed495c948
wip
2017-11-21 11:58:15 -05:00
43b71fc49b
rework
2017-11-20 15:32:40 -05:00
74650ebc70
simplify Analysis
2017-11-20 11:48:56 -05:00
882563c06e
rename frame to out_frame. Fix problem where we weren't copying from in_frame to out_frame
2017-11-17 18:19:37 -05:00
cd596d49e3
fix local camera inputstream
2017-11-17 16:49:01 -05:00
6702b10dee
remove redundant code and memory leaks
2017-11-17 15:37:26 -05:00
ef5e296144
some fixes
2017-11-17 14:30:38 -05:00
3129afa5d6
fixup decoding when recording from a non-ffmpeg suorce
2017-11-14 13:16:07 -08:00
ecc68da0fd
Merge branch 'zma_to_thread' into put_ffmpeg_into_event_wip
2017-11-14 02:39:58 -05:00
56bb2205d8
add mjpeg support
2017-11-14 01:59:15 -05:00
043e44d273
fix, must clear the frame
2017-11-13 14:24:28 -08:00
ed72017684
add a mutex
2017-11-13 14:35:47 -05:00
aee2b148f0
wip
2017-11-13 12:14:57 -05:00
0e799233d2
move up timestamping to before videowriting
2017-11-13 10:57:37 -05:00
e325f5435c
too much refactoring
2017-11-13 10:17:46 -05:00
ef0f01d498
more debug, try to get pts/dts right
2017-11-12 13:16:40 -05:00
50d3b168fa
wip
2017-11-12 11:50:07 -05:00
0e7f475ce8
merge work from zma_to_thread, but not the zma_to_thread part
2017-11-12 11:42:34 -05:00
626af8d2fb
wip
2017-11-10 10:10:51 -08:00
d15d36f389
rework, compiles, won't open h264
2017-11-09 11:50:20 -08:00
5efaed0ef4
Merge branch 'storageareas' into ffmpeg_output
2017-11-08 17:22:07 -05:00
4e080b8a36
Merge branch 'storageareas' into ffmpeg_output
...
Conflicts:
scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
scripts/ZoneMinder/lib/ZoneMinder/Object.pm
2017-11-07 18:25:33 -08:00
a9419064ef
don't calc fps if no time has passed
2017-11-07 09:35:13 -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
ef0379dd18
wip
2017-10-27 20:36:49 -07:00
0265a48a30
fix seg fault, fix pkt pts dts/duration. Stil wrong framerate
2017-10-26 10:12:56 -07:00
0fbb473dd4
refactoring
2017-10-25 13:06:15 -07:00
cfaf10335b
add Monitor status, capturrFPS and AnalysisFPS to processes
2017-10-24 16:08:31 -07:00
b58c9d87c3
wip
2017-10-23 09:51:41 -04:00
fece06c9e3
google code style
2017-10-19 17:12:36 -04:00
965e1e8bc1
improve readability of debug statement
2017-10-18 10:22:53 -07:00
463503b763
mostly comments, deal with negative timestamps
2017-10-09 14:58:07 -04:00
94ab00aebd
continue cleanup of Monitor instantiation
2017-10-07 11:30:41 -04:00
224ca30c86
Merge branch 'storageareas' into zma_to_thread
2017-10-06 17:10:28 -04:00
df1fa97e0c
handle nulls in StorageId and device
2017-10-06 16:17:37 -04:00
354262c557
wip nvsocket
2017-10-03 13:28:56 -07:00
b30e8953dd
starting to rough in adding a frame to zmpacket
2017-09-04 16:36:34 -04:00
c70706e253
Merge branch 'storageareas' into zma_to_thread
2017-09-04 14:38:00 -04:00
5c13ae26e3
Merge branch 'storageareas' into work_on_zms
2017-08-23 10:43:19 -04:00
676c4b7ddc
Merge branch 'master' into storageareas
2017-08-22 09:52:14 -04:00
ac5d1738ea
allow changing of the timestamp char code delimeter ( #1972 )
2017-08-21 11:27:11 -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
49319990fa
Don't keep setting the event_file unnecessarily. Add some code comments
2017-07-26 10:38:18 -04:00
da74f8d533
initial turn zma into a thread
2017-07-10 19:37:55 -04:00
b73c0ba978
rough in zm_ffmpeg_input and split out eventstream
2017-06-22 17:58:32 -04:00
085d239a6e
Merge branch 'master' into storageareas
2017-06-13 18:02:28 -04: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
a515041e14
Merge branch 'master' into storageareas
2017-05-23 15:17:46 -04:00
457d7e5c94
code documentation, whitespace
2017-05-20 09:03:51 -04:00
7caeee6bf8
Merge branch 'master' into storageareas
2017-05-19 15:09:44 -04:00
afb450573d
fix
2017-05-19 15:08:04 -04:00
e7ca892efd
merge more differences from SA
2017-05-19 15:07:41 -04:00
61204a8b83
Merge branch 'master' into storageareas
2017-05-19 14:11:29 -04:00
41cf0a2458
add back analysis fps
2017-05-19 14:05:24 -04:00
8568c95fbe
handel NULLS in db fields
2017-05-19 14:03:28 -04:00
f4224bb88e
Merge branch 'master' into storageareas
2017-05-17 17:47:39 -04:00
eef5e5cd90
Merge branch 'feature-h264-videostorage'
2017-05-16 13:37:24 -04:00
b1f8485969
Fix videostorage ( #1885 )
...
* merge relevant c bits to make h264 recording work
* h264 code requires libavresample and boost
* Need libavresample
2017-05-16 12:04:56 -04:00
c859f7291c
Feature h264 videostorage ( #1882 )
...
* Moved writing of configure options from Controller to Model. Fixes #191 .
* Initial commit for saving events as videos :)
* Add zm_video.cpp to autotools
* Add zm_video.h to autotools
* Search for MP4V2 header file 3 times: mp4v2/mp4v2.h, mp4v2.h, mp4.h
* Fix serve memory leak
* Few minor code improvements
* Added the ability to override preset, tune, profile and few other improvements
* Correctly write SPS & PPS from x264 encoder headers
* Remove unnessecary SPS & PPS writing code
* Imported missing files from master to feature-h264-videostorage
* Audio support including fixes for dts/pts, split on keyframe and update to mkv extension to prevent ffmpeg problems writing rtsp audio to mp4 containter (header problem)
* Updates to make gcc happy
* Add html5 video control to timeline and event to support mkv playback
* Add zm_videostore.cpp to CMakeLists.txt
* Remove Modern Branch for now
* Fix minor bug
* Option handled added in master, removing duplicate declaration
* Add CaptureandRecord from zm_camera.h
* Putting placeholder in for CaptureAndRecord function
* Removed duplicate code and brackets
* add digest auth file for cmake
Conflicts:
src/CMakeLists.txt
* Add web dir back into Makefile.am
Revert "Removed web from SUBDIRS in Makefile.am"
This reverts commit d9bbcdf3a9
2017-05-15 22:02:48 -04:00
d3115219d2
Merge branch 'master' into feature-h264-videostorage
2017-05-15 21:52:58 -04:00
fd44ff4e60
Merge branch 'master' into storageareas
2017-05-10 13:16:08 -04:00
c4f471d967
Merge branch 'master' of https://github.com/abishai/ZoneMinder into abishai-master
2017-05-10 08:06:48 -05:00
71e6735b60
Neon32 functions now work on 64 bytes at a time. This results in 4-6x performance increase over standard functions
...
Memory allocations and image size requirements changed to be as needed for 64 byte alignment.
Self-test code for Blend modified accordingly and added Self-test for the delta functions.
2017-04-16 10:57:37 +03:00
7e920eb5d3
add a non-const version of StartTime() which we need in order to assign to video_data->recording
2017-04-12 13:36:39 -04:00
eb390c323e
Merge branch 'storageareas' into ffmpeg_321
2017-04-11 11:14:23 -04:00
766925d9a7
Split MonitorStream into it's own files.
2017-04-10 21:51:18 -04:00
6a9819e16b
whitespace, comments
2017-04-05 16:10:21 -04:00
e70c7fa1ef
whitespace and comments
2017-03-31 23:34:58 -04:00
9c495b07dd
code style, whitespace, comments
2017-03-31 11:12:42 -04:00
f19b3d5505
create zm_packet
2017-02-18 15:22:56 -05:00
74dd8ab027
make clang happy take two
2017-02-06 09:57:22 +03:00
8d5a8f5512
make clang happy
2017-02-03 14:53:53 +03:00
f73bf0aee0
add a cast to fix compilation with clang
2017-02-02 12:43:13 -05:00
61827fec0c
remove redundant mkdir eventdir.
2017-01-18 09:31:08 -05:00
dccd1e9732
fix
2017-01-05 13:54:34 -05:00
71ad08613e
fix
2017-01-05 11:30:01 -05:00
d1ed472db0
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-01-05 10:09:11 -05:00
d5ad757116
Merge branch 'master' into feature-h264-videostorage
2017-01-02 10:00:02 -05:00
5ae34a7561
Merge branch 'master' into storageareas
2017-01-02 09:39:10 -05:00
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06:00
f6c377c2b4
Merge branch 'master' into feature-h264-videostorage
2016-12-15 16:47:32 -05:00
d97c1f1cff
Merge branch 'fix_braces' into storageareas
2016-12-08 14:58:38 -05:00
7f2bf04c2f
Merge branch 'cookie_http_only' into storageareas
2016-12-08 14:26:13 -05:00
c27a18a758
fix braces in zm_monitor.cpp
2016-12-08 11:49:54 -05:00
1a25b957ad
check for and create events dir for monitor on Object instantiation
2016-11-27 20:10:12 -05:00
873bb9902b
recalculating zmswap at this point is unnesessary
2016-11-19 08:53:17 -06:00
3afa8937d8
calculate string lengths and array ndx's properly
2016-11-19 08:52:22 -06:00
2bd080a6a6
Merge branch 'master' into storageareas
2016-11-15 08:41:00 -05:00
d3a7fca079
only unlink if zmc is being destroyed
2016-11-14 19:01:00 -06:00
6c7d71361a
unlink the mmap file when the monitor object is destroyed
2016-11-13 16:40:54 -06:00
420d141bc7
split the reading of max fps and alarm max fps to remove an extra atof and make them more understandable
2016-10-18 09:50:01 -04:00
9656a7c3e8
Store Oriention on event creation
2016-10-12 09:12:09 -04:00
39e06b929f
add braces and only call closeEvent if there is an event
2016-09-13 09:36:45 -04:00
fc060135fe
Move our recording flag deeper into closeevent
2016-09-13 22:58:38 +10:00
6ac1a70b9c
Merge my Rotation/Orientation work and fixes for bad h264 streams
2016-08-10 12:22:04 -04:00
85dd5ea00c
do the videostore test in the constructor
2016-09-26 20:08:09 -04:00
bd22d72e18
cleanups, code style, free resample_context
2016-09-26 11:01:47 -04:00
bd076fed69
Merge branch 'storageareas' into packetqueue
2016-09-16 09:56:41 -04:00
85b2ba73ab
change the behaviour of StorageID. Now it will NOT NULL default 0 and a value of 0 means use ZM_EVENTS_PATH
2016-09-14 09:31:57 -04:00
88d86afd85
Merge ../ZoneMinder.master into storageareas
2016-09-13 10:02:53 -04:00
2bc5742aec
Merge branch 'feature-h264-videostorage' into storageareas
2016-09-13 09:53:39 -04:00
d0fb2acfaa
rename videowriterprefs to videowriter. Use an enum to for videowriter values to make code easier to read. Add some comments
2016-09-12 21:35:14 -04:00
3a06ba7a65
Turn off instantiating a default zone before even loading the zones. Implement the use of Camera->setMonitor so that the camera object doesn't have to load it later.
2016-09-09 09:15:04 -04:00
824d7c5b43
Merge ../ZoneMinder.Steve into packetqueue
2016-08-31 11:58:22 -04:00
55c6e5a6db
cleanup putting packetqueue in the monitor. It should be in the camera
2016-08-31 11:47:42 -04:00
d1bcb14629
Right direction
2016-09-01 00:00:10 +10:00
44df4a830d
Merge branch 'feature-h264-videostorage' into monitor_packetqueue
2016-08-11 20:44:48 +10:00
14d8496972
add NULL test for RTSPDesribe
2016-07-14 10:27:24 -04:00
6644db3bea
check for null on various Monitor fields
2016-06-24 10:29:50 -04:00
081c0add72
fix
2016-06-23 11:25:50 -04:00
ccea620531
check for null before instantiating strings
2016-06-23 11:13:26 -04:00
c6761dd094
fix merge
2016-06-21 14:02:36 -04:00
e29a0ebe71
Merge branch 'feature-h264-videostorage' into storageareas
2016-06-21 13:48:32 -04:00
6a8db582ff
whitespacing updates
2016-06-21 12:21:18 -04:00
fad1d95011
fix NULL in linkedMonitors column
2016-06-09 13:06:57 -04:00
d9f2911f0d
handle null values in Monitors columns
2016-06-09 12:51:22 -04:00
0abfb7378a
Buffer work
2016-05-18 00:01:33 +10:00
943a4cef73
Merge branch 'storageareas' into rotate_video
2016-05-13 15:00:50 -04:00
71e9553648
add rotation to video
2016-05-13 14:51:26 -04:00
18461b0c64
Add some debugging
2016-05-06 12:39:10 -04:00
88a0bdc026
Add some code comments. Make mocord always honour section_length
2016-05-05 14:51:26 -04:00
da157f5a1a
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-04-30 22:27:10 +10:00
5eebc50bfb
tabs to spaces
2016-04-29 08:57:31 -04:00
097e7f3906
Merge branch 'master' into storageareas
2016-04-28 16:40:44 -04:00
30b3fa8a8b
add a cast to help the compile figure out which function to use
2016-04-28 12:57:38 -04:00
fac07cba6d
Merge branch 'master' into tabs_to_spaces
2016-04-28 09:31:40 -04:00
629f141734
Merge pull request #1441 from SteveGilvarry/remove_commented_code
...
Delete large commented out code segment
2016-04-28 09:30:43 -04:00
24e3306955
master master
2016-04-28 09:20:56 -04:00
2d8c484792
rotate dimensions when instantiating the Monitor object
2016-04-25 16:48:26 -04:00
8c53925fdc
redo rotation fix. cameras have to be given the width and height that the camera will be sending. The monitor will report rotated dimensions.
2016-04-25 16:00:34 -04:00
851e8f46ff
redo fix_rotate
2016-04-25 15:57:39 -04:00
26a45d5fa9
Don't rotate dimensions when constructing the monitor because they are already rotated
2016-04-25 13:55:28 -04:00
4ca61b7bd8
Removed 180 lines of commented out code that has been hanging around
...
in here for a long time.
2016-04-25 22:12:49 +10:00
44f32f46b7
deprecate zmdbFetchOne in favor of zmDbRow
2016-04-20 11:56:58 -04:00
30066f788d
Merge branch 'feature-h264-videostorage' into storageareas
2016-04-14 12:35:21 -04:00
c189e60d9b
add some comments, and dump filename and AVFormatContext on failure to write header
2016-04-14 12:34:52 -04:00
dc7f2ff353
fix merge problems
2016-04-06 11:44:57 -04:00
765f79a87f
Merge branch 'icon_video' into storageareas
2016-04-06 11:16:38 -04:00
4bc200f839
fix merge
2016-04-06 08:38:10 -04:00
9a795432cf
merge all the commits from the messed up iconnor_video branch
2016-04-05 17:14:46 -04:00
60642c1fff
Merge branch 'iconnor_video' into storageareas
2016-04-05 12:32:33 -04:00
03b1ced568
tabs to spaces and use 2space indenting
2016-04-04 10:11:48 -04:00
82b32578ec
Merge branch 'master' into iconnor_video
2016-04-01 12:54:09 -04:00
abcf48b65c
Merge branch 'master' into feature-h264-videostorage
2016-04-01 08:53:45 -04:00
56d95bb949
Merge branch 'iconnor_video' into storageareas
2016-03-31 14:02:56 -04:00
c26dbb9028
rough in record_audio, and do lots of whitespace cleanups
2016-03-31 12:54:56 -04:00
c9a1a9020d
Merge h264
2016-03-31 11:03:36 -04:00
e5a36c02bd
Merge remote-tracking branch 'origin/master' into video_remote
2016-03-30 16:55:24 -04:00
ea49dc20d1
Merge branch 'master' into storageareas
2016-03-30 10:58:07 -04:00
204a128ecc
fix use of connected when it should be mem_ptr
2016-03-29 15:46:47 -04:00
1262e831ac
rework zmu to load data from the last event with frames when it can't connect to zmc
2016-03-29 14:36:16 -04:00
0c32ae61ef
Merge branch 'master' into fix_coverity_issues
2016-03-24 09:42:01 -04:00
3ce620eb89
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-02-27 19:46:56 +11:00
68babd783b
Merge branch 'master' into storageareas
2016-02-17 09:46:56 -05:00
6332f28c53
zm_monitor: fix overlap in memcpy buffers
...
behavior undefined by POSIX and causes a crash with FORTIFY_SOURCE
2016-02-16 11:47:49 +02:00
89cff287cd
Merge branch 'master' into storageareas
2016-02-04 12:14:16 -05:00
7301e803ed
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2016-01-30 15:45:08 +11:00
38bca6b95d
added CMD_QUIT to kill zms via command
2016-01-29 09:58:57 -05:00
f275498790
Add Debug for sql used to load other than local monitors
2016-01-26 21:00:32 -05:00
902065a6c1
Add Debug for sql used to load local monitors
2016-01-26 20:59:07 -05:00
98b6ef36d4
Merge branch 'multi-server' into newpointone
...
Conflicts:
src/zm_monitor.cpp
2015-12-28 13:13:15 -05:00
f357ea6ccd
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
2015-12-28 11:53:04 -05:00
ccded54937
put back missing col++
2015-12-28 11:52:40 -05:00
3f1c782ff7
Fix random extra semicolon
2015-12-28 16:29:04 +11:00
eccfced6d4
Merge branch 'multi-server' into newpointone
...
Conflicts:
distros/ubuntu1204/apache.conf
2015-12-22 09:54:13 -05:00
e76cc59bad
revert whitespace changes
2015-12-21 13:42:44 -05:00
36f83aa412
revert whitespace changes
2015-12-21 13:35:17 -05:00
609ab79f81
revert whitespace changes
2015-12-21 13:32:57 -05:00
1fee421500
revert whitespace changes
2015-12-21 13:29:41 -05:00
c0a79567e6
revert whitespace changes
2015-12-21 13:26:24 -05:00
fdf1912ec1
revert whitespace changes
2015-12-21 13:11:18 -05:00
af9fc1de90
revert white space changes.
2015-12-21 12:57:05 -05:00
0f4757b1ad
change method from getPath to Path
2015-12-15 12:10:01 -05:00
010d7b3d64
convert to using storage->getPath instaed of config.events_dir
2015-12-15 11:11:34 -05:00
14cde582cf
Merge branch 'multi-server' into multiserverplusstorage
...
Conflicts:
src/zm_monitor.h
2015-12-14 16:55:26 -05:00
b2b1afa8ad
Merge master
2015-12-14 15:49:32 -05:00
220ee5e516
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2015-11-29 13:17:22 +11:00
f7cc2fb44f
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
2015-11-23 10:42:14 -05:00
a9609d2a43
fix mem alloc fault in zm_monitor.cpp
2015-11-21 12:17:23 -06:00
17e65d12b4
fixed SaveJPEGs are not working
...
which is caused in errors introduced when merging with master
2015-10-31 21:27:23 -07:00
d8494aba2d
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
src/zm_remote_camera_rtsp.h
web/skins/classic/views/monitor.php
2015-10-23 22:07:22 +11:00
ac8bfc71dc
fix specifying ServerId
2015-10-02 18:22:48 +00:00
6ff4e333b4
Merge branch 'fix_warnings' into multi-server
...
Conflicts:
src/zm_monitor.cpp
2015-10-02 15:34:05 +00:00
7b253bcd7e
Debug line
2015-10-02 15:28:51 +00:00
8125ef0334
change types and move things around to remove compile warnings
2015-10-02 09:49:09 -04:00
4a978034ad
Merge pull request #1056 from ZoneMinder/fix_privacy_mask_segfaults
...
Fix sgfault caused by the privacy mask stuff
2015-09-16 10:46:45 -05:00
b8f2b1e0a0
Merge branch 'mmap_fd_gt_3' into multi-server
2015-09-16 11:01:06 -04:00
d991912ce4
Merge branch 'fix_privacy_mask_segfaults' into multi-server
2015-09-16 11:00:57 -04:00
e70d49b033
Merge branch 'fix_privacy_mask_segfaults' into mmap_fd_gt_3
2015-09-16 10:58:57 -04:00
6e12febf3d
initialize privacy_bitmask and check it before deletep[] to prevent segfault
2015-09-16 10:51:27 -04:00
0571ca3025
quick fix for #1055 : make sure our mmap fd is > 2
2015-09-16 09:11:22 -04:00
bb41ebf776
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
2015-08-31 16:03:40 -04:00
Isaac Connor
Isaac Connor
Isaac Connor
Isaac Connor
Andy Bauer
Isaac
Pliable Pixels
Isaac Connor
APHW2 MFGENG
Isaac Connor
Andrew Bauer
Isaac Connor
Andrew Bauer
Kfir Itzhak
abishai
Isaac Connor
Steve Gilvarry
Isaac Connor
Kaarle Ritvanen
arjunrc
SteveGilvarry
Heng Liu