acb95709e6
Fix issues with too much audio in events by storing packets in the queue with their timestamps converted to AV_TIME_BASE_Q, so that we can sort video and audio packets together.
2019-06-11 10:19:42 -04:00
ee80b086af
log the # of db entries being written before doing the writing so that we know the # being written
2019-06-10 14:13:21 -04:00
50436c5ea1
Correct debug line listing how many frames are being written to db
2019-06-10 13:59:01 -04:00
ebc9a77c9d
When saving jpegs, do a db write on the first frame. Fix test for writing frame info to db. Because we increment frames, it is essentially 1-based. So the test needs to be ==1 instead of !
2019-06-10 12:57:57 -04:00
a16d29740c
Fix final frame of event having same id as the second last
2019-06-06 13:49:01 -04:00
4b8a2a94e3
reduce frame send time too slow to a warning instead of error
2019-06-05 10:12:56 -04:00
1d132b5923
When writing MP4 sample, save buffer.size() into a temporary variable before calling buffer.extract(). ( #2628 )
2019-06-01 16:43:29 -04:00
7b06f58559
Limit Connection error logs to every 10 minutes instead of every 10 seconds. Connection attempts still happen at 10 second intervals
2019-05-27 17:16:23 -04:00
049b70a624
junk bad code in zm_eventstream that tried to figure out how long to sleep by considering the wall clock time since play start. No good as soon as we seek.
2019-05-27 17:15:46 -04:00
c44967f770
fix push to push_front
2019-05-27 12:47:38 -04:00
663f941963
If we can't find a packet before ours in the queue, then stick it at the front of the queue, not the end.
2019-05-27 12:31:18 -04:00
8b4fddadfb
out_frame->pts is calculated in resample_audio
2019-05-27 12:29:29 -04:00
67b8ca8bfb
Fix superfast playback after replay
2019-05-24 13:45:48 -04:00
0a8b7c24db
don't check for alarmed zones to record stats for unless we are alarmed
2019-05-24 10:52:31 -04:00
93aeceecfc
Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement
2019-05-17 10:18:15 -04:00
3888d140a8
Merge branch 'master' into storageareas
2019-05-17 10:16:29 -04:00
06eb9a3bb2
merge typo
2019-05-16 16:15:16 -04:00
915e9f05a9
merged fifo changes
2019-05-16 16:14:06 -04:00
eb005e8b9c
FIFO support for zoneminder zone debugging ( #2594 )
...
Adds fifo options for diagnostic images for much lower impact diagnostics mode. Diagnostic images are only written when there is a client listening for them (otherwise they are skipped). Also added a json stream for the detection data so you can see in real time the pixels or blobs detected for the motion. This allows for easy real time stream of both delta and reference images (as video streams) along with the detection numbers.
2019-05-16 15:37:03 -04:00
4f44db8cbf
ifdef HAVE_ZLIB_H around code that uses Image->Zip ( #2597 )
2019-05-16 15:35:19 -04:00
c257fb46f6
Merge branch 'storageareas' of github.com:connortechnology/zoneminder into storageareas
2019-05-13 10:34:45 -04:00
74095963cc
Merge branch 'master' into storageareas
2019-05-12 19:39:09 -04:00
21710b6e49
demote logs
2019-05-12 15:45:39 -04:00
cc0d23ce4e
move token index after adding password
2019-05-12 15:01:49 -04:00
9a8aa5453b
add Password back so User object indexes don't change
2019-05-12 14:48:23 -04:00
22c5d46c65
rescale audio packet duration and pts before feeding to codec after resample
2019-05-12 12:14:03 -04:00
d7daf8550f
Merge branch 'master' into storageareas
2019-05-12 09:37:41 -04:00
453bc2afd8
more frame dumping in resample
2019-05-12 09:36:26 -04:00
aada171440
clean up some logic in Analyse
2019-05-12 09:35:48 -04:00
8499958767
typo
2019-05-12 05:57:17 -04:00
225893fcd6
add mintokenexpiry to DB seek
2019-05-12 05:50:19 -04:00
1f22c38453
more fixes
2019-05-12 05:10:20 -04:00
6ab31dfe4b
more fixes
2019-05-12 05:03:16 -04:00
3e66be27a8
use strtoul for conversion
2019-05-11 16:09:42 -04:00
053e57af62
use strtoul for conversion
2019-05-11 16:01:05 -04:00
96fa6149a8
use strtoul for conversion
2019-05-11 15:58:07 -04:00
ae14be916c
initial plumbing to introduce token expiry and API bans per user
2019-05-11 13:39:40 -04:00
67c20aa976
fix frame->duration to frame->pkt_duration
2019-05-10 12:58:54 -04:00
d3a680aaa3
Set out_frame duration when resampling. Better error message if failed to write to fifo
2019-05-10 12:31:10 -04:00
8461852e27
move out sha header
2019-05-08 19:32:58 -04:00
0bb5ff934e
move sha headers out
2019-05-08 19:17:31 -04:00
4ab0c35962
move JWT/Bcrypt inside zm_crypt
2019-05-08 16:45:28 -04:00
2212244882
fix absolute path
2019-05-08 15:47:38 -04:00
c41a2d067c
fixed type conversion
2019-05-08 14:29:44 -04:00
bc050fe330
support refresh tokens as well for increased security
2019-05-08 13:38:42 -04:00
27e6e46f84
remove allowing auth_hash_ip for token
2019-05-08 12:11:32 -04:00
3c6d0131ff
fix db read, forgot to exec query
2019-05-08 12:06:37 -04:00
04c3bebef9
exception handling for try/catch
2019-05-08 11:44:15 -04:00
3a67217972
move decode inside try/catch
2019-05-08 11:29:34 -04:00
bb18c305ab
add token to command line for zmu
2019-05-08 11:08:27 -04:00
Isaac Connor
Gleb Popov
Pliable Pixels
Mitch Capper
Isaac Connor