Remove cnn segmentation component processing for Android platform (not supported)

Author: granger35

SolARModuleOpenCV.pri

@@ -19,6 +19,7 @@ HEADERS += $$PWD/interfaces/SolAR2D3DcorrespondencesFinderOpencv.h \
     $$PWD/interfaces/SolARDescriptorsExtractorSIFTOpencv.h \
     $$PWD/interfaces/SolARDescriptorsExtractorFromImageOpencv.h \
     $$PWD/interfaces/SolARDeviceDataLoader.h \
+    $$PWD/interfaces/SolARFCNSegmentationOpencv.h \
     $$PWD/interfaces/SolARFiducialMarkerLoaderOpencv.h \
     $$PWD/interfaces/SolARQRCodeLoaderOpencv.h \
     $$PWD/interfaces/SolARQRCodePoseEstimatorOpencv.h \
@@ -43,6 +44,7 @@ HEADERS += $$PWD/interfaces/SolAR2D3DcorrespondencesFinderOpencv.h \
     $$PWD/interfaces/SolARKeypointDetectorRegionOpencv.h \
     $$PWD/interfaces/SolARMapFusionOpencv.h \
     $$PWD/interfaces/SolARImageMarkerLoaderOpencv.h \
+    $$PWD/interfaces/SolARMaskOverlayOpencv.h \
     $$PWD/interfaces/SolARMatchesOverlayOpencv.h \
     $$PWD/interfaces/SolARModuleOpencv_traits.h \
     $$PWD/interfaces/SolAROpencvAPI.h \
@@ -63,7 +65,7 @@ HEADERS += $$PWD/interfaces/SolAR2D3DcorrespondencesFinderOpencv.h \
     $$PWD/interfaces/SolARUnprojectPlanarPointsOpencv.h \
     $$PWD/interfaces/SolARSVDTriangulationOpencv.h \
     $$PWD/interfaces/SolARVideoAsCameraOpencv.h \
-    $$PWD/interfaces/SolARMaskOverlayOpencv.h \
+    $$PWD/interfaces/SolARYOLACTSegmentationOpencv.h \
     $$PWD/interfaces/features2d_akaze2.hpp \
     $$PWD/src/AKAZE2/AKAZEConfig.h \
     $$PWD/src/AKAZE2/AKAZEFeatures.h \
@@ -98,6 +100,7 @@ SOURCES +=  $$PWD/src/AKAZE2/akaze.cpp \
     $$PWD/src/SolARDescriptorsExtractorSIFTOpencv.cpp \
     $$PWD/src/SolARDescriptorsExtractorFromImageOpencv.cpp \
     $$PWD/src/SolARDeviceDataLoader.cpp \
+    $$PWD/src/SolARFCNSegmentationOpencv.cpp \
     $$PWD/src/SolARFiducialMarkerLoaderOpencv.cpp \
     $$PWD/src/SolARQRCodeLoaderOpencv.cpp \
     $$PWD/src/SolARQRCodePoseEstimatorOpencv.cpp \
@@ -121,6 +124,7 @@ SOURCES +=  $$PWD/src/AKAZE2/akaze.cpp \
     $$PWD/src/SolARKeypointDetectorOpencv.cpp \
     $$PWD/src/SolARKeypointDetectorRegionOpencv.cpp \
     $$PWD/src/SolARMapFusionOpencv.cpp \
+    $$PWD/src/SolARMaskOverlayOpencv.cpp \
     $$PWD/src/SolARMatchesOverlayOpencv.cpp \
     $$PWD/src/SolARModuleOpencv.cpp \
     $$PWD/src/SolAROpenCVHelper.cpp \
@@ -140,18 +144,6 @@ SOURCES +=  $$PWD/src/AKAZE2/akaze.cpp \
     $$PWD/src/SolARUndistortPointsOpencv.cpp \
     $$PWD/src/SolARUnprojectplanarPointsOpencv.cpp \
     $$PWD/src/SolARVideoAsCameraOpencv.cpp \
-    $$PWD/src/SolARMaskOverlayOpencv.cpp
-
-!android {
-
-HEADERS += \
-    $$PWD/interfaces/SolARYOLACTSegmentationOpencv.h \
-    $$PWD/interfaces/SolARFCNSegmentationOpencv.h
-
-SOURCES += \
-    $$PWD/src/SolARYOLACTSegmentationOpencv.cpp \
-    $$PWD/src/SolARFCNSegmentationOpencv.cpp
-
-}
+    $$PWD/src/SolARYOLACTSegmentationOpencv.cpp
 
 

interfaces/SolARFCNSegmentationOpencv.h

@@ -21,8 +21,10 @@
 #include "SolAROpencvAPI.h"
 #include "api/segm/ISemanticSegmentation.h"
 #include <opencv2/opencv.hpp>
+#ifndef __ANDROID__
 #include <opencv2/dnn.hpp>
 #include <opencv2/dnn/shape_utils.hpp>
+#endif
 
 namespace SolAR {
 namespace MODULES {
@@ -63,8 +65,10 @@ class SOLAROPENCV_EXPORT_API SolARFCNSegmentationOpencv : public org::bcom::xpcf
 private:
     std::string		m_modelFile = "";
     std::string		m_modelConfig = "";
-	cv::dnn::Net	m_net;
-	float			m_scale;	
+#ifndef __ANDROID__
+    cv::dnn::Net	m_net;
+#endif
+    float			m_scale;
 	cv::Scalar		m_mean;
 	cv::Size		m_inputSize;
 	std::vector<std::string> m_outputLayerNames;

interfaces/SolARYOLACTSegmentationOpencv.h

@@ -21,8 +21,10 @@
 #include "SolAROpencvAPI.h"
 #include "api/segm/IInstanceSegmentation.h"
 #include <opencv2/opencv.hpp>
+#ifndef __ANDROID__
 #include <opencv2/dnn.hpp>
 #include <opencv2/dnn/shape_utils.hpp>
+#endif
 
 namespace SolAR {
 namespace MODULES {
@@ -78,7 +80,9 @@ class SOLAROPENCV_EXPORT_API SolARYOLACTSegmentationOpencv : public org::bcom::x
     float			m_maskThresh = 0.f;
     std::string		m_modelFile = "";
     std::string		m_modelConfig = "";
-	cv::dnn::Net	m_net;
+#ifndef __ANDROID__
+    cv::dnn::Net	m_net;
+#endif
 	float			m_scale;	
 	cv::Scalar		m_mean;
 	cv::Size		m_inputSize;

src/SolARFCNSegmentationOpencv.cpp

@@ -44,6 +44,7 @@ SolARFCNSegmentationOpencv::~SolARFCNSegmentationOpencv()
 
 xpcf::XPCFErrorCode SolARFCNSegmentationOpencv::onConfigured()
 {
+#ifndef __ANDROID__
     LOG_DEBUG(" SolARFCNSegmentationOpencv onConfigured");
 	// read and initialize network
 	m_net = cv::dnn::readNet(m_modelFile, m_modelConfig);
@@ -62,11 +63,16 @@ xpcf::XPCFErrorCode SolARFCNSegmentationOpencv::onConfigured()
 	m_inputSize = cv::Size(500, 500);	
 	m_outputLayerNames = { "output" };
 	return xpcf::XPCFErrorCode::_SUCCESS;
+#else
+    LOG_ERROR ("SolARYOLACTSegemntationOpencv is not avialble for Android");
+    return xpcf::XPCFErrorCode::_FAIL;
+#endif
 }
 
 FrameworkReturnCode SolARFCNSegmentationOpencv::segment(const SRef<SolAR::datastructure::Image> image,
                                                         SRef<SolAR::datastructure::Image> &mask)
 {
+#ifndef __ANDROID__
 	/// convert to opencv image
 	cv::Mat imageCV;
 	SolAROpenCVHelper::mapToOpenCV(image, imageCV);
@@ -108,6 +114,10 @@ FrameworkReturnCode SolARFCNSegmentationOpencv::segment(const SRef<SolAR::datast
 	cv::resize(maxClass, maskCV, imageCV.size(), 0.0, 0.0, cv::INTER_NEAREST);
 	SolAROpenCVHelper::convertToSolar(maskCV, mask);
 	return FrameworkReturnCode::_SUCCESS;
+#else
+    LOG_ERROR ("SolARYOLACTSegemntationOpencv is not avialble for Android");
+    return FrameworkReturnCode::_ERROR_;
+#endif
 }
 
 }

src/SolARYOLACTSegmentationOpencv.cpp

@@ -46,6 +46,7 @@ SolARYOLACTSegmentationOpencv::~SolARYOLACTSegmentationOpencv()
 
 xpcf::XPCFErrorCode SolARYOLACTSegmentationOpencv::onConfigured()
 {
+#ifndef __ANDROID__
 	LOG_DEBUG(" SolARYOLACTSegmentationOpencv onConfigured");
 	// read and initialize network
 	m_net = cv::dnn::readNet(m_modelFile, m_modelConfig);
@@ -66,6 +67,10 @@ xpcf::XPCFErrorCode SolARYOLACTSegmentationOpencv::onConfigured()
 	m_nbChannels = 32;
 	m_outputLayerNames = { "conf", "mask", "proto", "boxes" };
 	return xpcf::XPCFErrorCode::_SUCCESS;
+#else
+    LOG_ERROR ("SolARYOLACTSegemntationOpencv is not avialble for Android");
+    return xpcf::XPCFErrorCode::_FAIL;
+#endif
 }
 
 bool checkJaccard(const Rectanglei& box, const uint32_t& id, const std::vector<Rectanglei>& boxes, const std::vector<uint32_t> &ids)
@@ -93,6 +98,7 @@ FrameworkReturnCode SolARYOLACTSegmentationOpencv::segment(const SRef<SolAR::dat
                                                            std::vector<uint32_t> &classIds,
                                                            std::vector<float> &scores)
 {
+#ifndef __ANDROID__
 	boxes.clear();
 	masks.clear();
 	classIds.clear();
@@ -177,6 +183,10 @@ FrameworkReturnCode SolARYOLACTSegmentationOpencv::segment(const SRef<SolAR::dat
 	}
 	LOG_DEBUG("Number of output detections: {}", boxes.size());
 	return FrameworkReturnCode::_SUCCESS;
+#else
+    LOG_ERROR ("SolARYOLACTSegemntationOpencv is not avialble for Android");
+    return FrameworkReturnCode::_ERROR_;
+#endif
 }
 
 }