mona lisa class

finengine/src/main/CMakeLists.txt

@@ -40,6 +40,7 @@ add_library(fin-engine-lib
             ${PROJECT_SOURCE_DIR}/cpp/effects/faceswap/faceswap.cpp
             ${PROJECT_SOURCE_DIR}/cpp/effects/faceswap/FaceSwapper.cpp
             ${PROJECT_SOURCE_DIR}/cpp/effects/monalisa/monalisa.cpp
+            ${PROJECT_SOURCE_DIR}/cpp/effects/monalisa/MonaLisaEffect.cpp
             )
 target_link_libraries(fin-engine-lib
                     lib_opencv

finengine/src/main/cpp/effects/monalisa/MonaLisaEffect.cpp

@@ -0,0 +1,11 @@
+//
+// Created by iFinVer on 2016/12/28.
+//
+
+#include "MonaLisaEffect.h"
+
+void MonaLisaEffect::monaLisa(Mat lisaFrame, Rect2i lisaRect, vector<cv::Point2i> lisaPoints, Mat vinciFrame, Rect2i vinciRect,
+                              vector<cv::Point2i> vinciPoints) {
+
+}
+

finengine/src/main/cpp/effects/monalisa/MonaLisaEffect.h

@@ -0,0 +1,22 @@
+//
+// Created by iFinVer on 2016/12/28.
+//
+
+#ifndef FINENGINE_MONALISAEFFECT_H
+#define FINENGINE_MONALISAEFFECT_H
+
+#include <opencv2/opencv.hpp>
+using namespace cv;
+using namespace std;
+
+class MonaLisaEffect {
+public:
+
+    void monaLisa(Mat lisaFrame,Rect2i lisaRect,vector<cv::Point2i> lisaPoints,Mat vinciFrame,Rect2i vinciRect,vector<cv::Point2i> vinciPoints);
+
+private:
+
+};
+
+
+#endif //FINENGINE_MONALISAEFFECT_H

finengine/src/main/cpp/effects/monalisa/monalisa.cpp

@@ -42,15 +42,7 @@ jlong detectMonaFace(const char *monaPath) {
     return result;
 }
 
-void releaseMonalisa() {
-    if (mMonaDetector != NULL) {
-        delete mMonaDetector;
-        mMonaDetector = NULL;
-    }
-}
-
-
-cv::Mat *effect_monaLisa(jbyte *data, jint width, jint height) {
+cv::Mat *effect_monaLisa(jbyte *data, jint width, jint height, jlong facePtr) {
 
     FaceDetectResult *faceData = (FaceDetectResult *) mMonaDetector->getFaceDataPtr();
     MInt32 localFaces = faceData->nFaceCountInOut;
@@ -66,4 +58,11 @@ cv::Mat *effect_monaLisa(jbyte *data, jint width, jint height) {
 
     }
     return &gMonaLisaMat;
+}
+
+void releaseMonalisa() {
+    if (mMonaDetector != NULL) {
+        delete mMonaDetector;
+        mMonaDetector = NULL;
+    }
 }

finengine/src/main/cpp/effects/monalisa/monalisa.h

@@ -13,7 +13,7 @@ int initMonalisa(JNIEnv *env, jobject ctx, jstring trackDataPath);
 
 jlong detectMonaFace(const char* monaPath);
 
-cv::Mat* effect_monaLisa(jbyte *data, jint width, jint height);
+cv::Mat *effect_monaLisa(jbyte *data, jint width, jint height, jlong facePtr);
 
 void releaseMonalisa();
 

finengine/src/main/cpp/finengine/main.cpp

@@ -318,7 +318,7 @@ void renderFrame(GLContextHolder *engineHolder, jbyte *data, jint width, jint he
             break;
         }
         case ENGINE_MODE_MONA_LISA: {
-            cv::Mat *monaLisaMat = effect_monaLisa(data, width, height);
+            cv::Mat *monaLisaMat = effect_monaLisa(data, width, height, facePtr);
             renderRgb(engineHolder, monaLisaMat->data, monaLisaMat->cols, monaLisaMat->rows, 0, JNI_FALSE, outWidth, outHeight, 0);
             break;
         }