From 4d22d8d9332535a9c2f65e0e501a3eefbbd0ae30 Mon Sep 17 00:00:00 2001
From: chenke <chenke@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 09 八月 2017 12:45:29 +0800
Subject: [PATCH] JsonCpp和CapnpProtocol功能初步实现

---
 VisitFace/RtspNativeCodec/app/src/main/cpp/AppConfig.h                  |   31 +
 VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIClient.h   |    6 
 VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperClient.cpp      |   66 +-
 VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.cpp         |   74 ++-
 VisitFace/RtspNativeCodec/app/src/main/cpp/AppConfig.cpp                |   56 +++
 VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt               |   28 +
 VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIClient.cpp |  206 +----------
 VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFunc.h                 |   96 +++-
 VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFunc.cpp               |   53 --
 VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCacheForPLBG.cpp         |    9 
 VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncClient.cpp         |   23 +
 VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncClient.h           |   22 
 VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperServer.cpp      |   14 
 VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCache.h                  |   12 
 VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.h   |    8 
 VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperClient.h        |    2 
 VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.cpp |  255 ++------------
 VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.h           |   83 ++--
 18 files changed, 410 insertions(+), 634 deletions(-)

diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/AppConfig.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/AppConfig.cpp
new file mode 100644
index 0000000..9724375
--- /dev/null
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/AppConfig.cpp
@@ -0,0 +1,56 @@
+//
+// Created by ke.chen on 2017/8/7.
+//
+
+#include "AppConfig.h"
+
+AppConfig::AppConfig()
+{
+}
+
+AppConfig::~AppConfig()
+{
+}
+
+string AppConfig::getStringValue(string key)
+{
+	return string(root[key].asString());
+}
+
+int AppConfig::getIntValue(string key)
+{
+	return root[key].asInt();
+}
+
+void AppConfig::setStringValue(string key, string value)
+{
+	root[key] = value;
+}
+
+void AppConfig::setIntValue(string key, int value)
+{
+	root[key] = value;
+}
+
+void AppConfig::loadConfig(string path)
+{
+	fstream fs(path);
+	if (!fs.is_open()) {
+		save(path);
+		return;
+	}
+	Json::CharReaderBuilder builder;
+	auto reader = builder.newCharReader();
+	JSONCPP_STRING doc;
+	std::getline(fs, doc, (char)EOF);
+	reader->parse(doc.data(), doc.data() + doc.size(), &root, false);
+}
+void AppConfig::save(string path)
+{
+	ofstream ofs(path);
+	ofs << root.toStyledString();
+	ofs.close();
+}
+void AppConfig::clear(){
+	root.clear();
+}
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/AppConfig.h b/VisitFace/RtspNativeCodec/app/src/main/cpp/AppConfig.h
new file mode 100644
index 0000000..0f9958c
--- /dev/null
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/AppConfig.h
@@ -0,0 +1,31 @@
+//
+// Created by ke.chen on 2017/8/7.
+//
+
+#ifndef RTSPNATIVECODEC_APPCONFIG_H
+#define RTSPNATIVECODEC_APPCONFIG_H
+
+
+#include <json.h>
+#include <iostream>
+#include <fstream>
+#include <sstream>
+#include <string>
+using namespace std;
+class AppConfig {
+public:
+    AppConfig();
+    ~AppConfig();
+	string getStringValue(string key);
+	int    getIntValue(string key);
+	void   setStringValue(string key, string value);
+	void   setIntValue(string key, int value);
+    void   loadConfig(string path);
+	void   save(string path);
+	void   clear();
+private:
+	Json::Value root;
+};
+
+
+#endif //RTSPNATIVECODEC_APPCONFIG_H
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
index 95d13b3..8922d56 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CMakeLists.txt
@@ -6,7 +6,7 @@
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -std=c++11 -fno-rtti  -Wall -UNDEBUG")
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -std=c++11 -DANDROID_PLATFORM=android-22  -DANDROID_TOOLCHAIN=gcc -DANDROID_STL=gnustl_static -Wall -UNDEBUG")
 
-set(WORKSPACE_PATH "D:/workspace/proxy")
+set(WORKSPACE_PATH "E:/Documents/works")
 set(ARCH "arm64-v8a")
 
 include_directories(
@@ -24,6 +24,7 @@
 					"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/live555/include/groupsock"
 					"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/live555/include/liveMedia"
 					"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/live555/include/UsageEnvironment"
+					"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/jsoncpp/include/json"
 
 					"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/libyuv/include"
 
@@ -43,6 +44,8 @@
 
 add_library(rtspface_server SHARED
 			RtspNativeCodecJNIServer.cpp
+			RemoteFuncServer.cpp
+			RemoteFunc.cpp
 			CameraWrapperServer.cpp
 			FaceCache.cpp
 			FaceCacheForPLBG.cpp
@@ -51,6 +54,8 @@
 			cpu_sched_test.cpp
 			serial.c
 			TeleWrapper.cpp
+			RemoteMethod.proto.cpp
+			AppConfig.cpp
 
 			"${WORKSPACE_PATH}/RtspFace/PipeLine.cpp"
 			"${WORKSPACE_PATH}/RtspFace/Logger/src/logger.cc"
@@ -109,11 +114,11 @@
 					  "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/st_face/lib/${ARCH}/libcvface_api.so"
 					  "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/freetype/lib/${ARCH}/libfreetype.so"
 
-					  "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnp-0.6.1.so"
-					  "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnpc-0.6.1.so"
-					  "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libkj-0.6.1.so"
+					  "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnp.so"
+					  "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnpc.so"
+					  "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libkj.so"
 
-
+                      #"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/jsoncpp/lib/${ARCH}/libjsoncpp.so"
 					  #"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/libv4l2wrapper/lib/${ARCH}/libv4l2wrapper.a"
 
 					  #"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/android_sys/libgui.so"
@@ -125,6 +130,8 @@
 
 add_library(rtspface_client SHARED
 			RtspNativeCodecJNIClient.cpp
+			RemoteFuncClient.cpp
+			RemoteFunc.cpp
 			CameraWrapperClient.cpp
 			FaceCache.cpp
 			FaceCacheForPLBG.cpp
@@ -133,6 +140,8 @@
 			cpu_sched_test.cpp
 			serial.c
 			TeleWrapper.cpp
+			RemoteMethod.proto.cpp
+			AppConfig.cpp
 
 			"${WORKSPACE_PATH}/RtspFace/PipeLine.cpp"
 			"${WORKSPACE_PATH}/RtspFace/Logger/src/logger.cc"
@@ -187,13 +196,12 @@
 					  "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/st_face/lib/${ARCH}/libcvface_api.so"
 					  "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/freetype/lib/${ARCH}/libfreetype.so"
 
-					  "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnp-0.6.1.so"
-					  "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnpc-0.6.1.so"
-					  "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libkj-0.6.1.so"
+					  "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnp.so"
+					  "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libcapnpc.so"
+					  "${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/capnproto/lib/${ARCH}/libkj.so"
 
-
+                      #"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/jsoncpp/lib/${ARCH}/libjsoncpp.so"
 					  #"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/libv4l2wrapper/lib/${ARCH}/libv4l2wrapper.a"
-
 					  #"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/android_sys/libgui.so"
 					  #"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/android_sys/libui.so"
 					  #"${WORKSPACE_PATH}/VisitFace/RtspNativeCodec/app/libs/android_sys/libEGL.so"
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperClient.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperClient.cpp
index c5bb607..2e3a0fb 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperClient.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperClient.cpp
@@ -267,33 +267,31 @@
     faceLabels.insert(std::make_pair(st_track_id, label));
 }
 
-static void invokeCallback(CameraWrapper& cameraWrapper, int faceCount)
+void CameraWrapper::fireFaceCount(int faceCount)
 {
-    //jni thread may not able to invoke java callback
     // double check it's all ok
-    int getEnvStat = cameraWrapper.javaVM->GetEnv((void **)&(cameraWrapper.javaEnv), JNI_VERSION_1_6);
+    int getEnvStat = javaVM->GetEnv((void **)&(javaEnv), JNI_VERSION_1_6);
     if (getEnvStat == JNI_EDETACHED)
     {
         //LOG_WARN << "GetEnv: not attached" << std::endl;
-        if (cameraWrapper.javaVM->AttachCurrentThread(&(cameraWrapper.javaEnv), NULL) != 0)
+        if (javaVM->AttachCurrentThread(&(javaEnv), NULL) != 0)
             LOG_WARN << "Failed to attach" << LOG_ENDL;
         else
             getEnvStat = JNI_OK;
     }
-    else if (getEnvStat == JNI_OK)
-    {
+    else if (getEnvStat == JNI_OK){
     }
     else if (getEnvStat == JNI_EVERSION)
         LOG_WARN << "GetEnv: version not supported" << LOG_ENDL;
     else if (getEnvStat == JNI_ERR)
         LOG_WARN << "GetEnv: JNI_ERR" << LOG_ENDL;
 
-    cameraWrapper.javaEnv->CallStaticVoidMethod(cameraWrapper.faceCallbackClazz, cameraWrapper.faceCallbackFunc, cameraWrapper.cameraIdx, faceCount);
+    javaEnv->CallStaticVoidMethod(faceCallbackClazz, faceCallbackFunc, cameraIdx, faceCount);
 
-    if (cameraWrapper.javaEnv->ExceptionCheck())
-        cameraWrapper.javaEnv->ExceptionDescribe();
+    if (javaEnv->ExceptionCheck())
+        javaEnv->ExceptionDescribe();
 
-    cameraWrapper.javaVM->DetachCurrentThread();
+    javaVM->DetachCurrentThread();
 }
 
 bool cw_pm_breaker_ptr_paint(const PipeMaterial* pm, void* args)
@@ -357,22 +355,22 @@
     return false;
 }
 
-bool cw_pm_breaker_ptr_face(const PipeMaterial* pm, void* args)
-{
-    CameraWrapper& cameraWrapper = *(CameraWrapper*)args;
-
-    if (cameraWrapper.faceCacheLocked)
-        return false;
-
-    int faceCount = cameraWrapper.faceCache.getFaceCount(*pm);
-    if (faceCount <= 0 || cameraWrapper.faceCallbackFunc == 0)
-        return false;
-
-    cameraWrapper.faceCache.cachePm(*pm);
-    invokeCallback(cameraWrapper, faceCount);
-
-    return false;
-}
+//bool cw_pm_breaker_ptr_face(const PipeMaterial* pm, void* args)
+//{
+//    CameraWrapper& cameraWrapper = *(CameraWrapper*)args;
+//
+//    if (cameraWrapper.faceCacheLocked)
+//        return false;
+//
+//    int faceCount = cameraWrapper.faceCache.getFaceCount(*pm);
+//    if (faceCount <= 0 || cameraWrapper.faceCallbackFunc == 0)
+//        return false;
+//
+//    cameraWrapper.faceCache.cachePm(*pm);
+//    invokeCallback(cameraWrapper, faceCount);
+//
+//    return false;
+//}
 
 void test_paint(CameraWrapper& cameraWrapper)
 {
@@ -447,14 +445,14 @@
 
         cameraWrapper.lastAliveTime = time(nullptr);
 
-        if (! cameraWrapper.faceCacheLocked)
-        {
-            PipeMaterial pmAnalizer(pm);
-            PipeLineElem* last = cameraWrapper.pipeLineAnalyzer->pipe(&pmAnalizer);
-            bool ret = last->gain(pmAnalizer);
-            if (ret)
-                pmAnalizer.breake(PipeMaterial::PMT_PTR, MB_Frame::MBFT__FIRST, cw_pm_breaker_ptr_face, &(cameraWrapper));
-        }
+        //if (! cameraWrapper.faceCacheLocked)
+        //{
+        //    PipeMaterial pmAnalizer(pm);
+        //    PipeLineElem* last = cameraWrapper.pipeLineAnalyzer->pipe(&pmAnalizer);
+        //    bool ret = last->gain(pmAnalizer);
+        //    if (ret)
+        //        pmAnalizer.breake(PipeMaterial::PMT_PTR, MB_Frame::MBFT__FIRST, cw_pm_breaker_ptr_face, &(cameraWrapper));
+        //}
 
         pm.breake(PipeMaterial::PMT_PTR, MB_Frame::MBFT__FIRST, cw_pm_breaker_ptr_paint, &(cameraWrapper));
 
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperClient.h b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperClient.h
index 9705fa6..ef7d6f4 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperClient.h
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperClient.h
@@ -75,7 +75,7 @@
 
 	void lockFace();
 	void releaseFace();
-
+	void fireFaceCount(int faceCount);
 	void setFaceLabel(int st_track_id, const std::wstring& label);
 
 private:
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperServer.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperServer.cpp
index 7c1adbd..677f004 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperServer.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperServer.cpp
@@ -1,4 +1,5 @@
 #include "CameraWrapperServer.h"
+#include "RemoteFuncServer.h"
 #include <logger.h>
 #include <Logger/src/logger.hpp>
 #include <MaterialBuffer.h>
@@ -10,7 +11,6 @@
 #include <PL_ColorConv.h>
 #include <PL_AndroidMediaCodecEncoder.h>
 #include <PL_RTSPServer.h>
-
 CameraWrapper::~CameraWrapper()
 {
 	stop();
@@ -372,17 +372,21 @@
 bool cw_pm_breaker_ptr_face(const PipeMaterial* pm, void* args)
 {
     CameraWrapper& cameraWrapper = *(CameraWrapper*)args;
-
     if (cameraWrapper.faceCacheLocked)
         return false;
 
     int faceCount = cameraWrapper.faceCache.getFaceCount(*pm);
     if (faceCount <= 0 || cameraWrapper.faceCallbackFunc == 0)
         return false;
-
     cameraWrapper.faceCache.cachePm(*pm);
-    invokeCallback(cameraWrapper, faceCount);
-
+    //remote call start, 涓轰簡淇濊瘉閫氱敤鎬э紝鏈皢浠ヤ笅姝ラ灏佸叆RtspFaceDetectClient
+    RtspFaceDetectClient &client = getRtspFaceDetectClient();
+    auto request = client.fireFaceCountListenerRequest();
+    request.setCameraIndex(cameraWrapper.cameraIdx);
+    request.setFaceCount(cameraWrapper.faceCache.getFaceCount(*pm));
+    auto sendAct = request.send();
+    sendAct.wait(client.getWaitScope());
+    //remote call end
     return false;
 }
 
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCache.h b/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCache.h
index 2f9cea5..917fc08 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCache.h
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCache.h
@@ -4,6 +4,8 @@
 #include <PipeLine.h>
 #include <vector>
 
+#define FACECACHEFORPLBG_RESULT_BUFFSIZE (1920 * 1080 * 2)
+
 struct NativeImgIdx
 {
 	int st_track_id;
@@ -56,11 +58,21 @@
 	size_t getFaceCount(const PipeMaterial& pm) const;
 
 	bool getFaceListPb(uint8_t* buffer, size_t& buffMaxSize);
+	uint8_t* getFaceListPb(size_t& buffSize)
+	{
+		buffSize = FACECACHEFORPLBG_RESULT_BUFFSIZE;
+		if (!getFaceListPb(resultBuffer, buffSize))
+			return nullptr;
+		return resultBuffer;//#todo to cpp
+	}
 
 	bool getFaceListImage(std::vector<NativeImgIdx>& imgIdxes, uint8_t* buffImg, size_t& buffImgMaxSize);
+	uint8_t* getFaceListImage(size_t& buffSize);
+
 
 private:
 	void* _ctx;
+	uint8_t* resultBuffer;
 };
 
 #endif
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCacheForPLBG.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCacheForPLBG.cpp
index 7a82720..b7502eb 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCacheForPLBG.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCacheForPLBG.cpp
@@ -152,14 +152,16 @@
 	}
 };
 
-FaceCacheForPLBG::FaceCacheForPLBG() : _ctx(new FcPmBreackerContextPLBG)
+FaceCacheForPLBG::FaceCacheForPLBG() : _ctx(new FcPmBreackerContextPLBG), resultBuffer(nullptr)
 {
-
+	resultBuffer = new uint8_t[FACECACHEFORPLBG_RESULT_BUFFSIZE];
 }
 
 FaceCacheForPLBG::~FaceCacheForPLBG()
 {
 	delete (FcPmBreackerContextPLBG*)_ctx;
+	delete resultBuffer;
+	resultBuffer = nullptr;
 }
 
 
@@ -226,7 +228,6 @@
 		return 0;
 }
 
-
 bool FaceCacheForPLBG::getFaceListPb(uint8_t* buffer, size_t& buffMaxSize)
 {
 	FcPmBreackerContextPLBG& ctx(*(FcPmBreackerContextPLBG*)_ctx);
@@ -276,7 +277,6 @@
 	return buffMaxSize > 0;
 }
 
-
 bool FaceCacheForPLBG::getFaceListImage(std::vector<NativeImgIdx>& imgIdxes, uint8_t* buffImg, size_t& buffImgMaxSize)
 {
 	FcPmBreackerContextPLBG& ctx(*(FcPmBreackerContextPLBG*)_ctx);
@@ -313,4 +313,3 @@
 
 	return  true;
 }
-
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFunc.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFunc.cpp
index b8ee965..2034887 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFunc.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFunc.cpp
@@ -1,49 +1,4 @@
-//
-// Created by pansen on 2017/8/4.
-//
-
-#include "RemoteFunc.h"
-#include <logger.h>
-
-
-bool RemoteServer::start() {
-    LOG_INFO << "server_thd::start" << LOG_ENDL;
-
-    if(running == true){
-        LOG_INFO << "The server_thd is already running" << LOG_ENDL;
-        return false;
-    }
-    running = true;
-    pthread_mutex_init(&mutexSerevr, NULL); // 鍒濆鍖栦簰鏂ュ璞�,鍔ㄦ�佸姞閿侊紝鐢ㄤ簬server
-
-    int retServer = pthread_create(&server_thd, NULL, RemoteServer::rServer_thd, this);
-
-    if(retServer != 0)
-    {
-        LOGP(ERROR, "server_thd_create: %s/n", strerror(retServer));
-        running = false;
-        return false;
-    }
-    return true;
-}
-
-void RemoteServer::stop() {
-//    LOG_INFO << "server_thd::stop" << LOG_ENDL;
-//    if (!running)
-//        return;
-//    running = false;
-//    pthread_mutex_destroy(&mutexSerevr);
-    //#todo
-}
-
-template <class T>
-void *RemoteServer::rServer_thd(void *arg) {
-    LOG_INFO << "RemoteServer::rServer_thd start" << LOG_ENDL;
-    RemoteServer& rs = *(RemoteServer*)arg;
-    capnp::EzRpcServer trpcServer(kj::heap<T>(),rs.host, rs.port);
-    auto& serverLoop = trpcServer.getWaitScope();
-    kj::NEVER_DONE.wait(serverLoop);
-    LOG_INFO << "RemoteServer::rServer_thd stop" << LOG_ENDL;
-}
-
-
+//
+// Created by pansen on 2017/8/4.
+//
+#include "RemoteFunc.h"
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFunc.h b/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFunc.h
index 83c55c0..422237d 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFunc.h
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFunc.h
@@ -1,35 +1,61 @@
-//
-// Created by pansen on 2017/8/4.
-//
-
-#ifndef RTSPNATIVECODEC_REMOTEFUNC_H
-#define RTSPNATIVECODEC_REMOTEFUNC_H
-
-#include <iostream>
-#include <capnp/ez-rpc.h>
-#include "RemoteMethod.proto.h"
-
-//::capnp::Capability::Server
-template <class T> class RemoteServer{
-public:
-//    RemoteServer(std::string host, int port, capnp::EzRpcServer rpcServer) : rpcServer(rpcServer) {
-//        this->rpcServer(kj::heap<T>(),host, port);
-//                //.rpcServer(kj::heap<T>(),host, port);
-//    };
-    RemoteServer(std::string host,int port):host(host),port(port){};
-    ~RemoteServer(){};
-
-    bool start();
-    void stop();
-    bool running;
-private:
-    std::string host;
-    int port;
-
-    static void *rServer_thd(void *arg);
-
-    pthread_t server_thd;
-    pthread_mutex_t mutexSerevr;
-};
-#endif //RTSPNATIVECODEC_REMOTEFUNC_H
-
+//
+// Created by pansen on 2017/8/4.
+//
+
+#ifndef RTSPNATIVECODEC_REMOTEFUNC_H
+#define RTSPNATIVECODEC_REMOTEFUNC_H
+
+#include <iostream>
+#include <capnp/ez-rpc.h>
+#include <logger.h>
+
+template <class T> class RemoteServer{
+public:
+    RemoteServer(std::string host,int port):host(host),port(port){};
+    ~RemoteServer(){};
+
+    bool start() {
+        LOG_INFO << "server_thd::start" << LOG_ENDL;
+
+        if(running == true){
+            LOG_INFO << "The server_thd is already running" << LOG_ENDL;
+            return false;
+        }
+        running = true;
+        pthread_mutex_init(&mutexSerevr, NULL); // 鍒濆鍖栦簰鏂ュ璞�,鍔ㄦ�佸姞閿侊紝鐢ㄤ簬server
+
+        int retServer = pthread_create(&server_thid, NULL, RemoteServer::rServer_thd, this);
+
+        if(retServer != 0)
+        {
+            LOGP(ERROR, "server_thd_create: %s/n", strerror(retServer));
+            running = false;
+            return false;
+        }
+        return true;
+    }
+    void stop(){
+//    LOG_INFO << "server_thd::stop" << LOG_ENDL;
+//    if (!running)
+//        return;
+//    running = false;
+//    pthread_mutex_destroy(&mutexSerevr);
+        //#todo
+    }
+
+    bool running;
+private:
+    std::string host;
+    int port;
+
+    static void *rServer_thd(void *arg) {
+        RemoteServer& rs = *(RemoteServer*)arg;
+        capnp::EzRpcServer trpcServer(kj::heap<T>(),rs.host, rs.port);
+        auto& serverLoop = trpcServer.getWaitScope();
+        kj::NEVER_DONE.wait(serverLoop);
+    }
+    pthread_t server_thid;
+    pthread_mutex_t mutexSerevr;
+};
+#endif //RTSPNATIVECODEC_REMOTEFUNC_H
+
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncClient.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncClient.cpp
index b423f48..5bc9c0d 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncClient.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncClient.cpp
@@ -2,4 +2,25 @@
 // Created by pansen on 2017/8/4.
 //
 
-
+#include "RemoteFuncClient.h"
+#include "RemoteFunc.h"
+#include "RtspNativeCodecJNIClient.h"
+RemoteServer<RtspFaceDetectImpl> remoteServer("127.0.0.1",8111);
+void startRemoteServer(){
+    remoteServer.start();
+}
+RtspFaceViewClient rtspFaceViewClient;
+RtspFaceViewClient& RtspFaceViewClient(){
+    return rtspFaceViewClient;
+}
+RtspFaceViewClient::RtspFaceViewClient():rpcClient("127.0.0.1",8112),
+                                         RtspFaceView::Client(rpcClient.getMain<RtspFaceView>())
+{}
+::kj::WaitScope& RtspFaceViewClient::getWaitScope(){
+    return rpcClient.getWaitScope();
+}
+::kj::Promise<void> RtspFaceDetectImpl::fireFaceCountListener(FireFaceCountListenerContext context) {
+    auto results = context.getResults();
+    remoteFireFaceCountListener(context.getParams(), results);
+    context.setResults(results);
+}
\ No newline at end of file
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncClient.h b/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncClient.h
index bff5df3..75f482b 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncClient.h
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncClient.h
@@ -5,32 +5,24 @@
 #ifndef RTSPNATIVECODEC_REMOTEMETHODCLIENT_H
 #define RTSPNATIVECODEC_REMOTEMETHODCLIENT_H
 
-#include <iostream>
+#include <string>
 #include <capnp/ez-rpc.h>
 #include "RemoteMethod.proto.h"
 #include "CameraWrapperServer.h"
-
-const RtspFaceView::Client getRtspFaceViewClient();
-
-class RtspFaceViewClient{
+void startRemoteServer();
+class RtspFaceViewClient : RtspFaceView::Client{
 public:
     RtspFaceViewClient();
-    ~RtspFaceViewClient();
-
-    RtspFaceView::GetFaceListResults::Reader getFaceList(int cameraIndex);
-    RtspFaceView::GetFaceListResults::Reader getFaceImages(int cameraIndex);
-    void setFaceLable(int cameraIndex,int trackId,std::string label);
-
+    ~RtspFaceViewClient(){};
+    ::kj::WaitScope& getWaitScope();
 private:
     capnp::EzRpcClient rpcClient;
-    RtspFaceDetect::Client client;
 };
+
+const RtspFaceViewClient& getRtspFaceViewClient();
 
 class RtspFaceDetectImpl final : public RtspFaceDetect::Server{
 public:
-    RtspFaceDetectImpl();
-    ~RtspFaceDetectImpl();
-
     virtual ::kj::Promise<void> fireFaceCountListener(FireFaceCountListenerContext context) override ;
 };
 
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.cpp
index b768f8a..963b60c 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.cpp
@@ -1,32 +1,42 @@
-//
-// Created by pansen on 2017/8/4.
-//
-#include "RemoteFuncServer.h"
-
-RtspFaceDetectClient rtspFaceDetectClient;
-
-const RtspFaceDetectClient& getRtspFaceDetectClient(){
-   return rtspFaceDetectClient;
-}
-
-//#todo
-RtspFaceDetectClient::RtspFaceDetectClient():rpcClient("127.0.0.1",8111),
-                           client(rpcClient.getMain<RtspFaceDetect>())
-{}
-void RtspFaceDetectClient::fireFaceCountListener(int cameraIndex, int faceCount){
-        auto req = client.fireFaceCountListenerRequest();
-        req.setCameraIndex(cameraIndex);
-        req.setFaceCount(faceCount);
-        auto send = req.send();
-        send.wait(rpcClient.getWaitScope());
-}
-
-
-
-//#todo
-::kj::Promise<void> RtspFaceViewImpl::RtspFaceViewImpl() {}
-::kj::Promise<void> RtspFaceViewImpl::~RtspFaceViewImpl(){}
-
-::kj::Promise<void> RtspFaceViewImpl::getFaceList(GetFaceListContext context) override{}
-::kj::Promise<void> RtspFaceViewImpl::getFaceImages(GetFaceImagesContext context) override{}
-::kj::Promise<void> RtspFaceViewImpl::setFaceLabel(SetFaceLabelContext context) override {}
+//
+// Created by pansen on 2017/8/4.
+//
+#include "AppConfig.h"
+#include "RemoteFunc.h"
+#include "RemoteFuncServer.h"
+#include "RtspNativeCodecJNIServer.h"
+RemoteServer<RtspFaceViewImpl> remoteServer("127.0.0.1",8112);
+RtspFaceDetectClient rtspFaceDetectClient;
+void startRemoteServer(){
+    AppConfig config;
+    config.loadConfig("data/config.cfg");
+    remoteServer.start();
+}
+RtspFaceDetectClient& getRtspFaceDetectClient(){
+   return rtspFaceDetectClient;
+}
+//#todo
+RtspFaceDetectClient::RtspFaceDetectClient():rpcClient("127.0.0.1",8111),
+                                             RtspFaceDetect::Client(rpcClient.getMain<RtspFaceDetect>())
+{}
+::kj::WaitScope& RtspFaceDetectClient::getWaitScope() {
+    return rpcClient.getWaitScope();
+}
+
+::kj::Promise<void> RtspFaceViewImpl::getFaceList(GetFaceListContext context) {
+    auto results = context.getResults();
+    remoteGetFaceList(context.getParams(), results);
+    context.setResults(results);
+}
+
+::kj::Promise<void> RtspFaceViewImpl::getFaceImages(GetFaceImagesContext context){
+    auto results = context.getResults();
+    remoteGetFaceListImage(context.getParams(), results);
+    context.setResults(results);
+}
+
+::kj::Promise<void> RtspFaceViewImpl::setFaceLabel(SetFaceLabelContext context) {
+    auto results = context.getResults();
+    remoteSetFaceLabel(context.getParams(), results);
+    context.setResults(results);
+}
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.h b/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.h
index 5cf671e..31a19d5 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.h
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RemoteFuncServer.h
@@ -1,46 +1,37 @@
-//
-// Created by pansen on 2017/8/4.
-//
-
-#ifndef RTSPNATIVECODEC_REMOTEMETHODSERVER_H
-#define RTSPNATIVECODEC_REMOTEMETHODSERVER_H
-
-#include <iostream>
-#include <capnp/ez-rpc.h>
-#include "RemoteMethod.proto.h"
-#include "CameraWrapperServer.h"
-
-const RtspFaceDetectClient& getRtspFaceDetectClient();
-
-class RtspFaceDetectClient{
-public:
-    RtspFaceDetectClient();
-    ~RtspFaceDetectClient();
-
-    void fireFaceCountListener(int cameraIndex, int faceCount);
-
-private:
-    capnp::EzRpcClient rpcClient;
-    RtspFaceDetect::Client client;
-};
-
-class RtspFaceViewImpl final : public RtspFaceView::Server {
-public:
-    RtspFaceViewImpl();
-
-    ~RtspFaceViewImpl();
-
-    virtual ::kj::Promise<void> getFaceList(GetFaceListContext context) override;
-
-
-    virtual ::kj::Promise<void> getFaceImages(GetFaceImagesContext context) override;
-
-    virtual ::kj::Promise<void> setFaceLabel(SetFaceLabelContext context) override ;
-
-private:
-    CameraWrapper cameraWrapper;
-};
-
-
-
-#endif //RTSPNATIVECODEC_REMOTEMETHODSERVER_H
+//
+// Created by pansen on 2017/8/4.
+//
+
+#ifndef RTSPNATIVECODEC_REMOTEMETHODSERVER_H
+#define RTSPNATIVECODEC_REMOTEMETHODSERVER_H
+
+#include <string>
+#include <capnp/ez-rpc.h>
+#include "RemoteMethod.proto.h"
+
+class RtspFaceDetectClient :public RtspFaceDetect::Client{
+public:
+    RtspFaceDetectClient();
+    ~RtspFaceDetectClient(){};
+    ::kj::WaitScope& getWaitScope();
+private:
+    capnp::EzRpcClient rpcClient;
+};
+
+void startRemoteServer();
+RtspFaceDetectClient& getRtspFaceDetectClient();
+
+class RtspFaceViewImpl final : public RtspFaceView::Server {
+public:
+    virtual ::kj::Promise<void> getFaceList(GetFaceListContext context) override;
+
+    virtual ::kj::Promise<void> getFaceImages(GetFaceImagesContext context) override;
+
+    virtual ::kj::Promise<void> setFaceLabel(SetFaceLabelContext context) override;
+
+private:
+};
+
+
+
+#endif //RTSPNATIVECODEC_REMOTEMETHODSERVER_H
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIClient.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIClient.cpp
index 72f5046..c4a679e 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIClient.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIClient.cpp
@@ -10,7 +10,6 @@
 #include <media/NdkMediaExtractor.h>
 
 #include <pthread.h>
-
 #include <ev_proto.h>
 #include <face_daemon_proto.h>
 
@@ -20,7 +19,6 @@
 #include "TeleWrapper.h"
 
 #include "cpu_sched_test.h"
-
 //#include <mediastreamer2/include/mediastreamer2/msjava.h>
 
 std::stringstream logss;
@@ -36,14 +34,21 @@
 
 TeleWrapper g_TeleWrapper;
 
+const size_t _faceImagesSize = MAX_FACE * MAX_FACE_WIDTH * MAX_FACE_HEIGHT * 3;
+uint8_t _faceImages[_faceImagesSize]; // android stack is small
+void remoteFireFaceCountListener(const RtspFaceDetect::FireFaceCountListenerParams::Reader& params, RtspFaceDetect::FireFaceCountListenerResults::Builder& results){
+    int count = params.getFaceCount();
+    int index = params.getCameraIndex();
+    g_CameraWrappers[index].fireFaceCount(count);
+}
 extern "C"
 {
 
 void Java_cn_com_basic_face_util_RtspFaceNative_init(JNIEnv *env, jclass clazz)
-{
-    g_logger.set_level(INFO);
+    {
+        g_logger.set_level(INFO);
 
-    cpu_sched();
+        cpu_sched();
 
 #ifdef USE_ST_SDK
     PipeLine::register_global_elem_creator("PL_SensetimeFaceTrackMitiTrd", create_PL_SensetimeFaceTrackMultiTrd);
@@ -75,174 +80,6 @@
         g_CameraWrappers[i].rtspConfig.requestStreamingOverTcp = true;
     }
     env->ReleaseStringUTFChars(ipaddr, utf8);
-}
-
-//static jclass _jcOutputSurface = nullptr;
-//static jmethodID _jmOutputSurface_ctor = nullptr;
-//static jmethodID _jmOutputSurface_getSurface = nullptr;
-//static jmethodID _jmOutputSurface_readPixels = nullptr;
-//static jmethodID _jmOutputSurface_awaitNewImage = nullptr;
-//static jmethodID _jmOutputSurface_drawImage = nullptr;
-//static jmethodID _jmOutputSurface_makeCurrent = nullptr;
-//
-//static jobject _jobjOutputSurface = nullptr;
-//static jobject _jobjSurface = nullptr;
-//static JNIEnv *_env = nullptr;
-
-void readPixels(void *surface, uint8_t *buf, size_t &maxSize)
-{
-    //ANativeWindow* window = (ANativeWindow*)surface;
-
-    CameraWrapper &cameraWrapper(g_CameraWrappers[0]);
-
-    int getEnvStat = cameraWrapper.javaVM->GetEnv((void **) &(cameraWrapper.javaEnv),
-                                                  JNI_VERSION_1_6);
-    if (getEnvStat == JNI_EDETACHED)
-    {
-        //LOG_WARN << "GetEnv: not attached" << std::endl;
-        if (cameraWrapper.javaVM->AttachCurrentThread(&(cameraWrapper.javaEnv), NULL) != 0)
-            LOG_WARN << "Failed to attach" << LOG_ENDL;
-        else
-            getEnvStat = JNI_OK;
-    } else if (getEnvStat == JNI_OK)
-    {
-    } else if (getEnvStat == JNI_EVERSION)
-        LOG_WARN << "GetEnv: version not supported" << LOG_ENDL;
-    else if (getEnvStat == JNI_ERR)
-        LOG_WARN << "GetEnv: JNI_ERR" << LOG_ENDL;
-
-    if (maxSize == 0)
-    {
-        //cameraWrapper.javaEnv->CallVoidMethod(_jobjOutputSurface, _jmOutputSurface_makeCurrent);
-    } else
-    {
-        //cameraWrapper.javaEnv->CallVoidMethod(_jobjOutputSurface, _jmOutputSurface_awaitNewImage);
-        //cameraWrapper.javaEnv->CallVoidMethod(_jobjOutputSurface, _jmOutputSurface_drawImage);
-//
-        //jbyteArray jbarrBuffer = (jbyteArray)cameraWrapper.javaEnv->CallObjectMethod(_jobjOutputSurface, _jmOutputSurface_readPixels);
-        //if (jbarrBuffer != nullptr)
-        //    cameraWrapper.javaEnv->GetByteArrayRegion(jbarrBuffer, 0, 640 * 480 * 2, (jbyte*)buf);
-    }
-
-    if (cameraWrapper.javaEnv->ExceptionCheck())
-        cameraWrapper.javaEnv->ExceptionDescribe();
-
-    cameraWrapper.javaVM->DetachCurrentThread();
-}
-
-
-/*
-static void* createDecodeSurface()
-{
-    CameraWrapper& cameraWrapper(g_CameraWrappers[0]);
-
-    //OutputSurface outputSurface = null;
-    //outputSurface = new OutputSurface(mWidth, mHeight);
-    //outputSurface.getSurface();
-    //outputSurface.release();
-
-
-    //int getEnvStat = cameraWrapper.javaVM->GetEnv((void **)&(cameraWrapper.javaEnv), JNI_VERSION_1_6);
-    //if (getEnvStat == JNI_EDETACHED)
-    //{
-    //    //LOG_WARN << "GetEnv: not attached" << std::endl;
-    //    if (cameraWrapper.javaVM->AttachCurrentThread(&(cameraWrapper.javaEnv), NULL) != 0)
-    //        LOG_WARN << "Failed to attach" << LOG_ENDL;
-    //    else
-    //        getEnvStat = JNI_OK;
-    //}
-    //else if (getEnvStat == JNI_OK)
-    //{
-    //}
-    //else if (getEnvStat == JNI_EVERSION)
-    //    LOG_WARN << "GetEnv: version not supported" << LOG_ENDL;
-    //else if (getEnvStat == JNI_ERR)
-    //    LOG_WARN << "GetEnv: JNI_ERR" << LOG_ENDL;
-
-    //void* ret = nullptr;
-    //{
-    //    jclass jcOutputSurface = _jcOutputSurface = cameraWrapper.javaEnv->FindClass("com/example/nativecodec/OutputSurface");
-    //    _jcOutputSurface = static_cast<jclass>( cameraWrapper.javaEnv->NewGlobalRef( jcOutputSurface ));
-//
-    //    jmethodID jmOutputSurface_ctor = _jmOutputSurface_ctor = cameraWrapper.javaEnv->GetMethodID(jcOutputSurface, "<init>", "(II)V");
-    //    jmethodID jmOutputSurface_getSurface = _jmOutputSurface_getSurface = cameraWrapper.javaEnv->GetMethodID(jcOutputSurface, "getSurface", "()Landroid/view/Surface;");
-    //    jmethodID jmOutputSurface_readPixels = _jmOutputSurface_readPixels = cameraWrapper.javaEnv->GetMethodID(jcOutputSurface, "readPixels", "()[B");
-//
-    //    jmethodID jmOutputSurface_awaitNewImage = _jmOutputSurface_awaitNewImage = cameraWrapper.javaEnv->GetMethodID(jcOutputSurface, "awaitNewImage", "()V");
-    //    jmethodID jmOutputSurface_drawImage = _jmOutputSurface_drawImage = cameraWrapper.javaEnv->GetMethodID(jcOutputSurface, "drawImage", "()V");
-    //    jmethodID jmOutputSurface_makeCurrent = _jmOutputSurface_makeCurrent = cameraWrapper.javaEnv->GetMethodID(jcOutputSurface, "makeCurrent", "()V");
-//
-    //    jobject jobjOutputSurface = _jobjOutputSurface = cameraWrapper.javaEnv->NewObject(jcOutputSurface , jmOutputSurface_ctor, 1920, 1088);
-    //    _jobjOutputSurface = static_cast<jobject>( cameraWrapper.javaEnv->NewGlobalRef( jobjOutputSurface ));
-//
-    //    jobject jobjSurface = _jobjSurface = cameraWrapper.javaEnv->CallObjectMethod(jobjOutputSurface, jmOutputSurface_getSurface);
-    //    ret = ANativeWindow_fromSurface(cameraWrapper.javaEnv, jobjSurface);
-    //    cameraWrapper.amcdConfig.readPixels_callback = readPixels;
-    //}
-
-    //if (cameraWrapper.javaEnv->ExceptionCheck())
-    //    cameraWrapper.javaEnv->ExceptionDescribe();
-//
-    //cameraWrapper.javaVM->DetachCurrentThread();
-
-    //return  ret;
-}
-*/
-
-static void *getSurfaceHolderGetSurface(JNIEnv *env, jobject jobjSurfaceHolder)
-{
-    jclass jcSurfaceHolder = env->FindClass("android/view/SurfaceHolder");
-    jmethodID jmSurfaceHolder_getSurface = env->GetMethodID(jcSurfaceHolder, "getSurface", "()Landroid/view/Surface;");
-    jobject surface = env->CallObjectMethod(jobjSurfaceHolder, jmSurfaceHolder_getSurface);
-    return surface;
-}
-
-// set the surface
-void Java_cn_com_basic_face_util_RtspFaceNative_setSurface(JNIEnv *env, jclass clazz, jint cameraIdx,
-                                                           jobject surfaceRender)
-{
-    LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_setSurface" << LOG_ENDL;
-    assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT);
-    cameraIdx -= 1;
-
-    CameraWrapper &cameraWrapper(g_CameraWrappers[cameraIdx]);
-
-    // obtain a native windowRender from a Java surface
-    if (cameraWrapper.windowDecode != nullptr)
-    {
-        ANativeWindow_release((ANativeWindow *) (cameraWrapper.windowDecode));
-        cameraWrapper.windowDecode = NULL;
-    }
-    cameraWrapper.windowDecode = ANativeWindow_fromSurface(env, surfaceRender);
-    //cameraWrapper.windowDecode = getSurfaceHolderGetSurface(env, surfaceRender);
-    //cameraWrapper.windowDecode = ANativeWindow_fromSurface(env, (jobject)getSurfaceHolderGetSurface(env, surfaceRender));
-
-    if (cameraWrapper.windowRender != nullptr)
-    {
-        ANativeWindow_release((ANativeWindow *) (cameraWrapper.windowRender));
-        cameraWrapper.windowRender = NULL;
-    }
-    cameraWrapper.windowRender = ANativeWindow_fromSurface(env, surfaceRender);
-    cameraWrapper.asvrConfig.windowSurface = cameraWrapper.windowRender; // support reset
-    //cameraWrapper.windowRender = ANativeWindow_fromSurface(env, (jobject)getSurfaceHolderGetSurface(env, surfaceRender));
-
-    {
-        ANativeWindow* window = (ANativeWindow*)(cameraWrapper.windowRender);
-        ANativeWindow_Buffer buffer;
-        if(cameraWrapper.windowRender != nullptr && ANativeWindow_lock(window, &buffer, NULL) == 0)
-        {
-            cameraWrapper.plScaleCfg.toHeight=buffer.height;
-            cameraWrapper.plScaleCfg.toWidth=buffer.stride;
-            ANativeWindow_unlockAndPost(window);
-        }
-        else
-        {
-            cameraWrapper.plScaleCfg.toHeight=480;
-            cameraWrapper.plScaleCfg.toWidth=640;
-        }
-    }
-
-    LOGP(DEBUG, "@@@ setsurface %p,%p", cameraWrapper.windowDecode, cameraWrapper.windowRender);
 }
 
 jboolean
@@ -444,6 +281,17 @@
                                                 cameraWrapper.cameraIdx, 0);
 }
 
+JNIEXPORT jboolean JNICALL
+Java_cn_com_basic_face_util_RtspFaceNative_addFaceCountListener(JNIEnv *env, jclass type,
+                                                                jint cameraIdx, jstring host_,
+                                                                jint port) {
+    const char *host = env->GetStringUTFChars(host_, 0);
+
+    //TODO
+
+    env->ReleaseStringUTFChars(host_, host);
+}
+
 void
 Java_cn_com_basic_face_util_RtspFaceNative_lockFace(JNIEnv *env, jclass clazz, jint cameraIdx)
 {
@@ -540,20 +388,19 @@
     CameraWrapper &cameraWrapper(g_CameraWrappers[cameraIdx]);
 
     std::vector<NativeImgIdx> imgIdxes;
-    size_t _faceImagesSize = MAX_FACE * MAX_FACE_WIDTH * MAX_FACE_HEIGHT * 3;
-    uint8_t *_faceImages = new uint8_t[_faceImagesSize]; // android stack is small
+
     memset(_faceImages, 0, _faceImagesSize);
 
     bool ret = false;
 
 #ifdef USE_ST_SDK
-    ret = cameraWrapper.faceCache.getFaceListImage(imgIdxes, _faceImages, _faceImagesSize);
+    size_t faceImagesSize =_faceImagesSize;
+    ret = cameraWrapper.faceCache.getFaceListImage(imgIdxes, _faceImages,faceImagesSize);
 #endif
 
     if (imgIdxes.size() == 0)
     {
         LOG_INFO << "No face image captured" << LOG_ENDL;
-        delete[] _faceImages;
         return nullptr;
     }
 
@@ -564,7 +411,6 @@
     LOG_DEBUG << "_faceImagesSize=" << _faceImagesSize << LOG_ENDL;
     env->SetByteArrayRegion(jbaFaceImages, 0, _faceImagesSize, (const jbyte *) _faceImages);
     env->SetObjectField(faceImages, jfRefByteArray_arr, jbaFaceImages);
-    delete[] _faceImages;
 
     jclass jcArrayList = env->FindClass("java/util/ArrayList");
     jmethodID jmArrayList_ctor = env->GetMethodID(jcArrayList, "<init>", "()V");
@@ -619,7 +465,6 @@
     if (imgIdxes.size() == 0)
     {
         LOG_INFO << "No face image captured" << LOG_ENDL;
-        delete[] _faceImages;
         return nullptr;
     }
 
@@ -656,9 +501,6 @@
 
         LOG_DEBUG << "imgIdx " << i << ":" << std::string(imgIdxes[i]) << LOG_ENDL;
     }
-
-    delete[] _faceImages;
-    _faceImages = nullptr;
     return jobjArrayList_Imgs;
 }
 
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIClient.h b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIClient.h
index 1e473b2..a7fa3fd 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIClient.h
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIClient.h
@@ -1,10 +1,10 @@
 #ifndef __RTSPNATIVECODECJNI_CLIENT_H__
 #define __RTSPNATIVECODECJNI_CLIENT_H__
-
-#include <jni.h>
-
 #define CAMERA_COUNT 2
+#include <jni.h>
+#include "RemoteMethod.proto.h"
 
+void remoteFireFaceCountListener(const RtspFaceDetect::FireFaceCountListenerParams::Reader& params, RtspFaceDetect::FireFaceCountListenerResults::Builder& results);
 extern "C"
 {
 
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.cpp
index 9549e1b..1ca3782 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.cpp
@@ -36,6 +36,45 @@
 
 TeleWrapper g_TeleWrapper;
 
+const size_t _faceImagesSize = MAX_FACE * MAX_FACE_WIDTH * MAX_FACE_HEIGHT * 3;
+uint8_t _faceImages[_faceImagesSize]; // android stack is small
+const size_t  _faceListBufferSize = sizeof(MAX_FACE * MAX_FACE_WIDTH * MAX_FACE_HEIGHT*3);
+uint8_t faceListBuffer[_faceListBufferSize] = {0};
+
+void remoteGetFaceListImage(const RtspFaceView::GetFaceImagesParams::Reader& params, RtspFaceView::GetFaceImagesResults::Builder& results){
+    const int cameraIdx = params.getCameraIndex() - 1;
+    CameraWrapper& cameraWrapper(g_CameraWrappers[cameraIdx]);
+    std::vector<NativeImgIdx> imgIdxes;
+    size_t faceImagesSize = _faceImagesSize;
+    memset(_faceImages, 0, _faceImagesSize);
+    bool ret = cameraWrapper.faceCache.getFaceListImage(imgIdxes, _faceImages, faceImagesSize);
+    if (imgIdxes.size() == 0){
+        LOG_INFO << "No face image captured" << LOG_ENDL;
+        return;
+    }
+    int imgIdxesSize = imgIdxes.size() * sizeof(NativeImgIdx);
+    auto imgIndexData = results.initImgIndexData(imgIdxesSize);
+    memcpy(imgIndexData.begin(), imgIdxes.data(), imgIdxesSize);
+    auto imgData = results.initImgData(_faceImagesSize);
+    memcpy(imgData.begin(), _faceImages, _faceImagesSize);
+}
+
+void remoteGetFaceList(const RtspFaceView::GetFaceListParams::Reader& params, RtspFaceView::GetFaceListResults::Builder& results){
+    const int cameraIdx = params.getCameraIndex() - 1;
+    CameraWrapper& cameraWrapper(g_CameraWrappers[cameraIdx]);
+    uint8_t *pBufPB = faceListBuffer + sizeof(EVPHeader) + sizeof(FDP_FaceDetectPB);
+    size_t faceListBufferSize = sizeof(faceListBuffer) - sizeof(EVPHeader) - sizeof(FDP_FaceDetectPB);
+    cameraWrapper.faceCache.getFaceListPb(pBufPB, faceListBufferSize);
+    auto buffer = results.initFaceList(faceListBufferSize);
+    memcpy(buffer.begin(), pBufPB, faceListBufferSize);
+}
+
+void remoteSetFaceLabel(const RtspFaceView::SetFaceLabelParams::Reader& params, RtspFaceView::SetFaceLabelResults::Builder& results){
+    const int cameraIdx = params.getCameraIndex() - 1;
+    CameraWrapper& cameraWrapper(g_CameraWrappers[cameraIdx]);
+    cameraWrapper.setFaceLabel(params.getTrackId(),std::wstring((wchar_t*)params.getLabel().begin()));
+}
+
 extern "C"
 {
 
@@ -52,7 +91,6 @@
     for (size_t i = 0; i < CAMERA_COUNT; i++)
     {
         g_CameraWrappers[i].cameraIdx = i + 1;
-
         g_CameraWrappers[i].pipeLineDecoderDetector = new PipeLine;
         g_CameraWrappers[i].pipeLineAnalyzer = new PipeLine;
         g_CameraWrappers[i].pipeLineRender = new PipeLine;
@@ -466,202 +504,6 @@
     cameraWrapper.releaseFace();
 }
 
-jint
-Java_cn_com_basic_face_util_RtspFaceNative_getFaceList(JNIEnv *env, jclass clazz, jint cameraIdx,
-                                                       jint dbId, jobject faceListPb)
-{
-    LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_getFaceList" << LOG_ENDL;
-    assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT);
-    cameraIdx -= 1;
-    CameraWrapper &cameraWrapper(g_CameraWrappers[cameraIdx]);
-
-    // #todo optimize not copy data here, set data to jbyteArray directly
-    // Y channel of YUV420p, packed in protobuf
-    uint8_t buffer[MAX_FACE * MAX_FACE_WIDTH * MAX_FACE_HEIGHT] = {0};
-    size_t buffSize = sizeof(buffer);
-
-    bool ret = false;
-#ifdef USE_ST_SDK
-    uint8_t *pBufPB = buffer + sizeof(EVPHeader) + sizeof(FDP_FaceDetectPB);
-    buffSize = sizeof(buffer) - sizeof(EVPHeader) - sizeof(FDP_FaceDetectPB);
-    ret = cameraWrapper.faceCache.getFaceListPb(pBufPB, buffSize);
-#endif
-
-    if (!ret)
-    {
-        LOG_INFO << "No face captured" << LOG_ENDL;
-        return 0;
-    }
-
-    LOG_INFO << "Face captured " << LOG_ENDL;
-
-    EVPHeader *evpHeader = new(buffer) EVPHeader;
-    evpHeader->proto = EVPProto::EVPP_PROTOBUF;
-    evpHeader->cmd = FaceDaemonCommand::FDC_SENSETIMEFACEDETECT_PB;
-    evpHeader->size = sizeof(EVPHeader) + sizeof(FDP_FaceDetectPB) + buffSize;
-    buffSize = evpHeader->size;
-
-    FDP_FaceDetectPB *fdpFaceDetectPB = new(buffer + sizeof(EVPHeader)) FDP_FaceDetectPB(dbId, cameraIdx + 1);
-
-    evpHeader->hton();
-    fdpFaceDetectPB->hton();
-
-    //{
-    //    static size_t f = 0;
-    //    char fname[50];
-    //    sprintf(fname, "/sdcard/facelist-%d-%d-%u.pb", dbId, cameraIdx, ++f);
-    //    FILE *pFile = fopen(fname, "wb");
-    //    fwrite(buffer, 1, buffSize, pFile);
-    //    fclose(pFile);
-    //    if (f > 10)exit(0);
-    //}
-
-    jclass jcRefByteArray = env->FindClass("cn/com/basic/face/util/RefByteArray");
-    jfieldID jfRefByteArray_arr = env->GetFieldID(jcRefByteArray, "arr", "[B");
-
-    jbyteArray jbaFaceListPb = env->NewByteArray(buffSize);
-    env->SetByteArrayRegion(jbaFaceListPb, 0, buffSize, (const jbyte *) buffer);
-    env->SetObjectField(faceListPb, jfRefByteArray_arr, jbaFaceListPb);
-
-#ifdef ENABLE_DEBUG_SENDFACEDETECT
-    dbgSendFaceDetect(buffer, buffSize);
-#endif
-
-    return buffSize;
-}
-
-jobject
-_Java_cn_com_basic_face_util_RtspFaceNative_getFaceImages(JNIEnv *env, jclass clazz, jint cameraIdx,
-                                                          jobject faceImages)
-{
-    LOG_DEBUG << "@@@ _Java_cn_com_basic_face_util_RtspFaceNative_getFaceImages" << LOG_ENDL;
-    assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT);
-    cameraIdx -= 1;
-    CameraWrapper &cameraWrapper(g_CameraWrappers[cameraIdx]);
-
-    std::vector<NativeImgIdx> imgIdxes;
-    size_t _faceImagesSize = MAX_FACE * MAX_FACE_WIDTH * MAX_FACE_HEIGHT * 3;
-    uint8_t *_faceImages = new uint8_t[_faceImagesSize]; // android stack is small
-    memset(_faceImages, 0, _faceImagesSize);
-
-    bool ret = false;
-
-#ifdef USE_ST_SDK
-    ret = cameraWrapper.faceCache.getFaceListImage(imgIdxes, _faceImages, _faceImagesSize);
-#endif
-
-    if (imgIdxes.size() == 0)
-    {
-        LOG_INFO << "No face image captured" << LOG_ENDL;
-        delete[] _faceImages;
-        return nullptr;
-    }
-
-    jclass jcRefByteArray = env->FindClass("cn/com/basic/face/util/RefByteArray");
-    jfieldID jfRefByteArray_arr = env->GetFieldID(jcRefByteArray, "arr", "[B");
-
-    jbyteArray jbaFaceImages = env->NewByteArray(_faceImagesSize);
-    LOG_DEBUG << "_faceImagesSize=" << _faceImagesSize << LOG_ENDL;
-    env->SetByteArrayRegion(jbaFaceImages, 0, _faceImagesSize, (const jbyte *) _faceImages);
-    env->SetObjectField(faceImages, jfRefByteArray_arr, jbaFaceImages);
-    delete[] _faceImages;
-
-    jclass jcArrayList = env->FindClass("java/util/ArrayList");
-    jmethodID jmArrayList_ctor = env->GetMethodID(jcArrayList, "<init>", "()V");
-    jmethodID jmArrayList_add = env->GetMethodID(jcArrayList, "add", "(Ljava/lang/Object;)Z");
-
-    jclass jcNativeImgIdx = env->FindClass("cn/com/basic/face/util/NativeImgIdx");
-    jmethodID jmNativeImgIdx_ctor = env->GetMethodID(jcNativeImgIdx, "<init>", "()V");
-    jfieldID jfNativeImgIdx_offset = env->GetFieldID(jcNativeImgIdx, "offset", "I");
-    jfieldID jfNativeImgIdx_size = env->GetFieldID(jcNativeImgIdx, "size", "I");
-    jfieldID jfNativeImgIdx_type = env->GetFieldID(jcNativeImgIdx, "type", "I");
-    jfieldID jfNativeImgIdx_width = env->GetFieldID(jcNativeImgIdx, "width", "I");
-    jfieldID jfNativeImgIdx_height = env->GetFieldID(jcNativeImgIdx, "height", "I");
-
-    jobject jobjArrayList_ImgIdxes = env->NewObject(jcArrayList, jmArrayList_ctor);
-
-    for (size_t i = 0; i < imgIdxes.size(); i++)
-    {
-        jobject jobjNativeImgIdx = env->NewObject(jcNativeImgIdx, jmNativeImgIdx_ctor);
-        env->SetIntField(jobjNativeImgIdx, jfNativeImgIdx_offset, imgIdxes[i].offset);
-        env->SetIntField(jobjNativeImgIdx, jfNativeImgIdx_size, imgIdxes[i].size);
-        env->SetIntField(jobjNativeImgIdx, jfNativeImgIdx_type, imgIdxes[i].type);
-        env->SetIntField(jobjNativeImgIdx, jfNativeImgIdx_width, imgIdxes[i].width);
-        env->SetIntField(jobjNativeImgIdx, jfNativeImgIdx_height, imgIdxes[i].height);
-
-        env->CallBooleanMethod(jobjArrayList_ImgIdxes, jmArrayList_add, jobjNativeImgIdx);
-
-        LOG_DEBUG << "imgIdx " << i << ":" << std::string(imgIdxes[i]) << LOG_ENDL;
-    }
-
-    return jobjArrayList_ImgIdxes;
-}
-
-jobject Java_cn_com_basic_face_util_RtspFaceNative_getFaceImages(JNIEnv *env, jclass clazz,
-                                                                 jint cameraIdx)
-{
-    LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_getFaceImages" << LOG_ENDL;
-    assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT);
-    cameraIdx -= 1;
-    CameraWrapper &cameraWrapper(g_CameraWrappers[cameraIdx]);
-
-    std::vector<NativeImgIdx> imgIdxes;
-    size_t _faceImagesSize = MAX_FACE * MAX_FACE_WIDTH * MAX_FACE_HEIGHT * 3;
-    uint8_t *_faceImages = new uint8_t[_faceImagesSize]; // android stack is small
-    memset(_faceImages, 0, _faceImagesSize);
-
-    bool ret = false;
-
-#ifdef USE_ST_SDK
-    ret = cameraWrapper.faceCache.getFaceListImage(imgIdxes, _faceImages, _faceImagesSize);
-#endif
-
-    if (imgIdxes.size() == 0)
-    {
-        LOG_INFO << "No face image captured" << LOG_ENDL;
-        delete[] _faceImages;
-        return nullptr;
-    }
-
-    jclass jcArrayList = env->FindClass("java/util/ArrayList");
-    jmethodID jmArrayList_ctor = env->GetMethodID(jcArrayList, "<init>", "()V");
-    jmethodID jmArrayList_add = env->GetMethodID(jcArrayList, "add", "(Ljava/lang/Object;)Z");
-
-    jclass jcNativeImg = env->FindClass("cn/com/basic/face/util/NativeImg");
-    jmethodID jmNativeImg_ctor = env->GetMethodID(jcNativeImg, "<init>", "()V");
-    jfieldID jfNativeImg_st_track_id = env->GetFieldID(jcNativeImg, "st_track_id", "I");
-    jfieldID jfNativeImg_size = env->GetFieldID(jcNativeImg, "size", "I");
-    jfieldID jfNativeImg_type = env->GetFieldID(jcNativeImg, "type", "I");
-    jfieldID jfNativeImg_width = env->GetFieldID(jcNativeImg, "width", "I");
-    jfieldID jfNativeImg_height = env->GetFieldID(jcNativeImg, "height", "I");
-    jfieldID jfNativeImg_image = env->GetFieldID(jcNativeImg, "image", "[B");
-
-    jobject jobjArrayList_Imgs = env->NewObject(jcArrayList, jmArrayList_ctor);
-
-    for (size_t i = 0; i < imgIdxes.size(); i++)
-    {
-        jobject jobjNativeImg = env->NewObject(jcNativeImg, jmNativeImg_ctor);
-        env->SetIntField(jobjNativeImg, jfNativeImg_st_track_id, imgIdxes[i].st_track_id);
-        env->SetIntField(jobjNativeImg, jfNativeImg_size, imgIdxes[i].size);
-        env->SetIntField(jobjNativeImg, jfNativeImg_type, imgIdxes[i].type);
-        env->SetIntField(jobjNativeImg, jfNativeImg_width, imgIdxes[i].width);
-        env->SetIntField(jobjNativeImg, jfNativeImg_height, imgIdxes[i].height);
-
-        jbyteArray jbaFaceImage = env->NewByteArray(imgIdxes[i].size);
-        env->SetByteArrayRegion(jbaFaceImage, 0, imgIdxes[i].size,
-                                (const jbyte *) (_faceImages + imgIdxes[i].offset));
-        env->SetObjectField(jobjNativeImg, jfNativeImg_image, jbaFaceImage);
-
-        env->CallBooleanMethod(jobjArrayList_Imgs, jmArrayList_add, jobjNativeImg);
-
-        LOG_DEBUG << "imgIdx " << i << ":" << std::string(imgIdxes[i]) << LOG_ENDL;
-    }
-
-    delete[] _faceImages;
-    _faceImages = nullptr;
-    return jobjArrayList_Imgs;
-}
-
 void Java_cn_com_basic_face_util_RtspFaceNative_dbgFaceAdd(JNIEnv *env, jclass clazz,
                                                            jobject faceImage)
 {
@@ -784,24 +626,5 @@
 {
 	LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_telShutdown" << LOG_ENDL;
 	g_TeleWrapper.stop();
-}
-
-void Java_cn_com_basic_face_util_RtspFaceNative_setFaceLabel(JNIEnv *env, jclass clazz, jint cameraIdx, jint stTrackId, jstring label)
-{
-    LOG_DEBUG << "@@@ Java_cn_com_basic_face_util_RtspFaceNative_setFaceLabel" << LOG_ENDL;
-    assert(cameraIdx > 0 && cameraIdx <= CAMERA_COUNT);
-    cameraIdx -= 1;
-    CameraWrapper &cameraWrapper(g_CameraWrappers[cameraIdx]);
-    const jchar* jchars = env->GetStringChars(label, nullptr);
-    std::wstring wstr;
-    int lenth = env->GetStringLength(label);
-
-    for (int i = 0; i < lenth; ++i) {
-        jchar jc = *(jchars + i);
-        wchar_t wt = (wchar_t)jc;
-        wstr.push_back(wt);
-    }
-    env->ReleaseStringChars(label,jchars);
-    cameraWrapper.setFaceLabel(stTrackId, wstr);
 }
 } // extern C
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.h b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.h
index 964a98e..26a6561 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.h
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/RtspNativeCodecJNIServer.h
@@ -2,9 +2,17 @@
 #define __RTSPNATIVECODECJNI_SERVER_H__
 
 #include <jni.h>
+#include "CameraWrapperServer.h"
+#include "RemoteMethod.proto.h"
 
 #define CAMERA_COUNT 2
 
+//CameraWrapper& getCameraWrapper(int camidx);
+
+void remoteGetFaceListImage(const RtspFaceView::GetFaceImagesParams::Reader& params, RtspFaceView::GetFaceImagesResults::Builder& results);
+void remoteGetFaceList(const RtspFaceView::GetFaceListParams::Reader& params, RtspFaceView::GetFaceListResults::Builder& results);
+void remoteSetFaceLabel(const RtspFaceView::SetFaceLabelParams::Reader& params, RtspFaceView::SetFaceLabelResults::Builder& results);
+
 extern "C"
 {
 

--
Gitblit v1.8.0