Merge branch 'bd_dev' into saliency_shengxin_gsoc2017

Author: Masterqsx

modules/saliency/CMakeLists.txt

@@ -4,6 +4,6 @@ endif()
 
 set(the_description "Saliency API")
 
-ocv_define_module(saliency opencv_imgproc opencv_datasets opencv_features2d opencv_dnn WRAP python)
+ocv_define_module(saliency opencv_imgproc opencv_datasets opencv_features2d opencv_dnn opencv_ximgproc WRAP python)
 
 ocv_warnings_disable(CMAKE_CXX_FLAGS -Woverloaded-virtual)

modules/saliency/include/opencv2/saliency/saliencySpecializedClasses.hpp

@@ -196,6 +196,47 @@ class CV_EXPORTS_W DeepGaze1 : public StaticSaliency
     std::vector<unsigned> fixationLoc( Mat, Size );
 };
 
+/** @brief the Deep Gaze 1 Saliency approach from
+
+This method use the convolution layers of the pretrained AlexNet, linear combination, center bias and softmax to generate saliency map
+*/
+class CV_EXPORTS_W BackgroundContrast : public StaticSaliency
+{
+private:
+	int limitOfSP;
+	int nOfLevel;
+	int usePrior;
+	int histBin;
+	double bgWei;
+public:
+    BackgroundContrast(  double = 5, int = 600, int = 4, int = 2, int = 5 );
+    virtual ~BackgroundContrast();
+    CV_WRAP static Ptr<BackgroundContrast> create()
+    {
+        return makePtr<BackgroundContrast>();
+    }
+    CV_WRAP bool computeSaliency( InputArray image, OutputArray saliencyMap )
+    {
+        if( image.empty() )
+            return false;
+        return computeSaliencyImpl( image, saliencyMap );
+    }
+    Mat saliencyMapGenerator( const Mat, const Mat = Mat(), int = 0 );
+    void saliencyOptimize( const Mat, const Mat, const Mat, const Mat, Mat&, double = 5, double = 14 );
+    Mat saliencyMapVisualize( InputArray _saliencyMap, int = 0 );
+protected:
+    bool computeSaliencyImpl( InputArray image, OutputArray saliencyMap );
+    void superpixelSplit( const Mat, Mat&, Mat& );
+    std::vector<unsigned> getBndPatchIds( const Mat, int = 8);
+    void getColorPosDis( const Mat, const Mat, Mat&, Mat&, int );
+    void boundaryConnectivity( const Mat, const Mat, Mat&, std::vector<unsigned>, double = 3.0, double = 7.0 );
+    void getWeightedContrast( const Mat, const Mat, const Mat, Mat& );
+    void dist2WeightMatrix( Mat&, Mat&, double );
+    void rgb2lab( Mat&, Mat& );
+};
+
+
+
 
 
 /************************************ Specific Motion Saliency Specialized Classes ************************************/

modules/saliency/samples/BackgroundContrastSample.cpp

@@ -0,0 +1,52 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
+
+
+#include <opencv2/core.hpp>
+#include <opencv2/imgproc.hpp>
+#include <opencv2/highgui.hpp>
+#include <opencv2/saliency.hpp>
+#include <opencv2/ximgproc.hpp>
+#include <vector>
+#include <string>
+#include <iostream>
+#include <fstream>
+
+using namespace std;
+using namespace cv;
+using namespace saliency;
+
+
+int main(int argc, char* argv[])
+{
+    const char *keys =
+            "{ help h usage ?    |     | show this message }"
+    		"{ img_path          |     | path to img }"
+    		"{ foregroundImg_path|     | path to saliency img generated by other method }"
+    		"{ optimization      |0    | 0 for aggregated optimized with no outside saliency, 1 for optimizaed with outside saliency }";
+
+    CommandLineParser parser(argc, argv, keys);
+    if (parser.has("help"))
+    {
+        parser.printMessage();
+        return 0;
+    }
+    string img_path = parser.get<string>("img_path");
+    string foregroundImg_path = parser.get<string>("foregroundImg_path");
+
+    Mat img = imread(img_path);
+    Mat fgImg = imread(foregroundImg_path);
+    BackgroundContrast bc;
+    if ( parser.get<bool>( "optimization" ) )
+    {
+        bc.saliencyMapVisualize(bc.saliencyMapGenerator(img, fgImg, 1), 0);
+    }
+    else
+    {
+    	Mat saliency;
+    	bc.computeSaliency(img, saliency);
+    	bc.saliencyMapVisualize(saliency, 0);
+    }
+    return 0;
+} //main