From a0092014ee12abf06edb1788b189cc7c57336063 Mon Sep 17 00:00:00 2001
From: chenke <chenke@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 09 八月 2017 13:42:00 +0800
Subject: [PATCH] Reverse merged revision(s) 988-987 from VisitFace/RtspNativeCodec: JsonCpp和CapnpProtocol功能初步实现 ........
---
VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperServer.cpp | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperServer.cpp b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperServer.cpp
index 677f004..7c1adbd 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperServer.cpp
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperServer.cpp
@@ -1,5 +1,4 @@
#include "CameraWrapperServer.h"
-#include "RemoteFuncServer.h"
#include <logger.h>
#include <Logger/src/logger.hpp>
#include <MaterialBuffer.h>
@@ -11,6 +10,7 @@
#include <PL_ColorConv.h>
#include <PL_AndroidMediaCodecEncoder.h>
#include <PL_RTSPServer.h>
+
CameraWrapper::~CameraWrapper()
{
stop();
@@ -372,21 +372,17 @@
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
- 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
+ invokeCallback(cameraWrapper, faceCount);
+
return false;
}
--
Gitblit v1.8.0