Skip to content

Feat/wfm trigger #88

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
merged 2 commits into from
Nov 14, 2023
Merged

Feat/wfm trigger #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53b2c5c
Replace GetDetectionType with trackType
brosenberg42 Aug 25, 2023
0b1877f
Remove GetDetectionType from streaming
brosenberg42 Aug 28, 2023
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: 0 additions & 5 deletions cpp/motion/MogMotionDetection/MotionDetection_MOG2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,6 @@ void displayTracks(const std::string& origPath, int frameCount,
const std::vector<MPFVideoTrack> &tracks);



std::string MotionDetection_MOG2::GetDetectionType() {
return "MOTION";
}

bool MotionDetection_MOG2::Init() {
motion_logger_ = log4cxx::Logger::getLogger("MogMotionDetection");
return true;
Expand Down
2 changes: 0 additions & 2 deletions cpp/motion/MogMotionDetection/MotionDetection_MOG2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@ class MotionDetection_MOG2 : public MPF::COMPONENT::MPFImageAndVideoDetectionCom
std::vector<MPF::COMPONENT::MPFImageLocation> GetDetections(
const MPF::COMPONENT::MPFImageJob &job) override;

std::string GetDetectionType() override;

private:
log4cxx::LoggerPtr motion_logger_;

Expand Down
1 change: 1 addition & 0 deletions cpp/motion/MogMotionDetection/plugin-files/descriptor/descriptor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"name": "MOG",
"description": "Detects motion in videos using a Mixture of Gaussians (MOG) model.",
"actionType": "DETECTION",
"trackType": "MOTION",
"outputChangedCounter" : 1,
"requiresCollection": {
"states": []
Expand Down
4 changes: 0 additions & 4 deletions cpp/motion/SubsenseMotionDetection/MotionDetection_Subsense.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,6 @@ using namespace COMPONENT;
void displayTracks(const std::string &origPath, int frameCount,
const std::vector<MPFVideoTrack> &tracks);

std::string MotionDetection_Subsense::GetDetectionType() {
return "MOTION";
}

bool MotionDetection_Subsense::Init() {
motion_logger_ = log4cxx::Logger::getLogger("SubsenseMotionDetection");
return true;
Expand Down
2 changes: 0 additions & 2 deletions cpp/motion/SubsenseMotionDetection/MotionDetection_Subsense.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ class MotionDetection_Subsense : public MPF::COMPONENT::MPFImageAndVideoDetectio
std::vector<MPF::COMPONENT::MPFImageLocation> GetDetections(
const MPF::COMPONENT::MPFImageJob &job) override ;

std::string GetDetectionType() override;

private:
log4cxx::LoggerPtr motion_logger_;

Expand Down
2 changes: 0 additions & 2 deletions cpp/motion/SubsenseMotionDetection/StreamingMotionDetection_Subsense.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ class SubsenseStreamingDetection : public MPF::COMPONENT::MPFStreamingDetectionC
bool ProcessFrame(const cv::Mat &frame, int frame_number) override;
std::vector<MPF::COMPONENT::MPFVideoTrack> EndSegment() override;

std::string GetDetectionType() override { return "MOTION"; }

private:
SubsenseStreamingDetection(const MPF::COMPONENT::MPFStreamingVideoJob &job,
const SubsenseConfig &config);
Expand Down
1 change: 1 addition & 0 deletions cpp/motion/SubsenseMotionDetection/plugin-files/descriptor/descriptor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"name": "SUBSENSE",
"description": "Detects motion in videos using a Self-Balanced SENsitivity SEgmenter (SuBSENSE).",
"actionType": "DETECTION",
"trackType": "MOTION",
"outputChangedCounter" : 1,
"requiresCollection": {
"states": []
Expand Down