Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added cropping of capture/background #153

Draft
wants to merge 26 commits into
base: main
Choose a base branch
from
Draft

added cropping of capture/background #153

Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
127009b
added cropping of capture/background
Sep 1, 2022
65627e8
Suggestions mostly added, a little bugfix
Sep 1, 2022
7b41672
Suggestions mostly added, a little bugfix
Sep 2, 2022
cb0fe4f
fix typo
Sep 2, 2022
3eeb58b
typo correction
Sep 2, 2022
01e9a75
fix typo
Sep 2, 2022
f81e26e
Syntax modified
Sep 2, 2022
112e979
Syntax modified
Sep 2, 2022
22472ad
correction
Sep 2, 2022
7dc9bcc
coorection as suggested
Sep 2, 2022
6894b3e
coorection as suggested
Sep 2, 2022
1769f7e
suggestion processed
Sep 3, 2022
e9a5242
bug fixed
Sep 4, 2022
0f62a57
bug fixed
Sep 4, 2022
81c1c83
bug fix
Sep 4, 2022
4c5f72c
bug fix
Sep 4, 2022
ffb9883
type
Sep 4, 2022
7353ff8
typo
Sep 4, 2022
5a92b93
typo
Sep 4, 2022
5ee0d4a
bug fixed
Sep 8, 2022
44dbb6a
Fix and suggestion considered
Sep 10, 2022
4c6431e
little cleanup
Sep 10, 2022
975b96f
little corrections
Sep 11, 2022
481cb47
little corrections
Sep 11, 2022
f80a8a6
bettet video/image detection, gstreamer support foranimated gif
Oct 1, 2022
ea1e350
better crop handling
Oct 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion app/background.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,10 @@ int grab_background(std::shared_ptr<background_t> pbkd, int width, int height, c
} else {
// resize still image as requested into out
cv::Rect crop = calcCropping(pbkd->raw.cols, pbkd->raw.rows, width, height);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

..as above, could be removed in favour of a state variable, calculated just once.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I must think about that.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I must review this part.

Copy link
Author

@jjsarton jjsarton Sep 10, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have put the variable bg_stored into the structure background_t.
The code is now:

   } else {
   	if (!pbkd->bg_stored) {
   		// resize still image as requested into out
   		cv::Rect crop = bs_calc_cropping(pbkd->raw.cols, pbkd->raw.rows, width, height);
   		// Under some circumstances we must do the job in two steps!
   		// Otherwise this resize(pbkd->raw(crop), pbkd->raw, ...) may fail.
   		pbkd->raw(crop).copyTo(pbkd->raw);
   		cv::resize(pbkd->raw, pbkd->raw, cv::Size(width, height));
   		pbkd->bg_stored = true;
   	}
   	out = pbkd->raw;
   	frm = 1;
   }
   return frm;

For the video processing the code remain to the old code, we will probably every time read a new picture from the video source.

Please note that the changes are not effective now, the tests for video or still image don't work as required.
I propose to detect according to the value cnt which has the value -1 for still image and a greater value for video.
I have also changed the corresponding code.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't worry too much about this, it's a minor performance enhancement to avoid a couple of floating point ops per frame, when we are running a whole inference model too.. I'd rather the code was readable than maximum speed 😄

cv::resize(pbkd->raw(crop), pbkd->raw, cv::Size(width, height));
// under some circumstances we must do the job with 2 step!
// without this resize(pbkd->raw(crop), pbkd->raw, ...) may fail.
jjsarton marked this conversation as resolved.
Show resolved Hide resolved
cv::resize(pbkd->raw(crop), out, cv::Size(width, height));
pbkd->raw = out;
frm = 1;
}
return frm;
Expand Down