Commit Graph

2193 Commits

Author SHA1 Message Date
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 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 5a3d0b944e Detect invalid delta_time and don't exit on failed mysql 2018-01-26 12:21:12 -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 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 59a1272307 bump version 2018-01-18 11:39:33 -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 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 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 2ec25a20ec Don't crash if we fail to open the video output stream 2018-01-04 10:07:51 -05:00
Isaac Connor 2922a86d23 fixes to new Storage Schemes code 2017-12-19 11:01:03 -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 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