Skip to content

Syntax fixes #124

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

Merged
phlash merged 9 commits into from
Nov 7, 2021
Merged

Syntax fixes #124

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
87bad4c
bug fix: avoid OpenCV display calls on multiple threads, merge debug …
phlash Nov 4, 2021
9f3a553
bug fix: clone the thumbnail to ensure data is not modified while in …
phlash Nov 4, 2021
1439f3a
review followup: better names for internal variables
phlash Nov 5, 2021
4c7b0a2
review followup: mask as picture-in-picture, keyboard help
phlash Nov 5, 2021
a0d846d
bug fix: avoid green text on green background!
phlash Nov 5, 2021
7aa9410
review followup: re-ordered internal type for background.cc, reduced …
phlash Nov 6, 2021
43cf7bc
whitespace corrections
phlash Nov 6, 2021
e3f73f9
merge fix from experimental
phlash Nov 6, 2021
e64d614
review followup: no aligned initialisers (encourages unnecessary edit…
phlash Nov 7, 2021
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
Prev Previous commit
Next Next commit
review followup: re-ordered internal type for background.cc, reduced … 
…lock period, removed capitalisation in help text
  • Loading branch information
@phlash
phlash committed Nov 6, 2021
commit 7aa941012118fcf248eaca604d147cd528d5319f
19 changes: 11 additions & 8 deletions app/background.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ struct background_t {
int frame;
double fps;
cv::Mat raw;
cv::Mat thumb;
std::thread thread;
std::mutex rawmux;
cv::Mat thumb;
std::mutex thumbmux;
std::thread thread;
};

// Internal video reader thread
Expand All @@ -48,14 +48,17 @@ static void read_thread(std::shared_ptr<background_t> pbkd) {
char msg[40];
long nsec = std::chrono::duration_cast<std::chrono::nanoseconds>(now-last).count();
double fps = 1e9/(double)nsec;
cv::Mat thumb;
int theight = (grab.rows*160)/grab.cols;
cv::resize(grab, thumb, cv::Size(160, theight));
snprintf(msg, sizeof(msg), "FPS:%0.1f", fps);
cv::putText(thumb, msg, cv::Point(5, 15), cv::FONT_HERSHEY_PLAIN, 1.0, cv::Scalar(0, 255, 255));
snprintf(msg, sizeof(msg), "FRM:%05d", fps, pbkd->frame);
cv::putText(thumb, msg, cv::Point(5, 30), cv::FONT_HERSHEY_PLAIN, 1.0, cv::Scalar(0, 255, 255));
cv::putText(thumb, "Background", cv::Point(5, pbkd->thumb.rows-5), cv::FONT_HERSHEY_PLAIN, 1.0, cv::Scalar(0, 255, 255));
{
std::unique_lock<std::mutex> hold(pbkd->thumbmux);
cv::resize(grab, pbkd->thumb, cv::Size(160,120));
snprintf(msg, sizeof(msg), "FPS:%0.1f", fps);
cv::putText(pbkd->thumb, msg, cv::Point(5,15), cv::FONT_HERSHEY_PLAIN, 1.0, cv::Scalar(0,255,255));
snprintf(msg, sizeof(msg), "FRM:%05d", fps, pbkd->frame);
cv::putText(pbkd->thumb, msg, cv::Point(5,30), cv::FONT_HERSHEY_PLAIN, 1.0, cv::Scalar(0,255,255));
cv::putText(pbkd->thumb, "Background", cv::Point(5,pbkd->thumb.rows-5), cv::FONT_HERSHEY_PLAIN, 1.0, cv::Scalar(0,255,255));
pbkd->thumb = thumb;
}
}
last = now;
Expand Down
16 changes: 8 additions & 8 deletions app/deepseg.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,18 +642,18 @@ int main(int argc, char* argv[]) try {
}
// keyboard help
if (showHelp) {
static const char *help[] = {
static const std::string help[] = {
"Keyboard help:",
" q: Quit",
" s: Switch filter on/off",
" h: toggle Horizontal flip",
" v: toggle Vertical flip",
" q: quit",
" s: switch filter on/off",
" h: toggle horizontal flip",
" v: toggle vertical flip",
" f: toggle FPS display on/off",
" b: toggle Background display on/off",
" m: toggle Mask display on/off",
" b: toggle background display on/off",
" m: toggle mask display on/off",
" ?: toggle this help text on/off"
};
for (int i=0; i<sizeof(help)/sizeof(char*); i++) {
for (int i=0; i<sizeof(help)/sizeof(std::string); i++) {
cv::putText(test, help[i], cv::Point(10,test.rows/2+i*15), cv::FONT_HERSHEY_PLAIN, 1.0, cv::Scalar(0,255,255));
}
}
Expand Down