f3166663a5
unref hw_device_ctx on Close. I think this should release all the other hwaccel related stuff
2019-07-19 12:51:31 -04:00
fcee031785
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-07-17 21:10:46 -04:00
542d88b6a4
fix compile without HWCONTEXT
2019-07-17 21:10:24 -04:00
a9d01ba3d2
Alarm api ( #2665 )
...
* fixed alarm api to use tokens if present
* clearer debug logs for tokens
* space
2019-07-17 20:38:58 -04:00
2b7610a5ac
fixed ffmpeg log association to zm log levels ( #2664 )
2019-07-17 20:37:27 -04:00
75af397223
hwFrame isn't defined unless we have HWCONTEXT_H
2019-07-17 20:33:23 -04:00
34c141304d
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-07-17 10:07:29 -04:00
ef9fe2dbd6
Free up hwFrame, preventing memleak
2019-07-17 10:06:30 -04:00
67168a2387
demote token log ( #2663 )
2019-07-12 14:31:39 -04:00
52e7cde66d
If Email has EIMOD, not only attach the image if it exists, but replace %EIMOD% with the link to it
2019-07-11 19:04:51 -04:00
05be9008c7
use FFMPEGInit to initialise ffmpeg instead of doing it ourselves
2019-07-11 17:57:11 -04:00
13c91bdf60
Add pts adjustment to the delayed flushed encoder packets
2019-07-11 17:56:53 -04:00
288f2f3e8f
Convert zm_dump_frame from a function to a define, this way we get line #'s from where we call zm_dump_frame instead of from the line in zm_ffmpeg where the function was.
2019-07-11 17:56:22 -04:00
d244aadee6
Fix #2655
2019-07-08 14:27:49 -04:00
df8c46f0f0
Fix #2657
2019-07-08 14:22:46 -04:00
5b896b5e5c
Replace password('admin') with the resulting string because use of password is deprecated
2019-07-08 14:16:57 -04:00
3d2f806699
Merge branch 'master' of github.com:connortechnology/ZoneMinder
2019-07-08 12:59:00 -04:00
da5e8d19b8
Fix #2656
2019-07-07 17:54:45 -04:00
b84e3499f4
Implement code to auto-load monitor status info if not already loaded. Check for Connected instead of Capturing in watch to display warning message
2019-07-07 17:25:49 -04:00
4b41655dc5
fix
2019-07-07 16:10:53 -04:00
3c1cd1e750
rename var from nevents to nFrames because that's what they are. Fix an error when page=0
2019-07-07 16:03:54 -04:00
4c306fb140
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-07-07 08:57:43 -04:00
94cc85aa36
Sorta fix pts on encoded audio packets. Sync is off, but at least it is close
2019-07-07 08:57:22 -04:00
0f35d86efb
implement zm_send_frame which sends a frame and receives a packet
2019-07-07 08:56:39 -04:00
255f606ebf
bump rpm specfile
2019-07-07 07:33:50 -05:00
8c735856f8
bump version
...
required by #2653
2019-07-07 07:32:12 -05:00
aa817adbed
Add primary keys to Logs and Stats tables ( #2653 )
...
* Add primary keys to Logs and Stats tables
Adds an auto_increment int(10) Id as PRIMARY KEY to Logs and Stats tables.
Closes ZoneMinder#2550 and makes ZoneMinder compatible with Galera writeset replication for InnoDB (Galera Cluster, Percona XtraDB Cluster).
* Do ALTER TABLE only if columns do not exist
* Add forgotten prepare/execute
2019-07-07 08:26:06 -04:00
256a0aa679
google code style
2019-07-04 09:04:43 -04:00
2470c09b20
Honour thumbnail width when bringing up frames popup for frames and alarm frames
2019-07-03 17:19:10 -04:00
726e5c6dd5
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-07-03 09:50:49 -04:00
a9579484b8
gracefully handle failure to config hw pix fmt and debug a bit more
2019-07-03 09:49:53 -04:00
ef0f5212f2
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2019-07-02 12:40:29 -04:00
5ea5bd9bde
Only do audio_first_pts if we have audio_in_stream
2019-07-02 12:26:33 -04:00
a52b17ca01
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-07-02 11:58:32 -04:00
4e8ac47060
Use the video_first_pts to set the audio_first_pts
2019-07-02 11:58:22 -04:00
2dc60196c5
Code cleanup and cpplint
2019-07-02 11:14:24 -04:00
268bc2264b
Merge branch 'storageareas'
2019-07-02 10:19:03 -04:00
6231c64a7a
simplify rtfm step ( #2650 )
...
save everyone some cruft and time
2019-07-01 18:06:10 -04:00
1161c251fc
Add a warning when the monitor is not capturing in live view
2019-06-28 10:28:53 -04:00
d972ab6006
add min_section_length test to alarmed events that go unalarmed
2019-06-27 21:50:12 -04:00
0ab4f9fce0
More debugging in packetqueue.
2019-06-27 21:49:43 -04:00
3bd4486b65
Start event when alarm frames >= alarm_frame_count-1 because it is 1based. Add some debug.
2019-06-27 15:48:10 -04:00
ac7d4869de
We need to seek back pre_event_count video frames, not any frames
2019-06-27 15:36:13 -04:00
158b9438d7
Explicitly link with libdl ( #2649 )
...
Otherwise on some systems linking would fail with
undefined reference to symbol 'dlclose@@GLIBC_2.2.5'
2019-06-27 15:08:29 -04:00
dd57fd95ce
Clean up cruft from videostore api. Fix packetqueue clear_unwanted_packets to take a pre_event_count and take it into consideration when finding the right spot in the queue to start recording.
2019-06-27 11:11:14 -04:00
6ed29a3d56
Google code style, ifdef out all the extra includs that shouldn't be in the .h
2019-06-27 10:29:47 -04:00
6a87ae0fa7
fix compile warning by copying two bytes, which will grab the \0 after the \n
2019-06-27 10:24:51 -04:00
763fe16a04
Google code style, merge some fprintf's
2019-06-27 10:20:23 -04:00
0686f487ac
%s => %d for error count
2019-06-27 04:18:25 -04:00
66e9670199
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2019-06-27 03:41:11 -04:00
Isaac Connor
Pliable Pixels
Andrew Bauer
bluikko
CanOfSpam3
Daniel Schaefer