Commit Graph

275 Commits

Author SHA1 Message Date
baudneo
aab62c5a7e Add Janus RTSP session timeout to PHP (front end) ⚗️
Signed-off-by: baudneo <86508179+baudneo@users.noreply.github.com>
2023-01-09 17:57:26 -07:00
Isaac Connor
f06e11a097 Add SectionLengthWarn, use it to disable warnings in logs about section length being exceeded. 2023-01-07 12:33:42 -05:00
Isaac Connor
ea6d999654 Must use false === when using array_search because first element returns 0 2022-11-02 17:42:32 -04:00
Isaac Connor
ab3e1811d3 fix canEdit, rough in effectPermission 2022-11-02 15:52:37 -04:00
Isaac Connor
63769a2082 Fix missing ) 2022-11-02 13:26:34 -04:00
Isaac Connor
24a83efa79 Improve Monitor canView and canEdit. If the user is not specified, use the cached auth routines in includs/auth.php. Otherwise replicate the logic for the specfied user. 2022-11-02 13:25:44 -04:00
Isaac Connor
2f295a2f55 Make Monitor::Server always return a Server object so we don't have to test for null 2022-09-30 09:57:21 -04:00
Isaac Connor
8d56949800 Deal with structure of json response from API when getting Janus_Pin 2022-09-28 18:36:47 -04:00
Isaac Connor
f5bdbcf0bd Use new Server::SendToApi to reduce duplicated code. If Janus Not enabled, then don't both with Janus_Pin. If Server is remote, use API to get Janus_Pin. Implementing the API side is left as an exercise. 2022-09-28 17:41:46 -04:00
Isaac Connor
d32fe1cf55 Add Janus_RTSP_User and related UI code 2022-09-12 10:34:26 -04:00
Isaac Connor
8ba1bbc63c Set new defaults: Only analysis jpegs, and passthrough on. Label Size => Default. Fix warnings when creating a new MOnitor because Path, User, Pass are unset. 2022-09-09 11:29:32 -04:00
Isaac Connor
9276ae7d67 calling trim on null is deprecated 2022-09-08 15:11:53 -04:00
Jonathan Bennett
c35bbc8c30 Adds the Janus_pin to shared_memory, and a -j to zmu to fetch it 2022-09-07 15:49:47 -05:00
Isaac Connor
d76c425057 Fix saving monitor due to MQTT being empty 2022-09-06 11:22:04 -04:00
Isaac Connor
29750a56e7 Merge branch 'master' into add_mqtt 2022-08-25 18:37:54 -04:00
Isaac Connor
6ae05d7009 Rework to not use strlen and strlen now complains if you pass it null 2022-08-22 11:46:57 -04:00
Isaac Connor
d51a2eb8a5 Merge pull request #3537 from parvit/issue-695
Added configuring of authentication for rstp cameras
2022-08-21 18:08:00 -04:00
parvit (Vittorio Parrella)
442d7b1c89 integrated dynamic client and server update of path, user and password values 2022-08-18 05:05:18 -04:00
Isaac Connor
4bd7fc8fcf Clear out width=auto and height=auto to prevent warnings in logs 2022-08-17 15:34:39 -04:00
Isaac Connor
0078a6f639 Log entire backtrace when invalid value for width 2022-08-10 09:18:39 -04:00
Jonathan Bennett
d41792ae00 Adds Janus options Profile-ID Override and Use RTSP Restream to work around camera issues 2022-08-09 00:54:41 -05:00
Isaac Connor
f4b8066d00 Add backtrace to invalid value for width 2022-08-03 12:28:39 -04:00
Isaac Connor
bfeee1ed09 rename Onvif_Alarm_Txt to ONVIF_Alarm_Text 2022-07-23 16:08:27 -04:00
ovargasp
981769b9db Allows users to set an specific "Onvif alarm text" for each monitor (#3535)
* Allows users to set an specific "Onvif alarm text" for each monitor

With this personalization the cameras that use strings different to "MotionAlarm"
such as Dahua, will be able to process their Onvif alarms. To make it easier, the change
sets a default "Alarm Text"  value for it to work out of the box and then allows to
modify it according to the particular necessities of each brand. It consists of
a new column on table Monitors, changes on Monitors.h, Monitors.cpp and a change
on UI to manage the value of Alarm Text per camera.

Updated es_la.php language file.

Co-authored-by: ovargasp <ovargasp@hoitmail.com>
2022-07-20 12:51:13 -05:00
Isaac Connor
2141a5dd1c Don't include 0 width in janus video tag 2022-06-15 13:08:48 -04:00
Isaac Connor
c189250a61 Add AnalysisImage and options to MOnitor object 2022-06-15 11:27:48 -04:00
Isaac Connor
d97ef46b57 Add defaults for RecordingSource and AnalysisSource to prevent warnings when creating new monitor 2022-05-30 14:28:38 -04:00
Isaac Connor
e11030095c Add mode=single option 2022-05-30 13:35:36 -04:00
Isaac Connor
acd63ee0d8 Don't assuming we want to communicate with zms if streaming. 2022-05-11 10:21:44 -04:00
Isaac Connor
997c1197cf Implement decoding=Keyframes + OnDemand 2022-05-10 14:25:34 -04:00
Isaac Connor
84ae91fe24 Comment out width and height setting on the imageFrame 2022-04-28 15:45:35 -04:00
Isaac Connor
1eaeccc564 Handle zones not being set in options 2022-04-19 12:31:43 -04:00
Isaac Connor
7b5ee86ee8 Move svg zone display into Monitor->getStreamHTML. Remove most of it because scaling is now automatic. Move styling to css 2022-04-10 18:54:01 -04:00
Isaac Connor
e8391ad0be Move collapsed status to Monitor.php and put back setting width and height on the monitorStream container. 2022-04-10 17:28:38 -04:00
Isaac Connor
723c10ca19 Cleanup options, add DecodingOptions 2022-03-28 17:45:01 -04:00
Isaac Connor
0397c4f7e8 Add MQTT_Enabled and MQTT_Subscriptions to Monitor object 2022-03-21 16:08:13 -04:00
Isaac Connor
23aa41091f Add Trigger/etc to onMotion recording option 2022-03-20 19:13:46 -04:00
Isaac Connor
0c31e35b4e Add classes to fields of monitor status so we can style them as needed 2022-03-04 12:06:49 -05:00
Isaac Connor
13251b133a Make getMonitorCapturingOptions a member of the class, so can call it getCapturingOptions. Same with Analysing and Recording options 2022-02-27 14:03:37 -05:00
Isaac Connor
f66a463574 Merge branch 'master' into replace_function_concept 2022-02-08 12:07:30 -05:00
Isaac Connor
aad79d3407 Rename MonitorAnalysingOptions => AnalysingOptions as they will have to be prefixed with module name anyways. 2022-02-08 11:19:36 -05:00
Isaac Connor
69053424cd When adding a new monitor, ModelId and ManufacturerId are not defined, so handle that 2022-02-06 19:06:35 -05:00
Isaac Connor
bd68b9e3af Not ready for OutputSource yet 2022-02-02 17:10:05 -05:00
Isaac Connor
10e39b3b13 :wqMerge branch 'master' into replace_function_concept 2022-02-02 17:08:01 -05:00
Isaac Connor
23bfbcd6ce Merge branch 'master' into multistream 2022-01-26 10:13:20 -05:00
Jonathan Bennett
ec9403fb6f Adds Amcrest On-camera Motion Detection 2022-01-25 22:38:00 -06:00
Isaac Connor
a57206ef54 Implement getMonitorStateHTML to synchronize it between montage and live view, cycle etc. Reuseable code. Also the structure is required by MonitorStream.js 2022-01-20 09:47:36 -05:00
Jonathan Bennett
fb832e7d1b Adds janus_enable_audio, a switch to try to enable audio in live stream viewing. 2022-01-19 00:14:52 -06:00
Isaac Connor
3835087c9d Merge branch 'master' into multistream 2022-01-18 20:16:08 -05:00
Jonathan Bennett
3a9c16aeea First working Janus build 2022-01-10 23:22:37 -06:00