From d81a5dd7415707137147ab6490162322df6f6363 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 28 七月 2017 13:49:09 +0800
Subject: [PATCH]
---
VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h
index cb4c4e2..7628226 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h
@@ -10,7 +10,7 @@
#include <PL_RTSPClient.h>
#include <PL_AndroidMediaCodecDecoder.h>
#include <PL_AndroidSurfaceViewRender.h>
-#include <PL_SensetimeFaceTrack.h>
+#include <PL_SensetimeFaceTrackMultiTrd.h>
#include <PL_Paint.h>
#include <PL_Scale.h>
//#include "looper.h"
@@ -56,12 +56,14 @@
std::map<int, std::wstring> faceLabels;
+ std::string fontPath;
+
CameraWrapper() :
pipeLineDecoderDetector(nullptr), pipeLineAnalyzer(nullptr), pipeLineRender(nullptr), rtspConfig(), amcdConfig(), asvrConfig(), sftConfig(),
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(),
- plplContext(), faceLabels()
+ plplContext(), faceLabels(), fontPath()
{
}
--
Gitblit v1.8.0