Commit Graph

13489 Commits

Author SHA1 Message Date
Isaac Connor 3d2f806699 Merge branch 'master' of github.com:connortechnology/ZoneMinder 2019-07-08 12:59:00 -04:00
Isaac Connor da5e8d19b8 Fix #2656 2019-07-07 17:54:45 -04:00
Isaac Connor 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
Isaac Connor 4b41655dc5 fix 2019-07-07 16:10:53 -04:00
Isaac Connor 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
Isaac Connor 4c306fb140 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-07-07 08:57:43 -04:00
Isaac Connor 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
Isaac Connor 0f35d86efb implement zm_send_frame which sends a frame and receives a packet 2019-07-07 08:56:39 -04:00
Andrew Bauer 255f606ebf
bump rpm specfile 2019-07-07 07:33:50 -05:00
Andrew Bauer 8c735856f8
bump version
required by #2653
2019-07-07 07:32:12 -05:00
bluikko 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
Isaac Connor 256a0aa679 google code style 2019-07-04 09:04:43 -04:00
Isaac Connor 2470c09b20 Honour thumbnail width when bringing up frames popup for frames and alarm frames 2019-07-03 17:19:10 -04:00
Isaac Connor 726e5c6dd5 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-07-03 09:50:49 -04:00
Isaac Connor a9579484b8 gracefully handle failure to config hw pix fmt and debug a bit more 2019-07-03 09:49:53 -04:00
Isaac Connor 5ea5bd9bde Only do audio_first_pts if we have audio_in_stream 2019-07-02 12:26:33 -04:00
Isaac Connor a52b17ca01 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-07-02 11:58:32 -04:00
Isaac Connor 4e8ac47060 Use the video_first_pts to set the audio_first_pts 2019-07-02 11:58:22 -04:00
Isaac Connor 2dc60196c5 Code cleanup and cpplint 2019-07-02 11:14:24 -04:00
Isaac Connor 268bc2264b Merge branch 'storageareas' 2019-07-02 10:19:03 -04:00
CanOfSpam3 6231c64a7a simplify rtfm step (#2650)
save everyone some cruft and time
2019-07-01 18:06:10 -04:00
Isaac Connor 1161c251fc Add a warning when the monitor is not capturing in live view 2019-06-28 10:28:53 -04:00
Isaac Connor d972ab6006 add min_section_length test to alarmed events that go unalarmed 2019-06-27 21:50:12 -04:00
Isaac Connor 0ab4f9fce0 More debugging in packetqueue. 2019-06-27 21:49:43 -04:00
Isaac Connor 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
Isaac Connor ac7d4869de We need to seek back pre_event_count video frames, not any frames 2019-06-27 15:36:13 -04:00
Daniel Schaefer 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
Isaac Connor 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
Isaac Connor 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
Isaac Connor 6a87ae0fa7 fix compile warning by copying two bytes, which will grab the \0 after the \n 2019-06-27 10:24:51 -04:00
Isaac Connor 763fe16a04 Google code style, merge some fprintf's 2019-06-27 10:20:23 -04:00
Isaac Connor 0686f487ac %s => %d for error count 2019-06-27 04:18:25 -04:00
Isaac Connor d26286a170 fix test for hwtransfer needed 2019-06-27 03:40:18 -04:00
Isaac Connor 305a954ee2 Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas 2019-06-25 22:20:19 -04:00
Isaac Connor 2a65b339c1 init hw_pix_fmt in constructor 2019-06-25 22:19:09 -04:00
Isaac Connor 86e8b58561 move hw_device_ctx under ifdef for HWCONTEXT_H 2019-06-25 22:06:00 -04:00
Isaac Connor 7389bbcb25 better debug in selecting hw_format, add CUDA, add setting device for hwaccel 2019-06-25 21:47:19 -04:00
Isaac Connor a44631a59d rough in support for ffmpeg 3.4 2019-06-25 16:35:07 -04:00
Isaac Connor 5ab4414b11 Only include hwaccel support if LIBAVUTIL_HWCONTEXT_H is deifned 2019-06-25 15:58:55 -04:00
Isaac Connor 679b6b1b2d remove old qsv code 2019-06-25 15:47:23 -04:00
Isaac Connor 46f3aabc25 Merge branch 'hwdecode' into storageareas 2019-06-25 15:35:56 -04:00
Isaac Connor 0103df9781 bump verison 2019-06-25 15:35:09 -04:00
Isaac Connor a28f17653f Add DecoderHWAccel fields to Monitor 2019-06-25 15:34:45 -04:00
Isaac Connor 86c4051c44 handle zm_receive_frame returning AVERROR instead of boolean 2019-06-25 15:34:36 -04:00
Isaac Connor 434bbce954 Add loading decoder_hwaccel in Monitor 2019-06-25 15:34:17 -04:00
Isaac Connor d0abd16494 add passing hwaccel name and device. use av_make_error_string(ret).c_str() to reduce code and increase consistency 2019-06-25 15:34:01 -04:00
Isaac Connor cf7f3e8a88 add passing hwaccel name and device. use av_make_error_string(ret).c_str() to reduce code and increase consistency 2019-06-25 15:33:54 -04:00
Isaac Connor 6a87d9a875 change zm_receive_frame to return AVERROR instead of boolean 2019-06-25 15:32:47 -04:00
Isaac Connor 19af25bf1a add DecoderHWAccel fields to Monitors 2019-06-25 15:29:46 -04:00
Isaac Connor 2cbcaeebbc clean out old hwdecode stuff. refactor common code out 2019-06-25 14:11:59 -04:00