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

17780 Commits

Author SHA1 Message Date
Isaac Connor c0a2286dee Code style 2021-01-08 15:49:21 -05:00
Isaac Connor a6aefcf477 get camera if we havn't already. Don't delete the timestamp in shared zmpackets because it is just a pointer to shmem. Set it to null instead so that ~ZMpacket doesn't try to free it 2021-01-08 15:49:09 -05:00
Isaac Connor 736b14327e allocate our own CodecContext for decoding. Reusing the existing one doesn't work for hwaccel. Add hwaccel flags to let it use Constrained Baseline for Baseline profile streams. Try without specified device if hwdevice_ctx_create fails. 2021-01-08 15:48:01 -05:00
Andrew Bauer a55e53a737 replace mootools Request.JSON 2021-01-08 14:34:10 -06:00
Andrew Bauer ece8fccc63 fix cyclePrev with only 1 monitor 2021-01-08 13:16:16 -06:00
Andrew Bauer c67c1ce6a0 replace Mootool delay with setTimeout 2021-01-08 13:06:56 -06:00
Andrew Bauer c7690a7088 go back rather than close window 2021-01-08 12:40:26 -06:00
Andrew Bauer 9ec09c0c85 replace mootools .delay method 2021-01-08 12:25:17 -06:00
Andrew Bauer 72eaf267c1 eslint 2021-01-08 10:45:59 -06:00
Andrew Bauer c0431eca86 eslint 2021-01-08 10:42:45 -06:00
Andrew Bauer 55d99e8e7c eslint 2021-01-08 10:10:47 -06:00
Andrew Bauer f816c72517 replace mootool Cookie object with plain JS 2021-01-08 10:04:46 -06:00
Andrew Bauer b56883a985 add reference to browserInfo function 2021-01-08 09:35:32 -06:00
Andrew Bauer 62fc1fb1aa replace Mootools Browser object with our own 2021-01-08 09:32:51 -06:00
Andrew Bauer d0f035596c eslint 2021-01-08 08:50:57 -06:00
Andrew Bauer d3a71aff14 use JS instead of Mootools to detect IE browser 2021-01-08 08:27:06 -06:00
Andrew Bauer 43fabd9b65 replace mootools periodical method 2021-01-08 07:32:52 -06:00
Isaac Connor 81d6f8c1ee disable rtsp_server 2021-01-07 15:13:02 -05:00
Isaac Connor c70e2ccfc2 Must notify before waiting in destructor. Fix leaks 2021-01-07 15:12:44 -05:00
Isaac Connor 514201c7b2 use zm_av_send_packet_receive_frame and fixup hwaccel support 2021-01-07 15:12:27 -05:00
Isaac Connor f729034e9f improve hwaccel support 2021-01-07 15:11:46 -05:00
Isaac Connor 272fdcec68 Merge branch 'master' into rtsp_server 2021-01-07 09:51:00 -05:00
Isaac Connor 655e54db17 remove unused directbuffer 2021-01-07 09:50:45 -05:00
Isaac Connor f8cd820d5e Change Disabled to Auto and add h265 as codec options 2021-01-07 09:48:22 -05:00
Isaac Connor 595bb2f565 Open/CLose RTSP with analysis thread when opening and closing monitor. We have to have successfully PrimeCapture before adding streams to RTSP Server and need to shut it down when closing the monitor because the packetqueue goes away 2021-01-07 09:47:53 -05:00
Isaac Connor c6d15f193a Update codec opening to properly handle passthrough 2021-01-07 09:46:35 -05:00
Isaac Connor 5cca440bee change outputFd which is unused to stream_id which is the stream_id to concern ourselves with when getting packets from the packetqueue. Add more tests for zm_terminate. Add testing for AV_CODEC_ID instead of v4l2 PIX_FMT to determine stream type 2021-01-07 09:46:06 -05:00
Isaac Connor abc402878b remove analysis_it and correctly manage external iterators. Fix testing for ability to remove packets from packetqueue. Fix some cases where the order of testing zm_terminate and packet locking is important 2021-01-07 09:43:53 -05:00
Isaac Connor 3b8266a6f0 add missing and mix order of Packet initializers 2021-01-07 09:41:08 -05:00
Isaac Connor 0d450f4f85 add missing and mix order of Packet initializers 2021-01-07 09:41:02 -05:00
Isaac Connor ff3bc981de move code from Load for purpose==ANALYSIS because it will never run. Analysis is a thread now and must assume that PrimeCapture has already succeeded. 2021-01-07 09:40:24 -05:00
Isaac Connor 7afaf00202 spacing and NULL=>nullptr 2021-01-07 09:36:54 -05:00
Isaac Connor e30f0245ef NULL=>nullptr 2021-01-07 09:36:33 -05:00
Isaac Connor c9641063ca Don't need to get_ref_image anymore. It will block waiting for a capture packet and the ref image will be set by capture thread 2021-01-07 09:36:18 -05:00
Andrew Bauer a431f08133 eslint 2021-01-06 15:57:30 -06:00
Andrew Bauer 4756a03b16 show alarm state and fps on zones view 2021-01-06 14:27:06 -06:00
Andrew Bauer 9d7f738f61 replace mootools in MonitorStream 2021-01-06 14:19:25 -06:00
Isaac Connor 315dccdaec Rename H264PASSTHROUGH to just PASSTHROUGH. Add an analysis_it to the Monitor object as it will no longer exist in the packetqueue 2021-01-06 11:32:09 -05:00
Isaac Connor e93a895f28 Rename H264PASSTHROUGH to just PASSTHROUGH. Start with last_signal set to true so that we don't have a signal change event on startup. Use new generic packetqueue functions 2021-01-06 11:31:31 -05:00
Isaac Connor d6c217c1ec Rename H264PASSTHROUGH to just PASSTHROUGH 2021-01-06 11:30:42 -05:00
Isaac Connor 08a28e6960 Set codec_type in zm_packet 2021-01-06 11:30:03 -05:00
Isaac Connor 7c049afc61 Add AVPacket parsing queue and other files for rtsp_server 2021-01-06 11:26:08 -05:00
Isaac Connor 770cf5703d continue roughing in rtsp server. Fix not adding session to rtspServer. 2021-01-06 11:24:52 -05:00
Isaac Connor d6b59c0abf Add rtsp_server files to CMakeLists.txt 2021-01-06 10:48:52 -05:00
Isaac Connor bbd54c363d Add MIN_RTSP_PORT config item, but commented out for now 2021-01-06 10:48:24 -05:00
Andrew Bauer 3eef753183
Debian builds have been moved to dedicated build host 2021-01-05 13:44:43 -06:00
Andrew Bauer 6dcedb584d modernize monitors view 2021-01-05 10:16:51 -06:00
Andrew Bauer ebbd2888f0 tableExport plugin is no longer used 2021-01-04 15:40:53 -06:00
Andrew Bauer bd18904bf4 remove js files that define popupSizes 2021-01-04 15:33:26 -06:00
Andrew Bauer 51132cb5e1 old overlay code is no longer used 2021-01-04 13:51:03 -06:00