From 1b88ab83de66fec80e895fa9fbd4a47d1d4af772 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 14 八月 2017 18:55:24 +0800
Subject: [PATCH] aaaaa
---
VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperClient.h | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperClient.h b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperClient.h
index 9705fa6..fef9b72 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperClient.h
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperClient.h
@@ -24,13 +24,11 @@
{
public:
PipeLine* pipeLineDecoderDetector;
- PipeLine* pipeLineAnalyzer;
PipeLine* pipeLineRender;
PL_RTSPClient_Config rtspConfig;
PL_AndroidMediaCodecDecoder_Config amcdConfig;
PL_AndroidSurfaceViewRender_Config asvrConfig;
- SensetimeFaceTrackConfig sftConfig;
PL_Scale_Config plScaleCfg;
int cameraIdx;
@@ -59,7 +57,7 @@
std::string fontPath;
CameraWrapper() :
- pipeLineDecoderDetector(nullptr), pipeLineAnalyzer(nullptr), pipeLineRender(nullptr), rtspConfig(), amcdConfig(), asvrConfig(), sftConfig(),
+ pipeLineDecoderDetector(nullptr), pipeLineRender(nullptr), rtspConfig(), amcdConfig(), asvrConfig(),
cameraIdx(0), javaVM(nullptr), javaEnv(nullptr), faceCallbackClazz(0), faceCallbackFunc(0), windowRender(nullptr), windowDecode(nullptr),
decoder_thid(0), live_daemon_thid(0), live_daemon_mut(), running(false), killed(false), lastAliveTime(0),
faceCacheLocked(false), faceCache(),
@@ -75,7 +73,7 @@
void lockFace();
void releaseFace();
-
+ void fireFaceCount(int faceCount);
void setFaceLabel(int st_track_id, const std::wstring& label);
private:
--
Gitblit v1.8.0