/bgslibrary

Permalink
Browse files

Added CodeBook algorithm and fixed some issues

1 parent a790842 commit dbf0be074b530b66bae996ded103ca71849b94f5 @andrewssobral committed Mar 19, 2017
Unified Split
Showing with 443 additions and 64 deletions.
  1. +1 −0 Demo.cpp
  2. +1 −1 Demo.py
  3. +1 −0 Demo2.cpp
  4. +72 −16 FrameProcessor.cpp
  5. +22 −2 FrameProcessor.h
  6. +41 −41 VideoCapture.cpp
  7. +15 −2 VideoCapture.h
  8. +5 −2 config/FrameProcessor.xml
  9. +216 −0 package_bgs/CodeBook.cpp
  10. +68 −0 package_bgs/CodeBook.h
  11. +1 −0 package_bgs/bgslibrary.h
View
1 Demo.cpp
@@ -84,6 +84,7 @@ int main(int argc, char **argv)
//bgs = new PAWCS;
//bgs = new TwoPoints;
//bgs = new ViBe;
+ //bgs = new CodeBook;
int key = 0;
cv::Mat img_input;
View
2 Demo.py
@@ -71,7 +71,7 @@
else:
capture.set(cv2.cv.CV_CAP_PROP_POS_FRAMES, pos_frame-1)
- print "frame is not ready"
+ print "Frame is not ready"
cv2.waitKey(1000)
# break
View
1 Demo2.cpp
@@ -68,6 +68,7 @@ int main(int argc, char **argv)
//bgs = new PAWCS;
//bgs = new TwoPoints;
//bgs = new ViBe;
+ //bgs = new CodeBook;
int frameNumber = 1;
int key = 0;
View
88 FrameProcessor.cpp
@@ -65,6 +65,11 @@ namespace bgslibrary
gmg = new GMG;
#endif
+#if CV_MAJOR_VERSION == 3
+ if (enableKNN)
+ knn = new KNN;
+#endif
+
if (enableDPAdaptiveMedian)
dpAdaptiveMedian = new DPAdaptiveMedian;
@@ -125,10 +130,8 @@ namespace bgslibrary
if (enableLbpMrf)
lbpMrf = new LBP_MRF;
-#if CV_MAJOR_VERSION == 2
if (enableMultiLayer)
multiLayer = new MultiLayer;
-#endif
if (enablePBAS)
pixelBasedAdaptiveSegmenter = new PixelBasedAdaptiveSegmenter;
@@ -154,6 +157,18 @@ namespace bgslibrary
if (enableLOBSTER)
lobster = new LOBSTER;
+ if (enablePAWCS)
+ pawcs = new PAWCS;
+
+ if (enableTwoPoints)
+ twoPoints = new TwoPoints;
+
+ if (enableViBe)
+ vibe = new ViBe;
+
+ if (enableCodeBook)
+ codeBook = new CodeBook;
+
if (enableForegroundMaskAnalysis)
foregroundMaskAnalysis = new ForegroundMaskAnalysis;
}
@@ -205,6 +220,11 @@ namespace bgslibrary
process("GMG", gmg, img_preProcessor, img_gmg);
#endif
+#if CV_MAJOR_VERSION == 3
+ if (enableKNN)
+ process("KNN", knn, img_preProcessor, img_knn);
+#endif
+
if (enableDPAdaptiveMedian)
process("DPAdaptiveMedian", dpAdaptiveMedian, img_preProcessor, img_dpAdaptiveMedian);
@@ -265,14 +285,12 @@ namespace bgslibrary
if (enableLbpMrf)
process("LbpMrf", lbpMrf, img_preProcessor, img_lbpMrf);
-#if CV_MAJOR_VERSION == 2
if (enableMultiLayer)
{
multiLayer->setStatus(MultiLayer::MLBGS_LEARN);
//multiLayer->setStatus(MultiLayer::MLBGS_DETECT);
process("MultiLayer", multiLayer, img_preProcessor, img_multiLayer);
}
-#endif
if (enablePBAS)
process("PBAS", pixelBasedAdaptiveSegmenter, img_preProcessor, img_pixelBasedAdaptiveSegmenter);
@@ -298,6 +316,18 @@ namespace bgslibrary
if (enableLOBSTER)
process("LOBSTER", lobster, img_preProcessor, img_lobster);
+ if (enablePAWCS)
+ process("PAWCS", pawcs, img_preProcessor, img_pawcs);
+
+ if (enableTwoPoints)
+ process("TwoPoints", twoPoints, img_preProcessor, img_twoPoints);
+
+ if (enableViBe)
+ process("ViBe", vibe, img_preProcessor, img_vibe);
+
+ if (enableCodeBook)
+ process("CodeBook", codeBook, img_preProcessor, img_codeBook);
+
if (enableForegroundMaskAnalysis)
{
foregroundMaskAnalysis->stopAt = frameToStop;
@@ -315,6 +345,9 @@ namespace bgslibrary
#if CV_MAJOR_VERSION >= 2 && CV_MINOR_VERSION >= 4 && CV_SUBMINOR_VERSION >= 3
foregroundMaskAnalysis->process(frameNumber, "GMG", img_gmg);
#endif
+#if CV_MAJOR_VERSION == 3
+ foregroundMaskAnalysis->process(frameNumber, "KNN", img_knn);
+#endif
foregroundMaskAnalysis->process(frameNumber, "DPAdaptiveMedian", img_dpAdaptiveMedian);
foregroundMaskAnalysis->process(frameNumber, "DPGrimsonGMM", img_dpGrimsonGMM);
foregroundMaskAnalysis->process(frameNumber, "DPZivkovicAGMM", img_dpZivkovicAGMM);
@@ -335,9 +368,7 @@ namespace bgslibrary
foregroundMaskAnalysis->process(frameNumber, "LBAdaptiveSOM", img_lbAdaptiveSOM);
foregroundMaskAnalysis->process(frameNumber, "LBFuzzyAdaptiveSOM", img_lbFuzzyAdaptiveSOM);
foregroundMaskAnalysis->process(frameNumber, "LbpMrf", img_lbpMrf);
-#if CV_MAJOR_VERSION == 2
foregroundMaskAnalysis->process(frameNumber, "MultiLayer", img_multiLayer);
-#endif
foregroundMaskAnalysis->process(frameNumber, "PBAS", img_pixelBasedAdaptiveSegmenter);
foregroundMaskAnalysis->process(frameNumber, "VuMeter", img_vumeter);
foregroundMaskAnalysis->process(frameNumber, "KDE", img_kde);
@@ -346,6 +377,10 @@ namespace bgslibrary
foregroundMaskAnalysis->process(frameNumber, "SigmaDelta", img_sigmaDelta);
foregroundMaskAnalysis->process(frameNumber, "SuBSENSE", img_subSENSE);
foregroundMaskAnalysis->process(frameNumber, "LOBSTER", img_lobster);
+ foregroundMaskAnalysis->process(frameNumber, "PAWCS", img_pawcs);
+ foregroundMaskAnalysis->process(frameNumber, "TwoPoints", img_twoPoints);
+ foregroundMaskAnalysis->process(frameNumber, "ViBe", img_vibe);
+ foregroundMaskAnalysis->process(frameNumber, "CodeBook", img_codeBook);
}
firstTime = false;
@@ -374,6 +409,18 @@ namespace bgslibrary
if (enableForegroundMaskAnalysis)
delete foregroundMaskAnalysis;
+ if (enableCodeBook)
+ delete codeBook;
+
+ if (enableViBe)
+ delete vibe;
+
+ if (enableTwoPoints)
+ delete twoPoints;
+
+ if (enablePAWCS)
+ delete pawcs;
+
if (enableLOBSTER)
delete lobster;
@@ -398,10 +445,8 @@ namespace bgslibrary
if (enablePBAS)
delete pixelBasedAdaptiveSegmenter;
-#if CV_MAJOR_VERSION == 2
if (enableMultiLayer)
delete multiLayer;
-#endif
if (enableLBFuzzyAdaptiveSOM)
delete lbFuzzyAdaptiveSOM;
@@ -418,10 +463,8 @@ namespace bgslibrary
if (enableLBSimpleGaussian)
delete lbSimpleGaussian;
-#if !defined(_WIN32)
if (enableLbpMrf)
delete lbpMrf;
-#endif
if (enableFuzzyChoquetIntegral)
delete fuzzyChoquetIntegral;
@@ -470,6 +513,11 @@ namespace bgslibrary
delete gmg;
#endif
+#if CV_MAJOR_VERSION == 3
+ if (enableKNN)
+ delete knn;
+#endif
+
if (enableAdaptiveBackgroundLearning)
delete adaptiveBackgroundLearning;
@@ -531,6 +579,9 @@ namespace bgslibrary
#if CV_MAJOR_VERSION >= 2 && CV_MINOR_VERSION >= 4 && CV_SUBMINOR_VERSION >= 3
cvWriteInt(fs, "enableGMG", enableGMG);
#endif
+#if CV_MAJOR_VERSION == 3
+ cvWriteInt(fs, "enableKNN", enableKNN);
+#endif
cvWriteInt(fs, "enableDPAdaptiveMedian", enableDPAdaptiveMedian);
cvWriteInt(fs, "enableDPGrimsonGMM", enableDPGrimsonGMM);
@@ -555,10 +606,7 @@ namespace bgslibrary
cvWriteInt(fs, "enableLBFuzzyAdaptiveSOM", enableLBFuzzyAdaptiveSOM);
cvWriteInt(fs, "enableLbpMrf", enableLbpMrf);
-
-#if CV_MAJOR_VERSION == 2
cvWriteInt(fs, "enableMultiLayer", enableMultiLayer);
-#endif
cvWriteInt(fs, "enablePBAS", enablePBAS);
cvWriteInt(fs, "enableVuMeter", enableVuMeter);
cvWriteInt(fs, "enableKDE", enableKDE);
@@ -567,6 +615,10 @@ namespace bgslibrary
cvWriteInt(fs, "enableSigmaDelta", enableSigmaDelta);
cvWriteInt(fs, "enableSuBSENSE", enableSuBSENSE);
cvWriteInt(fs, "enableLOBSTER", enableLOBSTER);
+ cvWriteInt(fs, "enablePAWCS", enablePAWCS);
+ cvWriteInt(fs, "enableTwoPoints", enableTwoPoints);
+ cvWriteInt(fs, "enableViBe", enableViBe);
+ cvWriteInt(fs, "enableCodeBook", enableCodeBook);
cvReleaseFileStorage(&fs);
}
@@ -593,6 +645,9 @@ namespace bgslibrary
#if CV_MAJOR_VERSION >= 2 && CV_MINOR_VERSION >= 4 && CV_SUBMINOR_VERSION >= 3
enableGMG = cvReadIntByName(fs, 0, "enableGMG", false);
#endif
+#if CV_MAJOR_VERSION == 3
+ enableKNN = cvReadIntByName(fs, 0, "enableKNN", false);
+#endif
enableDPAdaptiveMedian = cvReadIntByName(fs, 0, "enableDPAdaptiveMedian", false);
enableDPGrimsonGMM = cvReadIntByName(fs, 0, "enableDPGrimsonGMM", false);
@@ -617,10 +672,7 @@ namespace bgslibrary
enableLBFuzzyAdaptiveSOM = cvReadIntByName(fs, 0, "enableLBFuzzyAdaptiveSOM", false);
enableLbpMrf = cvReadIntByName(fs, 0, "enableLbpMrf", false);
-
-#if CV_MAJOR_VERSION == 2
enableMultiLayer = cvReadIntByName(fs, 0, "enableMultiLayer", false);
-#endif
enablePBAS = cvReadIntByName(fs, 0, "enablePBAS", false);
enableVuMeter = cvReadIntByName(fs, 0, "enableVuMeter", false);
enableKDE = cvReadIntByName(fs, 0, "enableKDE", false);
@@ -629,6 +681,10 @@ namespace bgslibrary
enableSigmaDelta = cvReadIntByName(fs, 0, "enableSigmaDelta", false);
enableSuBSENSE = cvReadIntByName(fs, 0, "enableSuBSENSE", false);
enableLOBSTER = cvReadIntByName(fs, 0, "enableLOBSTER", false);
+ enablePAWCS = cvReadIntByName(fs, 0, "enablePAWCS", false);
+ enableTwoPoints = cvReadIntByName(fs, 0, "enableTwoPoints", false);
+ enableViBe = cvReadIntByName(fs, 0, "enableViBe", false);
+ enableCodeBook = cvReadIntByName(fs, 0, "enableCodeBook", false);
cvReleaseFileStorage(&fs);
}
View
24 FrameProcessor.h
@@ -75,6 +75,12 @@ namespace bgslibrary
bool enableGMG;
#endif
+#if CV_MAJOR_VERSION == 3
+ cv::Mat img_knn;
+ KNN* knn;
+ bool enableKNN;
+#endif
+
cv::Mat img_dpAdaptiveMedian;
DPAdaptiveMedian* dpAdaptiveMedian;
bool enableDPAdaptiveMedian;
@@ -155,11 +161,9 @@ namespace bgslibrary
LBP_MRF* lbpMrf;
bool enableLbpMrf;
-#if CV_MAJOR_VERSION == 2
cv::Mat img_multiLayer;
MultiLayer* multiLayer;
bool enableMultiLayer;
-#endif
cv::Mat img_pixelBasedAdaptiveSegmenter;
PixelBasedAdaptiveSegmenter* pixelBasedAdaptiveSegmenter;
@@ -193,6 +197,22 @@ namespace bgslibrary
LOBSTER* lobster;
bool enableLOBSTER;
+ cv::Mat img_pawcs;
+ PAWCS* pawcs;
+ bool enablePAWCS;
+
+ cv::Mat img_twoPoints;
+ TwoPoints* twoPoints;
+ bool enableTwoPoints;
+
+ cv::Mat img_vibe;
+ ViBe* vibe;
+ bool enableViBe;
+
+ cv::Mat img_codeBook;
+ CodeBook* codeBook;
+ bool enableCodeBook;
+
ForegroundMaskAnalysis* foregroundMaskAnalysis;
bool enableForegroundMaskAnalysis;
Oops, something went wrong.

0 comments on commit dbf0be0

Please sign in to comment.