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

Rename v_image to y_image cuz that's what it is

This commit is contained in:
Isaac Connor 2022-02-12 22:14:51 -05:00
parent 552974c5b7
commit e3631099f6
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/zm_monitor.cpp
View File

@ -1813,9 +1813,9 @@ bool Monitor::Analyse() {
((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUVJ420P)
) ) {
Debug(1, "assigning refimage from v-channel");
Image v_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);
ref_image.Assign(v_image);
ref_image.Assign(y_image);
} else if (snap->image) {
Debug(1, "assigning refimage from snap->image");
ref_image.Assign(*(snap->image));
@ -1904,8 +1904,8 @@ bool Monitor::Analyse() {
((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUVJ420P)
) ) {
Debug(1, "assigning refimage from v-channel");
Image v_image(snap->in_frame->width, snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[0], 0);
ref_image.Assign(v_image);
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);
} else {
Debug(1, "assigning refimage from snap->image");
ref_image.Assign(*(snap->image));
@ -1919,8 +1919,8 @@ bool Monitor::Analyse() {
||
((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUVJ420P)
) ) {
Image v_image(snap->in_frame->width, snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[0], 0);
snap->score = DetectMotion(v_image, zoneSet);
Image y_image(snap->in_frame->width, snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[0], 0);
snap->score = DetectMotion(y_image, zoneSet);
} else {
snap->score = DetectMotion(*(snap->image), zoneSet);
}
@ -2144,8 +2144,8 @@ bool Monitor::Analyse() {
((AVPixelFormat)snap->in_frame->format == AV_PIX_FMT_YUVJ420P)
) ) {
Debug(1, "Assigning from vchannel");
Image v_image(snap->in_frame->width, snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[0], 0);
ref_image.Assign(v_image);
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);
} else if (snap->image) {
Debug(1, "Assigning");
ref_image.Assign(*(snap->image));
@ -2159,8 +2159,8 @@ bool Monitor::Analyse() {
)
) {
Debug(1, "Blending from vchannel");
Image v_image(snap->in_frame->width, snap->in_frame->height, 1, ZM_SUBPIX_ORDER_NONE, snap->in_frame->data[0], 0);
ref_image.Blend(v_image, ( state==ALARM ? alarm_ref_blend_perc : ref_blend_perc ));
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 ));
} else if (snap->image) {
Debug(1, "Blending because %p and format %d != %d, %d", snap->in_frame,
snap->in_frame->format,