diff --git a/web/includes/actions.php b/web/includes/actions.php index 5f5b56db8..ff677c200 100644 --- a/web/includes/actions.php +++ b/web/includes/actions.php @@ -422,7 +422,8 @@ if ( !empty($action) ) 'TrackMotion' => 'toggle', 'Enabled' => 'toggle', 'DoNativeMotDet' => 'toggle', - 'Exif' => 'toggle' + 'Exif' => 'toggle', + 'RTSPDescribe' => 'toggle', ); $columns = getTableColumns( 'Monitors' ); diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php index bf0258caf..76a71e301 100644 --- a/web/lang/en_gb.php +++ b/web/lang/en_gb.php @@ -256,6 +256,7 @@ $SLANG = array( 'DefaultScale' => 'Default Scale', 'DefaultView' => 'Default View', 'Deinterlacing' => 'Deinterlacing', + 'RTSPDescribe' => 'Use RTSP Response Media URL', 'Delay' => 'Delay', 'DeleteAndNext' => 'Delete & Next', 'DeleteAndPrev' => 'Delete & Prev', @@ -903,7 +904,13 @@ $OLANG = array( 'OPTIONS_EXIF' => array( 'Help' => "Enable this option to embed EXIF data into each jpeg frame." ), - + 'OPTIONS_RTSPDESCRIBE' => array( + 'Help' => "Sometimes, during the intial RTSP handshake, the camera will send an updated media URL. ". + "Enable this option to tell ZoneMinder to use this URL. Disable this option to ignore the ". + "value from the camera and use the value as entered in the monitor configuration~~~~". + "Generally this should be enabled. However, there are cases where the camera can get its". + "own URL incorrect, such as when the camera is streaming through a firewall" + ), // 'LANG_DEFAULT' => array( // 'Prompt' => "This is a new prompt for this option", diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php index 5920409ad..369319608 100644 --- a/web/skins/classic/views/monitor.php +++ b/web/skins/classic/views/monitor.php @@ -78,6 +78,7 @@ if ( ! empty($_REQUEST['mid']) ) { 'Height' => "240", 'Orientation' => "0", 'Deinterlacing' => 0, + 'RTSPDescribe' => 0, 'LabelFormat' => '%N - %d/%m/%y %H:%M:%S', 'LabelX' => 0, 'LabelY' => 0, @@ -563,6 +564,12 @@ if ( $tab != 'source' ) + + @@ -823,6 +830,14 @@ switch ( $tab ) + +  () checked="checked"/> +