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

Disable alleged y-channel image motion detection. Doesn't work.

This commit is contained in:
Isaac Connor 2022-02-03 11:57:00 -05:00
parent 838704e58e
commit 67ac0fdffd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/zm_monitor.cpp
View File

@ -1996,7 +1996,7 @@ bool Monitor::Analyse() {
} else { } else {
event->addNote(SIGNAL_CAUSE, "Reacquired"); event->addNote(SIGNAL_CAUSE, "Reacquired");
} }
if (snap->in_frame && ( if (0 and snap->in_frame && (
((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUV420P) ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUV420P)
|| ||
((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUVJ420P) ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUVJ420P)
@ -2087,7 +2087,7 @@ bool Monitor::Analyse() {
// decoder may not have been able to provide an image // decoder may not have been able to provide an image
if (!ref_image.Buffer()) { if (!ref_image.Buffer()) {
Debug(1, "Assigning instead of Detecting"); Debug(1, "Assigning instead of Detecting");
if (snap->in_frame && ( if (0 and snap->in_frame && (
((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUV420P) ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUV420P)
|| ||
((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUVJ420P) ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUVJ420P)
@ -2103,7 +2103,7 @@ bool Monitor::Analyse() {
} else if (!(analysis_image_count % (motion_frame_skip+1))) { } else if (!(analysis_image_count % (motion_frame_skip+1))) {
Debug(1, "Detecting motion on image %d, image %p", snap->image_index, snap->image); Debug(1, "Detecting motion on image %d, image %p", snap->image_index, snap->image);
// Get new score. // Get new score.
if (snap->in_frame && ( if (0 and snap->in_frame && (
((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUV420P) ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUV420P)
|| ||
((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUVJ420P) ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUVJ420P)
@ -2331,7 +2331,7 @@ bool Monitor::Analyse() {
if (function == MODECT or function == MOCORD) { if (function == MODECT or function == MOCORD) {
if (!ref_image.Buffer()) { if (!ref_image.Buffer()) {
if (snap->in_frame && ( if (0 snap->in_frame && (
((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUV420P) ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUV420P)
|| ||
((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUVJ420P) ((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUVJ420P)