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

Use a define to disable y-channel use

This commit is contained in:
Isaac Connor 2022-02-28 12:02:09 -05:00
parent a32b77510d
commit e31b18a1a6
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/zm_monitor.cpp
View File

@ -75,6 +75,8 @@ struct Namespace namespaces[] =
}; };
#endif #endif
#define USE_Y_CHANNEL 0
// This is the official SQL (and ordering of the fields) to load a Monitor. // 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 // It will be used whereever a Monitor dbrow is needed. WHERE conditions can be appended
std::string load_monitor_sql = std::string load_monitor_sql =
@ -1807,12 +1809,12 @@ bool Monitor::Analyse() {
} else { } else {
event->addNote(SIGNAL_CAUSE, "Reacquired"); event->addNote(SIGNAL_CAUSE, "Reacquired");
} }
if (snap->in_frame && ( if (USE_Y_CHANNEL && 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)
) ) { ) ) {
Debug(1, "assigning refimage from v-channel"); Debug(1, "assigning refimage from y-channel");
Image y_image(snap->in_frame->width, Image y_image(snap->in_frame->width,
snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[0], 0); snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[0], 0);
ref_image.Assign(y_image); ref_image.Assign(y_image);
@ -1895,12 +1897,12 @@ 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 (USE_Y_CHANNEL && 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)
) ) { ) ) {
Debug(1, "assigning refimage from v-channel"); Debug(1, "assigning refimage from y-channel");
Image y_image(snap->in_frame->width, snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[0], 0); Image y_image(snap->in_frame->width, snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[0], 0);
ref_image.Assign(y_image); ref_image.Assign(y_image);
} else { } else {
@ -1911,7 +1913,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 (USE_Y_CHANNEL && 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)
@ -2139,12 +2141,12 @@ bool Monitor::Analyse() {
if ((analysing == ANALYSING_ALWAYS) and snap->image) { if ((analysing == ANALYSING_ALWAYS) and snap->image) {
if (!ref_image.Buffer()) { if (!ref_image.Buffer()) {
if (snap->in_frame && ( if (USE_Y_CHANNEL && 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)
) ) { ) ) {
Debug(1, "Assigning from vchannel"); Debug(1, "Assigning from y-channel");
Image y_image(snap->in_frame->width, snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[0], 0); Image y_image(snap->in_frame->width, snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[0], 0);
ref_image.Assign(y_image); ref_image.Assign(y_image);
} else if (snap->image) { } else if (snap->image) {
@ -2152,14 +2154,14 @@ bool Monitor::Analyse() {
ref_image.Assign(*(snap->image)); ref_image.Assign(*(snap->image));
} }
} else { } else {
if (snap->in_frame && if (USE_Y_CHANNEL && 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)
) )
) { ) {
Debug(1, "Blending from vchannel"); Debug(1, "Blending from y-channel");
Image y_image(snap->in_frame->width, snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[0], 0); Image y_image(snap->in_frame->width, snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[0], 0);
ref_image.Blend(y_image, ( state==ALARM ? alarm_ref_blend_perc : ref_blend_perc )); ref_image.Blend(y_image, ( state==ALARM ? alarm_ref_blend_perc : ref_blend_perc ));
} else if (snap->image) { } else if (snap->image) {