ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:ZoneMinder/zoneminder

pull/3644/merge
Isaac Connor 2023-01-04 13:10:15 -05:00
parent ddf0996bd9 62c084b225
commit 18b8080569
4 changed files with 51 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/zm_ffmpeg_input.cpp
View File

@ -106,7 +106,7 @@ int FFmpeg_Input::Open(const char *filepath) {
}
zm_dump_codec(streams[i].context);
if (!(streams[i].context->time_base.num && streams[i].context->time_base.den)) {
Warning("Setting to default time base");
Debug(1, "Setting to default time base");
streams[i].context->time_base.num = 1;
streams[i].context->time_base.den = 90000;
}

2
web/skins/classic/views/js/event.js
View File

@ -1193,7 +1193,7 @@ function initPage() {
}
$j('#deleteConfirm').modal('show');
});
addEventListener('fullscreenchange', fullscreenChangeEvent);
document.addEventListener('fullscreenchange', fullscreenChangeEvent);
} // end initPage
document.getElementById('toggleZonesButton').addEventListener('click', toggleZones);

39
web/skins/classic/views/js/monitor.js
View File

@ -278,18 +278,9 @@ function initPage() {
});
//manage the Janus settings div
if (document.getElementsByName("newMonitor[JanusEnabled]")[0].checked) {
document.getElementById("FunctionJanusAudioEnabled").hidden = false;
document.getElementById("FunctionJanusProfileOverride").hidden = false;
document.getElementById("FunctionJanusUseRTSPRestream").hidden = false;
} else {
document.getElementById("FunctionJanusAudioEnabled").hidden = true;
document.getElementById("FunctionJanusProfileOverride").hidden = true;
document.getElementById("FunctionJanusUseRTSPRestream").hidden = true;
}
document.getElementsByName("newMonitor[JanusEnabled]")[0].addEventListener('change', function() {
if (this.checked) {
if (document.getElementsByName("newMonitor[JanusEnabled]")) {
if (document.getElementsByName("newMonitor[JanusEnabled]")[0].checked) {
document.getElementById("FunctionJanusAudioEnabled").hidden = false;
document.getElementById("FunctionJanusProfileOverride").hidden = false;
document.getElementById("FunctionJanusUseRTSPRestream").hidden = false;
@ -298,14 +289,26 @@ function initPage() {
document.getElementById("FunctionJanusProfileOverride").hidden = true;
document.getElementById("FunctionJanusUseRTSPRestream").hidden = true;
}
});
const Janus_Use_RTSP_Restream = document.getElementsByName('newMonitor[Janus_Use_RTSP_Restream]');
if (Janus_Use_RTSP_Restream.length) {
Janus_Use_RTSP_Restream[0].onclick = Janus_Use_RTSP_Restream_onclick;
console.log("Setup Janus_RTSP_Restream.onclick");
} else {
console.log("newMonitor[Janus_Use_RTSP_Restream] not found");
document.getElementsByName("newMonitor[JanusEnabled]")[0].addEventListener('change', function() {
if (this.checked) {
document.getElementById("FunctionJanusAudioEnabled").hidden = false;
document.getElementById("FunctionJanusProfileOverride").hidden = false;
document.getElementById("FunctionJanusUseRTSPRestream").hidden = false;
} else {
document.getElementById("FunctionJanusAudioEnabled").hidden = true;
document.getElementById("FunctionJanusProfileOverride").hidden = true;
document.getElementById("FunctionJanusUseRTSPRestream").hidden = true;
}
});
const Janus_Use_RTSP_Restream = document.getElementsByName('newMonitor[Janus_Use_RTSP_Restream]');
if (Janus_Use_RTSP_Restream.length) {
Janus_Use_RTSP_Restream[0].onclick = Janus_Use_RTSP_Restream_onclick;
console.log("Setup Janus_RTSP_Restream.onclick");
} else {
console.log("newMonitor[Janus_Use_RTSP_Restream] not found");
}
}
// Amcrest API controller

57
web/skins/classic/views/js/montagereview.js.php
View File

@ -50,7 +50,6 @@ var timeLabelsFractOfRow = 0.9;
// Because we might not have time as the criteria, figure out the min/max time when we run the query
// This builds the list of events that are eligible from this range
$index = 0;
@ -59,38 +58,38 @@ $maxScore = 0;
if ( !$liveMode ) {
$result = dbQuery($eventsSql);
if ( !$result ) {
ZM\Fatal('SQL-ERR');
return;
}
$EventsById = array();
while ( $event = $result->fetch(PDO::FETCH_ASSOC) ) {
$event_id = $event['Id'];
$EventsById[$event_id] = $event;
}
$next_frames = array();
if ( $result = dbQuery($framesSql) ) {
$next_frame = null;
while ( $frame = $result->fetch(PDO::FETCH_ASSOC) ) {
$event_id = $frame['EventId'];
$event = &$EventsById[$event_id];
$frame['TimeStampSecs'] = $event['StartTimeSecs'] + $frame['Delta'];
if ( !isset($event['FramesById']) ) {
// Please note that this is the last frame as we sort DESC
$event['FramesById'] = array();
$frame['NextTimeStampSecs'] = $event['EndTimeSecs'];
} else {
$frame['NextTimeStampSecs'] = $next_frames[$frame['EventId']]['TimeStampSecs'];
$frame['NextFrameId'] = $next_frames[$frame['EventId']]['Id'];
}
$event['FramesById'] += array($frame['Id']=>$frame);
$next_frames[$frame['EventId']] = &$event['FramesById'][$frame['Id']];
if ( !$result ) {
ZM\Error('SQL-ERR');
} else {
while ( $event = $result->fetch(PDO::FETCH_ASSOC) ) {
$event_id = $event['Id'];
$EventsById[$event_id] = $event;
}
} // end if dbQuery
$next_frames = array();
if ( $result = dbQuery($framesSql) ) {
$next_frame = null;
while ( $frame = $result->fetch(PDO::FETCH_ASSOC) ) {
$event_id = $frame['EventId'];
$event = &$EventsById[$event_id];
$frame['TimeStampSecs'] = $event['StartTimeSecs'] + $frame['Delta'];
if ( !isset($event['FramesById']) ) {
// Please note that this is the last frame as we sort DESC
$event['FramesById'] = array();
$frame['NextTimeStampSecs'] = $event['EndTimeSecs'];
} else {
$frame['NextTimeStampSecs'] = $next_frames[$frame['EventId']]['TimeStampSecs'];
$frame['NextFrameId'] = $next_frames[$frame['EventId']]['Id'];
}
$event['FramesById'] += array($frame['Id']=>$frame);
$next_frames[$frame['EventId']] = &$event['FramesById'][$frame['Id']];
}
} // end if dbQuery
}
$events_by_monitor_id = array();