diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index 06d2ab385..db72cb58d 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -456,6 +456,7 @@ CREATE TABLE `Monitors` (
`Enabled` tinyint(3) unsigned NOT NULL default '1',
`DecodingEnabled` tinyint(3) unsigned NOT NULL default '1',
`JanusEnabled` BOOLEAN NOT NULL default false,
+ `JanusAudioEnabled` BOOLEAN NOT NULL default false,
`LinkedMonitors` varchar(255),
`Triggers` set('X10') NOT NULL default '',
`EventStartCommand` VARCHAR(255) NOT NULL DEFAULT '',
diff --git a/db/zm_update-1.37.9.sql b/db/zm_update-1.37.9.sql
new file mode 100644
index 000000000..be7d2a9ec
--- /dev/null
+++ b/db/zm_update-1.37.9.sql
@@ -0,0 +1,18 @@
+--
+-- Update Monitors table to have JanusEnabled
+--
+
+SELECT 'Checking for JanusAudioEnabled in Monitors';
+SET @s = (SELECT IF(
+ (SELECT COUNT(*)
+ FROM INFORMATION_SCHEMA.COLUMNS
+ WHERE table_name = 'Monitors'
+ AND table_schema = DATABASE()
+ AND column_name = 'JanusAudioEnabled'
+ ) > 0,
+"SELECT 'Column JanusAudioEnabled already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD COLUMN `JanusAudioEnabled` BOOLEAN NOT NULL default false AFTER `JanusEnabled`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 454e7068c..1733dd24d 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -77,7 +77,7 @@ struct Namespace namespaces[] =
// This is the official SQL (and ordering of the fields) to load a Monitor.
// It will be used whereever a Monitor dbrow is needed. WHERE conditions can be appended
std::string load_monitor_sql =
-"SELECT `Id`, `Name`, `ServerId`, `StorageId`, `Type`, `Function`+0, `Enabled`, `DecodingEnabled`, `JanusEnabled`,"
+"SELECT `Id`, `Name`, `ServerId`, `StorageId`, `Type`, `Function`+0, `Enabled`, `DecodingEnabled`, `JanusEnabled`, `JanusAudioEnabled`,"
"`LinkedMonitors`, `EventStartCommand`, `EventEndCommand`, `AnalysisFPSLimit`, `AnalysisUpdateDelay`, `MaxFPS`, `AlarmMaxFPS`,"
"`Device`, `Channel`, `Format`, `V4LMultiBuffer`, `V4LCapturesPerFrame`, " // V4L Settings
"`Protocol`, `Method`, `Options`, `User`, `Pass`, `Host`, `Port`, `Path`, `SecondPath`, `Width`, `Height`, `Colours`, `Palette`, `Orientation`+0, `Deinterlacing`, "
@@ -307,6 +307,7 @@ Monitor::Monitor()
enabled(false),
decoding_enabled(false),
janus_enabled(false),
+ janus_audio_enabled(false),
//protocol
//method
//options
@@ -447,7 +448,7 @@ Monitor::Monitor()
/*
std::string load_monitor_sql =
- "SELECT Id, Name, ServerId, StorageId, Type, Function+0, Enabled, DecodingEnabled, JanusEnabled, LinkedMonitors, `EventStartCommand`, `EventEndCommand`, "
+ "SELECT Id, Name, ServerId, StorageId, Type, Function+0, Enabled, DecodingEnabled, JanusEnabled, JanusAudioEnabled, LinkedMonitors, `EventStartCommand`, `EventEndCommand`, "
"AnalysisFPSLimit, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS,"
"Device, Channel, Format, V4LMultiBuffer, V4LCapturesPerFrame, " // V4L Settings
"Protocol, Method, Options, User, Pass, Host, Port, Path, SecondPath, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, RTSPDescribe, "
@@ -501,6 +502,7 @@ void Monitor::Load(MYSQL_ROW dbrow, bool load_zones=true, Purpose p = QUERY) {
decoding_enabled = dbrow[col] ? atoi(dbrow[col]) : false; col++;
// See below after save_jpegs for a recalculation of decoding_enabled
janus_enabled = dbrow[col] ? atoi(dbrow[col]) : false; col++;
+ janus_audio_enabled = dbrow[col] ? atoi(dbrow[col]) : false; col++;
ReloadLinkedMonitors(dbrow[col]); col++;
event_start_command = dbrow[col] ? dbrow[col] : ""; col++;
@@ -1121,7 +1123,7 @@ bool Monitor::connect() {
#if HAVE_LIBCURL //janus setup. Depends on libcurl.
if (janus_enabled && (path.find("rtsp://") != std::string::npos)) {
if (add_to_janus() != 0) {
- if (add_to_janus() != 0) {
+ if (add_to_janus() != 0) { //The initial attempt may fail. This is a temporary workaround.
Warning("Failed to add monitor stream to Janus!");
}
}
@@ -3453,6 +3455,7 @@ int Monitor::add_to_janus() {
postData += rtsp_password;
postData += "\", \"id\" : ";
postData += std::to_string(id);
+ if (janus_audio_enabled) postData += ", \"audio\" : true";
postData += ", \"video\" : true}}";
curl_easy_setopt(curl, CURLOPT_URL,endpoint.c_str());
diff --git a/src/zm_monitor.h b/src/zm_monitor.h
index 0d63816e9..94c37affb 100644
--- a/src/zm_monitor.h
+++ b/src/zm_monitor.h
@@ -269,6 +269,7 @@ protected:
bool enabled; // Whether the monitor is enabled or asleep
bool decoding_enabled; // Whether the monitor will decode h264/h265 packets
bool janus_enabled; // Whether we set the h264/h265 stream up on janus
+ bool janus_audio_enabled; // Whether we tell Janus to try to include audio.
std::string protocol;
std::string method;
@@ -511,6 +512,18 @@ public:
inline bool DecodingEnabled() const {
return decoding_enabled;
}
+ bool JanusEnabled() {
+ return janus_enabled;
+ }
+ bool JanusAudioEnabled() {
+ return janus_audio_enabled;
+ }
+ bool OnvifEnabled() {
+ return onvif_event_listener;
+ }
+ bool OnvifHealthy() {
+ return ONVIF_Healthy;
+ }
inline const char *EventPrefix() const { return event_prefix.c_str(); }
inline bool Ready() const {
if ( image_count >= ready_count ) {
diff --git a/web/ajax/modals/function.php b/web/ajax/modals/function.php
index b23bbb649..c47664c4b 100644
--- a/web/ajax/modals/function.php
+++ b/web/ajax/modals/function.php
@@ -79,6 +79,16 @@ if ( !canEdit('Monitors') ) return;
}
?>
+
+
+
+
+'.$OLANG['FUNCTION_JANUS_AUDIO_ENABLED']['Help'].'
';
+ }
+?>
+