From 72505b6ff2ee0342a6950af306da0942718ca0b4 Mon Sep 17 00:00:00 2001
From: pans <pans@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 18 八月 2017 15:54:36 +0800
Subject: [PATCH] capnp fix bug
---
VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperServer.cpp | 42 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 41 insertions(+), 1 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperServer.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperServer.cpp
index e084d8d..0cf6a61 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperServer.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperServer.cpp
@@ -10,6 +10,8 @@
#include <PL_ColorConv.h>
#include <PL_AndroidMediaCodecEncoder.h>
#include <PL_RTSPServer2.h>
+#include <iostream>
+
CameraWrapper::~CameraWrapper()
{
stop();
@@ -275,7 +277,6 @@
{
if (faceLabels.size() > 32)
faceLabels.clear();
-
faceLabels.insert(std::make_pair(st_track_id, label));
}
@@ -371,7 +372,46 @@
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);
+ //remote call start, 涓轰簡淇濊瘉閫氱敤鎬э紝鏈皢浠ヤ笅姝ラ灏佸叆RtspFaceDetectClient
+ //#todo 浼樺寲灏佽
+ try
+ {
+ LOG_INFO <<"try start"<< LOG_ENDL;
+// RtspFaceDetect::Client* rClient = getRtspFaceDetectClient()->getClient();
+// auto& waitScope = getRtspFaceDetectClient()->getWaitScope();
+
+ RtspFaceDetectClient* client = getRtspFaceDetectClient();
+ RtspFaceDetect::Client rClient = client->getEzRpcClient()->getMain<RtspFaceDetect>();
+ auto& waitScope = client->getWaitScope();
+
+ auto request = rClient.fireFaceCountListenerRequest();
+ request.setCameraIndex(cameraWrapper.cameraIdx);
+ request.setFaceCount(faceCount);
+ LOG_INFO <<"!!!!!"<<cameraWrapper.cameraIdx << "+" << faceCount << LOG_ENDL;
+ LOG_INFO <<"call client : i have face!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"<< LOG_ENDL;
+ auto sendAct = request.send();
+ sendAct.ignoreResult().wait(waitScope);
+ }
+ catch (const kj::Exception& e)
+ {
+ LOG_INFO <<"catch!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"<< LOG_ENDL;
+ LOG_ERROR << "catch!!!" <<e.getDescription().cStr() << LOG_ENDL;
+ std::cout << e.getDescription().cStr() << std::endl;
+ return false;
+ }
+ catch (std::exception e){
+ LOG_ERROR << "catch!!!" <<e.what() << LOG_ENDL;
+ }
+ //remote call end
+ return true;
}
void test_paint(CameraWrapper& cameraWrapper)
--
Gitblit v1.8.0