ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't return mp4 if objdetect is used

This commit is contained in:
Pliable Pixels 2020-03-14 15:00:33 -04:00
parent 4342506e5b
commit 921c4c5bbd
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
web/views/image.php
View File

@ -79,15 +79,12 @@ if ( empty($_REQUEST['path']) ) {
if ( $_REQUEST['fid'] == 'objdetect' ) { if ( $_REQUEST['fid'] == 'objdetect' ) {
// if animation file is found, return that, else return image // if animation file is found, return that, else return image
$path_anim_mp4 = $Event->Path().'/objdetect.mp4'; // we are only looking for GIF or jpg here, not mp4
// as most often, browsers asking for this link will be expecting
// media types that can be rendered as <img src=>
$path_anim_gif = $Event->Path().'/objdetect.gif'; $path_anim_gif = $Event->Path().'/objdetect.gif';
$path_image = $Event->Path().'/objdetect.jpg'; $path_image = $Event->Path().'/objdetect.jpg';
if ( file_exists($path_anim_mp4)) { if (file_exists($path_anim_gif)) {
// we found the animation mp4 file
$path = $path_anim_mp4;
ZM\Logger::Debug("Animation file found at $path");
$media_type = 'video/mp4';
} else if (file_exists($path_anim_gif)) {
// we found the animation gif file // we found the animation gif file
$media_type = 'image/gif'; $media_type = 'image/gif';
ZM\Logger::Debug("Animation file found at $path"); ZM\Logger::Debug("Animation file found at $path");
@ -326,7 +323,7 @@ if ( !empty($_REQUEST['height']) ) {
if ( $errorText ) { if ( $errorText ) {
ZM\Error($errorText); ZM\Error($errorText);
} else { } else {
header("Content-type: $image_type"); header("Content-type: $media_type");
if ( ( $scale==0 || $scale==100 ) && ($width==0) && ($height==0) ) { if ( ( $scale==0 || $scale==100 ) && ($width==0) && ($height==0) ) {
# This is so that Save Image As give a useful filename # This is so that Save Image As give a useful filename
if ( $Event ) { if ( $Event ) {