ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,922 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

2593 Commits

Author SHA1 Message Date
Isaac Connor 47ec0abf11 spacing 2018-03-02 18:27:03 -08:00
Isaac Connor 91c9714e43 cleanup 2018-03-02 18:26:21 -08:00
Isaac Connor d980def64f spacing, increase debug 2018-03-02 18:26:07 -08:00
Isaac Connor 77ded1f5be spacing and increase debug 2018-03-02 18:25:46 -08:00
Isaac Connor 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
Isaac Connor a6827c97ab Cleanup, add some sanity checks 2018-03-02 18:24:39 -08:00
Isaac Connor 9af6dc02bc better debug of packet pts/dts/duration 2018-03-01 19:22:47 -08:00
Isaac Connor 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
Isaac Connor 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
Isaac Connor 1bc6e40fbc add mutex locking around mysql functions so that we can go multi-threaded 2018-03-01 19:20:52 -08:00
Isaac Connor b3d23ab233 merge zma_to_thread version of db functions, which include a mutex lock 2018-03-01 19:20:29 -08:00
Isaac Connor c443168389 split out codec and encoder, allowing one to specify which encoder to use 2018-02-28 07:17:16 -08:00
Isaac Connor f00983b450 Don't setup snap and timestamp if it's an audio packet 2018-02-27 20:19:39 -05:00
Isaac Connor 3586825c90 fix preevent_count==0 causing div/0 2018-02-26 17:08:05 -08:00
Isaac Connor 902f5f098a remove debug code 2018-02-26 16:10:27 -08:00
Isaac Connor e3802954f7 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-02-23 19:01:46 -05:00
Isaac Connor a231f500ec better debug, whitespace 2018-02-23 19:01:42 -05:00
Isaac Connor 5b55bef721 Add support for h264_mmal 2018-02-22 18:33:11 -05:00
Isaac Connor 90a668325e add mmal decoding 2018-02-22 11:56:37 -05:00
Isaac Connor 84b42ef4d7 workarouns for omx 2018-02-22 11:43:04 -05:00
Isaac Connor 83785ac73f Merge branch 'storageareas' into zma_to_thread 2018-02-22 09:41:50 -05:00
Isaac Connor 65f3a9b916 try crf instead of preset ultrafast 2018-02-22 09:34:50 -05:00
Isaac Connor ee1eef50cb Merge branch 'zma_to_thread' of github.com:ConnorTechnology/ZoneMinder into zma_to_thread 2018-02-18 11:00:55 -05:00
Isaac Connor d514e95606 Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread 2018-02-17 12:26:08 -05:00
Isaac Connor e634e0addc Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-02-17 12:25:42 -05:00
Isaac Connor 77426a7838 term to terminal for clarity 2018-02-17 12:25:05 -05:00
Isaac Connor e6d9292dd0 term to terminal for clarity 2018-02-17 12:25:00 -05:00
Isaac Connor 9caa71233a catch another EOF case 2018-02-17 11:07:06 -05:00
Isaac Connor ec7f2e48d0 add back AnalysisFPS reporting and move the gettimeofday in after it is actually needed 2018-02-17 10:54:53 -05:00
Isaac Connor 7702e09ec2 merge fixes 2018-02-16 16:05:30 -05:00
Isaac Connor 84b7e85259 Add a mutex around mysql operations 2018-02-15 15:54:13 -05:00
Isaac Connor 10a30452fb fix logic when clearing queue, we were deleting packets endlessly. 2018-02-15 14:08:21 -05:00
Isaac Connor 9fd2b6be52 fix fps reporting 2018-02-15 14:07:55 -05:00
Isaac Connor 399b5159a4 spacing and comment out some debug. Also maybe fix build when v4l1 is not present 2018-02-15 14:07:40 -05:00
Isaac Connor e7ec1086ea rework zmc delay code to be more readable and use few gettimeofday calls and be more efficient 2018-02-15 14:07:05 -05:00
Isaac Connor ebb0c9eec6 Merge branch 'storageareas' into zma_to_thread 2018-02-14 13:56:30 -05:00
Isaac Connor b5e0745ac7 Merge branch 'storageareas' into zma_to_thread 2018-02-14 13:56:03 -05:00
Isaac Connor 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
Isaac Connor 2e11c12d73 add debugging to logging 2018-02-14 11:56:54 -05:00
Isaac Connor 9a19a9cddd Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-02-13 10:11:49 -05:00
Isaac Connor 744d776d9f return when ReopenFfmpeg fails 2018-02-13 10:11:39 -05:00
Isaac Connor 162a08e81d return when ReopenFfmpeg fails 2018-02-13 10:11:05 -05:00
Isaac Connor e83586dbe1 Rename Term to Terminal to differentiate between Terminate 2018-02-13 06:23:18 -05:00
Isaac Connor ef72e585b9 Include id in the user object 2018-02-13 05:28:00 -05:00
Isaac Connor 657fda818b code docs 2018-02-13 05:26:30 -05:00
Isaac Connor 4a0b3f6c40 Include id in the user object 2018-02-13 05:26:08 -05:00
Isaac Connor a82e17ff4b Merge branch 'storageareas' into zma_to_thread 2018-02-12 17:16:33 -05:00
Isaac Connor 4f57a40cb6 Update Monitor_Status after connection lost and when exiting 2018-02-12 13:24:19 -05:00
Isaac Connor cd606dbab8 whitespace 2018-02-07 08:03:01 -05:00
Isaac Connor 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
Isaac Connor a4c956da7d Only update db entry when value changes 2018-02-05 22:59:22 -05:00
Isaac Connor af67e3b686 whitespace 2018-02-04 11:54:25 -08:00
Isaac Connor 310193791d add a 10 second sleep before reconneting 2018-02-04 11:54:11 -08:00
Isaac Connor e25af4b40c cleanup, reset result 2018-02-02 16:07:13 -05:00
Isaac Connor 4b7ddd81bf Merge branch 'storageareas' into zma_to_thread 2018-02-02 14:24:02 -05:00
Isaac Connor a1392bf613 Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	src/zm_ffmpeg_camera.cpp
	src/zm_mpeg.cpp
	src/zmc.cpp
 2018-02-02 14:23:26 -05:00
Isaac Connor 868e17a414 Allow Method in Monitors to be NULL 2018-02-02 10:31:55 -05:00
Isaac Connor 6942aaed15 whitespace 2018-01-31 14:36:01 -05:00
Isaac Connor 882a242b76 Fix mpeg streaming. 2018-01-31 14:35:00 -05:00
Isaac Connor 31ad807a90 If ffmpeg is open in PrimeCapture, close it. Turn all Fatals into Errors 2018-01-31 14:34:39 -05:00
Isaac Connor bdb5176981 increase debug lvel of dumpPacket 2018-01-31 14:33:42 -05:00
Isaac Connor c9bc5a8cd8 if given timestamp is in the future, reset it, it is likely invalid 2018-01-31 14:33:20 -05:00
Isaac Connor ba2c111762 restructure to keep trying to open the camera instead of exiting. 2018-01-31 14:32:48 -05:00
Isaac Connor 218e34a079 Can only have 6 digitals, not 8 2018-01-30 11:23:09 -05:00
Isaac Connor 8c90a8a47a Fix Id => MonitorId in MonitorStatus 2018-01-29 23:06:59 -05:00
Isaac Connor 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
Isaac Connor 5b238f713d fix comma 2018-01-29 11:52:17 -05:00
Isaac Connor 1d221dff7c Frame throttling is not an error. 2018-01-29 11:45:33 -05:00
Isaac Connor fc4edefd81 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla 2018-01-29 07:35:24 -08:00
Isaac Connor 7e2f132cdd Better debugging 2018-01-29 07:22:05 -08:00
Isaac Connor cfb0461fcf Rename column Id to MonitorId in MonitorStatus 2018-01-29 09:31:43 -05:00
Isaac Connor f98217e62a remove useless debug code 2018-01-28 15:17:48 -05:00
Isaac Connor 190d8d1600 remove useless debug code 2018-01-28 15:17:41 -05:00
Isaac Connor 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
Isaac Connor 057509637a TUrn a warning into a debug 2018-01-28 15:16:06 -05:00
Isaac Connor 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
Isaac Connor 9a15328894 Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	src/zm_event.cpp
 2018-01-26 13:02:16 -05:00
Isaac Connor 5a3d0b944e Detect invalid delta_time and don't exit on failed mysql 2018-01-26 12:21:12 -05:00
Isaac Connor 6a42dab4e8 Fix 2018-01-24 12:18:39 -05:00
Isaac Connor 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
Isaac Connor 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
Isaac Connor 215660a817 Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	src/zm_ffmpeg_camera.cpp
	src/zm_packetqueue.cpp
	src/zm_videostore.cpp
	src/zm_videostore.h
	web/includes/Event.php
	web/skins/classic/views/events.php
 2018-01-24 11:06:19 -05:00
Isaac 66fd02a29e Use dumpPacket 2018-01-23 18:15:29 +01:00
Isaac 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
Isaac Connor 6bc83ca6a2 Set Default Scheme 2018-01-23 09:07:40 -05:00
Isaac bfa0a00e67 dfebug improvements 2018-01-22 03:27:44 +01:00
Isaac 41a05f5eef simplify logic, improve debugging 2018-01-22 03:26:36 +01:00
Isaac 414930cb90 simplify logic, improve debugging 2018-01-22 03:26:33 +01:00
Isaac 4127aa50f3 simplify logic, improve debugging 2018-01-22 03:26:25 +01:00
Isaac Connor 18f0610d87 Merge zm_ffmpeg.cpp from zma_to_thread 2018-01-21 17:18:29 -05:00
Isaac Connor e37d27e972 Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	src/zm_monitor.cpp
 2018-01-18 13:44:26 -05:00
Isaac Connor 59a1272307 bump version 2018-01-18 11:39:33 -05:00
Isaac Connor 22df150cb2 Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	src/zm_ffmpeg_camera.cpp
	src/zm_packetqueue.cpp
 2018-01-17 13:59:34 -05:00
Isaac Connor 360a10276f Fix. We were deleting the keyframe that we wanted to keep. 2018-01-17 10:01:48 -05:00
Isaac Connor 687d797303 Only log debug message about excluding audio if there is an audio stream 2018-01-17 09:53:03 -05:00
Isaac Connor 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
Isaac Connor d87e691363 Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread 2018-01-16 17:53:48 -05:00
Isaac Connor 573c44839a Merge branch 'storageareas' into zma_to_thread 2018-01-16 17:39:37 -05:00
Isaac Connor 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
Isaac Connor 26cea49f1a handle nulls in event_prefix and label_format in Monitor::Reload 2018-01-16 11:08:35 -05:00
Isaac Connor 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
Isaac Connor 2c121fb784 If we get a term signal while waiting for zmc, die. 2018-01-12 07:12:54 -08:00
Isaac Connor c3ab7d5269 Merge branch 'storageareas' into zma_to_thread 
Conflicts:
	src/zm_packetqueue.cpp
	src/zma.cpp
 2018-01-10 14:24:46 -05:00
Isaac Connor 8a85694b1c spacing 2018-01-10 14:19:47 -05:00
Isaac Connor 7d2becee21 add reload on HUP 2018-01-10 12:59:42 -05:00
Isaac Connor ae5f4c9d9c Add log re-init on HUP 2018-01-10 12:58:22 -05:00
Isaac Connor 727bde752f Count non-i frames in frames_to_keep. Should reduce the size of the packetqueue 2018-01-07 13:39:13 -05:00
Isaac Connor 36ef0f5011 Merge branch 'storageareas' into zma_to_thread 2018-01-05 10:06:18 -05:00
Isaac Connor 2ec25a20ec Don't crash if we fail to open the video output stream 2018-01-04 10:07:51 -05:00
Isaac Connor 0ea6fd9807 Merge branch 'storageareas' into zma_to_thread 2017-12-19 14:06:58 -05:00
Isaac Connor 2922a86d23 fixes to new Storage Schemes code 2017-12-19 11:01:03 -05:00
Isaac Connor 887235c746 move dumpPacket to zm_ffmpeg 2017-12-19 09:59:04 -05:00
Isaac Connor e16852ee8e fix compile, impose minimum 10 second event length 2017-12-18 13:39:08 -05:00
Isaac Connor 8a8001f14a fix missingc_str() 2017-12-18 13:25:24 -05:00
Isaac Connor 705a98276f change StorageScheme to Scheme 2017-12-18 13:17:43 -05:00
Isaac Connor d312482a2b add StorageScheme to Storage and Events. Deprecate ZM_USE_DEEP_STORAGE 2017-12-18 12:52:26 -05:00
Isaac Connor 7e9d740343 add npeg1 & 2 support and fix the first keyframe being ignored thing 2017-12-16 17:08:21 -05:00
Isaac Connor 14eedf4927 rework state machine 2017-12-16 17:07:53 -05:00
Isaac Connor 49214a8902 Merge branch 'zma_to_thread' of github.com:/ConnorTechnology/ZoneMinder into zma_to_thread 2017-12-15 10:47:53 -05:00
Isaac Connor ebcd63f280 fixes to compile using avconv 2017-12-15 10:47:44 -05:00
Isaac Connor 212cd7e6c4 tidy ups 2017-12-15 10:46:43 -05:00
Isaac Connor 4e32a002e6 Fix timestamps on passthrough video. 2017-12-14 15:56:22 -05:00
Isaac Connor a0532cd84a fix merge 2017-12-12 15:30:47 -05:00
Isaac Connor bcdadc67bf Merge branch 'storageareas' into zma_to_thread 2017-12-12 15:29:19 -05:00
Isaac Connor a304af727b debug GetFPS 2017-12-12 14:37:02 -05:00
Isaac Connor 70d43d2d27 fix strncpy calls 2017-12-12 13:42:48 -05:00
Isaac Connor 34668db43b use return value of WriteJpeg 2017-12-12 13:39:36 -05:00
Isaac Connor 97e3ac046e close file handle on error 2017-12-12 13:38:31 -05:00
Isaac Connor 599848346e close infile on error condition. Make failure to read not be fatal. 2017-12-12 13:35:19 -05:00
Isaac Connor 7278448b01 remove test for less than zero of uints 2017-12-12 13:30:58 -05:00
Isaac Connor 6bffc54b77 fix referencing event_data before we test it for null 2017-12-12 13:30:43 -05:00
Isaac Connor c40f79097d fix zeroing of vid_cap, when we want to zero vid_pic! 2017-12-12 13:28:39 -05:00
Isaac Connor 5f0db60c38 quiet coverity 2017-12-12 13:25:41 -05:00
Isaac Connor b246ae4d19 remove less than zero tests for unsigned parameters 2017-12-12 13:25:02 -05:00
Isaac Connor 2769c1fc54 add missing unlock 2017-12-12 13:20:53 -05:00
Isaac Connor 5fa7fd4db8 initialize mValue 2017-12-12 13:19:35 -05:00
Isaac Connor 3c44c1f9be quiet coverity by returning after Panic 2017-12-12 13:19:23 -05:00
Isaac Connor 52953d7112 initialize ttl 2017-12-12 13:19:09 -05:00
Isaac Connor 46094fe6cf close outfile on error 2017-12-12 13:18:57 -05:00
Isaac Connor 47f3971f9a remove unused mDbConnection 2017-12-12 13:18:50 -05:00
Isaac Connor 568b15a916 initilize things to quiet coverity 2017-12-12 13:09:55 -05:00
Isaac Connor 23a2f1e609 quiet coverity by initialising last_frame_timestamp 2017-12-12 13:01:57 -05:00
Isaac Connor 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
Isaac Connor fe74c41723 fix integer division instead of double 2017-12-12 12:56:19 -05:00
Isaac Connor 716a29545f fix strncpy not leaving null terminator space 2017-12-12 12:53:05 -05:00
Isaac Connor db915b2c56 Don't do an unneccesary assignemnt 2017-12-12 12:52:30 -05:00
Isaac Connor 43e4421368 fix strncpy not leaving null terminator space 2017-12-12 12:52:20 -05:00
Isaac Connor 2df96bf6ee use the return value of stat 2017-12-12 12:51:54 -05:00
Isaac Connor 007ebd3689 remove unused var 2017-12-12 12:41:17 -05:00
Isaac Connor 40e4d909c3 turn Fatal into Error 2017-12-12 12:41:11 -05:00
Isaac Connor ec99c96587 remove unneccesary assignment 2017-12-12 12:38:40 -05:00
Isaac Connor 31189bdb11 make an error not fatal and check return to quiet coverity 2017-12-12 12:38:30 -05:00
Isaac Connor 9085a4b062 remove unused class members 2017-12-12 12:38:05 -05:00
Isaac Connor f8738f2387 quiet coverity 2017-12-12 12:37:49 -05:00
Isaac Connor 8c1159ad56 quiet coverity by initializing everything in constructor 2017-12-12 12:37:36 -05:00
Isaac Connor 56e879da7b should only cpoy sizeof(path)-1 to leave space for null terminator 2017-12-12 12:37:04 -05:00
Isaac Connor a9bbe3e85c remove debug lines 2017-12-12 12:36:35 -05:00
Isaac Connor 16ac341642 locallist return code vars, they don't need to be class members 2017-12-12 12:35:54 -05:00
Isaac Connor a0f79b7bf7 add CFG_UNKNOWN and use it in the .cpp to quiet coverity 2017-12-12 12:35:28 -05:00
Isaac Connor 49be06d641 move freeaddrinfo up before a return to prevent memleak 2017-12-12 12:35:05 -05:00
Isaac Connor 475d39f1c6 move closedir down so that it always happens. Make coverity quiet 2017-12-12 12:34:43 -05:00
Isaac Connor 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
Isaac Connor dd384e9e6d reduce wait time when waiting for first frame 2017-12-08 21:29:05 -05:00
Isaac Connor 9a5371c371 don't exit on capture fail 2017-12-08 21:28:47 -05:00
Isaac Connor 2f23f81ff3 store a snaphost when we don't storae anything else as opposed to when specifically storing a snpashot 2017-12-08 21:28:30 -05:00
Isaac Connor af37eeeeed fix int64 = int*int multiply 2017-12-08 15:17:45 -05:00
Isaac Connor 011c7e1540 revert to /1000000 tb 2017-12-08 14:22:38 -05:00
Isaac Connor aff08358f4 more debug 2017-12-08 13:46:02 -05:00
Isaac Connor 533b370a81 add a mutex to the packetqueue 2017-12-08 10:39:57 -05:00
Isaac Connor 135d3803fb make sure that we don't queue a packet twice 2017-12-08 10:39:24 -05:00
Isaac Connor d5b927c986 use xh264rgb is available 2017-12-08 10:38:16 -05:00
Isaac Connor 12350407bf reconnet to db on error 2017-12-08 10:37:35 -05:00
Isaac Connor 311e62de7a change zmDbConnect to return a bool 2017-12-08 10:36:54 -05:00
Isaac Connor 2a3683c072 add some more debug 2017-12-07 09:27:28 -05:00
APHW2 MFGENG 0cfc42b9fd some cleanups/fixes 2017-12-05 13:16:52 -08:00
Isaac Connor 13de2b60d4 need to store the monitor object 2017-12-04 18:06:53 -05:00
Isaac Connor 61dd84de82 move most of the codec init out of the constructor into open so that we can fail gracefully 2017-12-04 18:06:42 -05:00
Isaac Connor 588f63b053 Merge branch 'storageareas' into zma_to_thread 2017-12-04 17:07:16 -05:00
Isaac Connor c04ec1b8a8 fix mem corruption 2017-12-03 12:50:57 -05:00
Isaac Connor 6fc684a018 Merge branch 'zma_to_thread' of github.com:/ConnorTechnology/ZoneMinder into zma_to_thread 2017-12-03 11:09:17 -05:00
Isaac Connor 4d73ce4109 rework locking to have a per-packet mutex 2017-12-03 11:09:01 -05:00
Isaac Connor 5f01313ff6 Merge branch 'zma_to_thread' of github.com:ConnorTechnology/ZoneMinder into zma_to_thread 2017-12-03 11:00:52 -05:00
Isaac Connor b8f455ee7c some cleanup, add a note about the lines that cause zm to crash 2017-12-03 11:00:40 -05:00
Isaac Connor bc525a4e01 blah 2017-12-02 13:55:26 -05:00
Isaac Connor b1019267d8 try moving codec selection up above ctx allocation so that it allocates a priv_data 2017-12-02 08:12:04 -05:00
Isaac Connor 0ef9d13dbd Merge branch 'zma_to_thread' of github.com:/ConnorTechnology/ZoneMinder into zma_to_thread 2017-12-01 18:50:46 -05:00
Isaac Connor 3ca9b36877 fixes to compile on old ffmpeg 2017-12-01 18:50:28 -05:00
APHW2 MFGENG 4a9c31a15d wip 2017-12-01 15:42:19 -08:00
APHW2 MFGENG 392e6c28a1 Merge branch 'zma_to_thread' of http://github.com/connortechnology/ZoneMinder into zma_to_thread 2017-12-01 12:09:02 -08:00
APHW2 MFGENG c26d7fec7b Merge branch 'zma_to_thread' of http://github.com/connortechnology/ZoneMinder into zma_to_thread 2017-12-01 11:50:05 -08:00
Isaac Connor b87e459125 still corrupting memory 2017-12-01 14:48:30 -05:00
Isaac Connor 2e3fda488e more debug 2017-12-01 14:33:51 -05:00
Isaac Connor cbae7ef7b4 Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread 2017-12-01 10:33:15 -05:00
Isaac Connor 128ae82331 add a debug for when in addpacket and no videostore 2017-12-01 10:33:10 -05:00
Isaac Connor 6e17bfefdd fix printouts on 32bit 2017-12-01 10:30:58 -05:00
Isaac Connor 0865201e1e seems to work 2017-12-01 07:26:34 -05:00
Isaac Connor 967368ce07 testing 2017-11-30 22:18:33 -05:00
Isaac Connor 4e26bde140 merge fix 2017-11-30 22:18:02 -05:00
Isaac Connor 4130c73943 Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread 2017-11-30 19:26:58 -05:00
Isaac Connor 4cc5838c66 whitespace & cleanup 2017-11-30 19:26:51 -05:00
Isaac Connor 556c4d8851 debug 2017-11-30 16:10:30 -05:00
Isaac Connor c52d7c60eb finish deprecating zma 2017-11-30 15:19:31 -05:00
Isaac Connor 84c901a01b don't write non-frames 2017-11-30 15:01:48 -05:00
Isaac Connor f2efc80f22 works? 2017-11-30 14:37:36 -05:00
APHW2 MFGENG f0ffa34c4d set videostreamid 2017-11-28 12:58:20 -08:00
Isaac Connor 344539f5dc cleanup 2017-11-28 11:55:47 -05:00
Isaac Connor d73f9e8a73 wip, crashes 2017-11-28 11:11:41 -05:00
Isaac Connor 1e50df741f fix some memleaks 2017-11-28 09:50:09 -05:00
Isaac Connor 6e4abf83d0 wip 2017-11-28 08:29:03 -05:00
Isaac Connor 9d91d4ce45 relocate code for readability 2017-11-27 15:43:16 -05:00
Isaac Connor 81fa201910 init last_signal 2017-11-27 15:43:06 -05:00
Isaac Connor d1886b5536 wip 2017-11-27 14:57:24 -05:00
Isaac Connor 99968dfa2a Merge branch 'storageareas' into zma_to_thread 2017-11-27 11:28:36 -05:00
Isaac Connor 03c9f88d55 fix build on trusty 2017-11-27 08:24:14 -05:00
Isaac Connor 7c491bf62e make compile on trusty 2017-11-26 18:06:12 -05:00
Isaac Connor fc27674d76 can't do init in the if statement 2017-11-26 17:50:57 -05:00
Isaac Connor 4b92a788f7 fix filter execute 2017-11-24 15:37:50 -05:00
Isaac Connor 8e494ef431 Merge branch 'storageareas' into zma_to_thread 2017-11-23 08:40:49 -05:00
Isaac Connor 0eb2ae60f3 only try to write timecodes if the open was successful 2017-11-22 12:13:28 -08:00
Isaac Connor 3c55daaf36 Merge branch 'tesla' of github.com:connortechnology/ZoneMinder into tesla 2017-11-22 12:10:54 -08:00
Isaac Connor fe42eed1ea cannot unlink the lock file, it has to stick around. 2017-11-22 11:43:13 -05:00
Isaac Connor cd1d2e1721 lots more debugging. re-add status update command on failure 2017-11-22 01:18:07 -05:00
Isaac Connor 3af52256b8 turn down debug 2017-11-21 23:57:34 -05:00
Isaac Connor 4d758b7ce9 debugging 2017-11-21 23:57:13 -05:00
Isaac Connor ebe3073c59 only update fps if we have an image capture 2017-11-21 23:57:01 -05:00
Isaac Connor a1fe0c4de3 store the value of saveJpegs in the event 2017-11-21 23:56:22 -05:00
Isaac Connor 752990bb0f improve zms logging 2017-11-21 23:55:53 -05:00
Isaac Connor 24a0d717c5 wip 2017-11-21 19:55:40 -05:00
Isaac Connor 7ed495c948 wip 2017-11-21 11:58:15 -05:00
Isaac Connor 43b71fc49b rework 2017-11-20 15:32:40 -05:00
Isaac Connor 74650ebc70 simplify Analysis 2017-11-20 11:48:56 -05:00
Isaac Connor 64816aa005 fixes from cppcheck. 2017-11-18 16:00:10 -05:00
Isaac Connor 1abcb19851 add Copy routing 2017-11-18 09:45:54 -05:00
Isaac Connor 7d77cd75fe eliminate redundant code and memleak 2017-11-18 09:45:47 -05:00
Isaac Connor 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
Isaac Connor f5f45b3397 add Copy 2017-11-17 16:50:44 -05:00
Isaac Connor 4217d8ec4d Merge branch 'zma_to_thread' of github.com:ConnorTechnology/ZoneMinder into zma_to_thread 2017-11-17 16:49:31 -05:00
Isaac Connor 28286c7967 fix spacing 2017-11-17 16:49:28 -05:00
Isaac Connor cd596d49e3 fix local camera inputstream 2017-11-17 16:49:01 -05:00
Isaac Connor 6702b10dee remove redundant code and memory leaks 2017-11-17 15:37:26 -05:00
Isaac Connor ef5e296144 some fixes 2017-11-17 14:30:38 -05:00
Isaac Connor 159c0a7165 moer cppcheck fixes 2017-11-17 07:52:26 -05:00
Isaac Connor 22ff831859 more cppcheck recommendations 2017-11-16 21:21:56 -05:00
Isaac Connor 7bff9a8083 fix to compile 2017-11-16 20:37:40 -05:00
Isaac Connor 2aa252fbd0 Merge branch 'storageareas' into zma_to_thread 2017-11-16 18:27:44 -05:00
Isaac Connor 0318fb54a6 add missing initializers 2017-11-16 18:23:02 -05:00
Isaac Connor 1686584908 more cppcheck fixes 2017-11-16 09:19:27 -05:00
Isaac Connor a956ffe7b3 add Copy and =operators to satisfy cppcheck 2017-11-16 09:15:04 -05:00
APHW2 MFGENG 028aa9f161 fix segfault 2017-11-14 15:32:37 -08:00
APHW2 MFGENG 82b30ef9d0 Merge branch 'zma_to_thread' of http://github.com/connortechnology/ZoneMinder into zma_to_thread 2017-11-14 13:16:58 -08:00