d41792ae00
Adds Janus options Profile-ID Override and Use RTSP Restream to work around camera issues
2022-08-09 00:54:41 -05:00
f4b8066d00
Add backtrace to invalid value for width
2022-08-03 12:28:39 -04:00
bfeee1ed09
rename Onvif_Alarm_Txt to ONVIF_Alarm_Text
2022-07-23 16:08:27 -04:00
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
2141a5dd1c
Don't include 0 width in janus video tag
2022-06-15 13:08:48 -04:00
c189250a61
Add AnalysisImage and options to MOnitor object
2022-06-15 11:27:48 -04:00
d97ef46b57
Add defaults for RecordingSource and AnalysisSource to prevent warnings when creating new monitor
2022-05-30 14:28:38 -04:00
e11030095c
Add mode=single option
2022-05-30 13:35:36 -04:00
acd63ee0d8
Don't assuming we want to communicate with zms if streaming.
2022-05-11 10:21:44 -04:00
997c1197cf
Implement decoding=Keyframes + OnDemand
2022-05-10 14:25:34 -04:00
84ae91fe24
Comment out width and height setting on the imageFrame
2022-04-28 15:45:35 -04:00
1eaeccc564
Handle zones not being set in options
2022-04-19 12:31:43 -04:00
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
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
723c10ca19
Cleanup options, add DecodingOptions
2022-03-28 17:45:01 -04:00
0397c4f7e8
Add MQTT_Enabled and MQTT_Subscriptions to Monitor object
2022-03-21 16:08:13 -04:00
23aa41091f
Add Trigger/etc to onMotion recording option
2022-03-20 19:13:46 -04:00
0c31e35b4e
Add classes to fields of monitor status so we can style them as needed
2022-03-04 12:06:49 -05:00
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
f66a463574
Merge branch 'master' into replace_function_concept
2022-02-08 12:07:30 -05:00
aad79d3407
Rename MonitorAnalysingOptions => AnalysingOptions as they will have to be prefixed with module name anyways.
2022-02-08 11:19:36 -05:00
69053424cd
When adding a new monitor, ModelId and ManufacturerId are not defined, so handle that
2022-02-06 19:06:35 -05:00
bd68b9e3af
Not ready for OutputSource yet
2022-02-02 17:10:05 -05:00
10e39b3b13
:wqMerge branch 'master' into replace_function_concept
2022-02-02 17:08:01 -05:00
23bfbcd6ce
Merge branch 'master' into multistream
2022-01-26 10:13:20 -05:00
ec9403fb6f
Adds Amcrest On-camera Motion Detection
2022-01-25 22:38:00 -06:00
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
fb832e7d1b
Adds janus_enable_audio, a switch to try to enable audio in live stream viewing.
2022-01-19 00:14:52 -06:00
3835087c9d
Merge branch 'master' into multistream
2022-01-18 20:16:08 -05:00
3a9c16aeea
First working Janus build
2022-01-10 23:22:37 -06:00
fd3a70172d
Merge branch 'master' into multistream
2022-01-10 17:51:50 -05:00
1333d8c751
Adds ONVIF Motion Detection Support
2022-01-06 16:45:15 -06:00
6bd04de5f6
Merge branch 'master' into multistream
2021-12-31 17:53:36 -05:00
21218491f7
Add EventStartCommand and EventEndCommand to monitors ui
2021-11-26 19:22:07 -05:00
98e29e7ef6
implement UrlToZMS in Monitor
2021-11-12 15:11:48 -05:00
fb67c6a3e7
Add defaults for Capturing, Analysing, Recording
2021-10-25 16:53:42 -04:00
8d1c45162d
Add functions to return options for Capturing, Analysing, AnalysisSource, Recording, RecordingSource
2021-10-16 20:35:11 -04:00
7ca7d40b6f
Add defaults for ModelId and ManufacturerId. Fixes the methods for loading them
2021-09-25 10:32:04 -04:00
227e5794fa
Merge branch 'master' into add_manufacturer_model_to_monitors
2021-09-08 18:32:46 -04:00
b2415643f6
Add missing Importance member
2021-09-08 13:57:46 -04:00
eb1124c406
Spacing and quotes
2021-08-18 10:53:59 -04:00
301d8fa5fa
Change monitor->canView semantics so that a specified monitorId trumps the Monitors:None setting. This is so that the console can be hidden, but the group dropdown still gets populated.
2021-08-18 10:53:59 -04:00
3bb2b804b3
Include Model and Manufacturer to includes in Monitor.php
2021-07-07 09:46:36 -04:00
096581b7f1
add getMonitorStatuses function to return string values for status numbers
2021-05-28 12:29:30 -04:00
9254c99ab8
Add ModectDuringPTZ
2021-04-23 14:52:29 -04:00
3335976cba
implement remote api Trigger support.
2021-04-12 15:59:31 -04:00
1b50314f9e
Add DisableAlarms function
2021-04-12 15:59:31 -04:00
3dcb71933e
Add event summary fields to Monitor Object
2021-04-09 19:46:25 -04:00
7e3d6f867e
Set the default crf so that encoding works
2021-04-01 11:53:57 -04:00
beb7a75d5a
Implement canView for Monitors
2021-03-30 11:52:04 -04:00
8e1b2ccbc7
Add MaxImageBufferCount
2021-03-26 17:02:17 -04:00
c347261e19
Change default of ImageBufferCount to 3
2021-03-22 12:05:36 -04:00
6682ec7da5
Add Snapshots and Snapshot_Events Tables. Add HomeView to Users.
2021-03-12 09:26:23 -05:00
ce4e133c94
Add loading SecondPath in monitor
2021-03-03 09:56:33 -05:00
bb747bfc6d
Add RTSPStreamName fields
2021-03-01 16:46:48 -05:00
c8af90fd24
Add RTSP Server checkbox
2021-02-02 23:19:52 -05:00
105eff7a21
Remove references to zma
2021-02-01 17:29:16 -05:00
da7d9c3756
Add default for Monitor Name
2021-02-01 16:43:24 -05:00
a1917d83d0
Merge branch 'master' into zma_to_thread
2020-12-22 19:52:09 -05:00
381cc30e5d
Set default value for DefaultScale to 0 which is ScaleToFit
2020-12-18 10:54:08 -05:00
0702b64cc4
Merge branch 'master' into zma_to_thread
2020-12-15 10:51:40 -05:00
ced396e437
Add DecodingEnabled to Monitors
2020-12-10 14:06:26 -05:00
df783f4835
Merge branch 'master' into zma_to_thread
2020-11-12 12:53:55 -05:00
59403dc11b
Move event stat totals to Monitor_Status.
2020-11-06 14:00:18 -05:00
2eda49333f
Merge branch 'master' into zma_to_thread
2020-10-20 16:20:29 -04:00
57a1a383ad
Merge branch 'release-1.34'
2020-10-14 11:32:50 -04:00
e9fb150880
Improve error message when a row doesn't exist in the Monitor_Status table
2020-10-14 11:32:33 -04:00
10c0a6617c
Return Debug to a regular function to match other logging functions. Since we switched to using namespaces we no longer clash with cake_php.
2020-10-14 10:39:25 -04:00
24d8b99eea
test for property_exists to quiet errors
2020-09-29 16:47:49 -04:00
a39a656373
Merge branch 'master' into zma_to_thread
2020-09-29 11:02:40 -04:00
624bcdcde0
Add Latitude and Longitude to Monitors and monitor edit as well as using the geolocation api to auto-populate them
2020-09-24 09:01:30 -04:00
3e3af0bca5
Fix zmcontrol.pl command line to not use = to match with usage elsewhere
2020-09-21 11:24:17 -04:00
42dc4e46b1
add canEdit method to Monitor object
2020-09-17 20:56:04 -04:00
6f5acece66
FIx Record Entry
2020-09-03 18:20:51 -04:00
fb9129a4d3
Add missing Mocord option
2020-09-03 10:40:10 -04:00
c0b54ee790
introduce connKey method. Use it to generate a connKey if one hasn't been assigned yet.
2020-09-02 13:56:55 -04:00
762bea0761
Bulk load monitor/Group relationships. Instead of using DESCRIBE Monitors Function, use a new function getMonitorFUnctionTypes to get this data for dropdown purposeses. Reduces db hits a lot.
2020-08-31 18:30:05 -04:00
11f165a99f
remove width and height from zms url. zms doesn't support them and having them in the url is confusing
2020-08-27 10:29:50 -04:00
3c1651d98f
in getStreamSrc if scale isn't set figure it out from width and height if passed
2020-08-24 14:35:59 -04:00
63da7f0074
Fix unsetting scale, width and height when generating url to zms. width and height are normally pixels but maybe someday could be percent.
2020-08-10 14:02:25 -04:00
81b55589db
Fix unsetting scale, width and height when generating url to zms. width and height are normally pixels but maybe someday could be percent.
2020-08-10 13:59:47 -04:00
869860bb26
Merge branch 'master' into zma_to_thread
2020-07-21 17:49:39 -04:00
7575afc8d5
Merge branch 'master' into zma_to_thread
2020-07-21 17:38:32 -04:00
d716d1d686
Merge branch 'release-1.34'
2020-07-20 16:25:41 -04:00
4e2633d22b
Update code to make calls to api on remote servers
2020-07-20 16:25:29 -04:00
cb0e54d3be
consider Monitor->Controllable as well in stopping zmtrack. Don't complain about ControlCommand being told to start/stop
2020-07-20 10:23:26 -04:00
dcd67a1acf
Remove args with non-sensical values from cgi params as a micro-opt
2020-07-13 14:50:21 -04:00
69e5feb28b
Add ONVIF* to Monitor object
2020-05-12 15:47:00 -04:00
4ff341a0f5
Merge branch 'master' into zma_to_thread
2020-05-02 18:03:42 -04:00
28a3691b9c
Merge branch 'release-1.34'
2020-05-01 19:46:38 -04:00
9dbeaa2c7b
Add default for Orientation. Fixes saving WebSite type monitors
2020-05-01 15:32:26 -04:00
82188c266e
Fixup Monitor->sendControlCommand. start/stop/quit should be run through zmdc.pl now instead of talking directly to zmcontrol.
2020-05-01 13:23:39 -04:00
cb44f2c5de
Fixup Monitor->sendControlCommand. start/stop/quit should be run through zmdc.pl now instead of talking directly to zmcontrol.
2020-04-29 16:30:59 -04:00
f5bf474ba6
filter bad characters out of Monitor Name
2020-04-23 14:59:21 -04:00
81ed022d5a
Add a filter_regexp to Monitor Name
2020-04-10 12:16:32 -04:00
eec634c1b0
Add Source() support for VNC type
2020-03-30 10:10:06 -04:00
af36cc3e52
Fix starting and stopping zmcontrol processes across servers.
2020-03-26 13:57:00 -04:00
8fcd5b37ed
API on remote server requires RELAY not be none. Log an error. Fix url being ruined by auth credentials
2020-02-25 17:15:59 -05:00
7787ba1040
Fix adding auth string screwing up url to remote api in zmaControl and zmcControl
2020-02-25 17:15:45 -05:00
54a6dfff66
API on remote server requires RELAY not be none. Log an error. Fix url being ruined by auth credentials
2020-02-25 17:12:48 -05:00
Jonathan Bennett
Isaac Connor
ovargasp
Isaac Connor