From ce8dd708c484c63a64b94273d3e962188cdcfede Mon Sep 17 00:00:00 2001
From: chenke <chenke@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 25 七月 2017 17:47:57 +0800
Subject: [PATCH] 解决了java传递中文的显示问题
---
VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h | 59 +++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 41 insertions(+), 18 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h
index 0d9f851..0e12624 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h
@@ -11,7 +11,8 @@
#include <PL_AndroidMediaCodecDecoder.h>
#include <PL_AndroidSurfaceViewRender.h>
#include <PL_SensetimeFaceTrack.h>
-
+#include <PL_Paint.h>
+#include <PL_Scale.h>
//#include "looper.h"
#include <android/native_window_jni.h>
#include <media/NdkMediaCodec.h>
@@ -22,31 +23,47 @@
class CameraWrapper
{
public:
- PipeLine* pipeLine;
-
+ PipeLine* pipeLineDecoderDetector;
+ PipeLine* pipeLineAnalyzer;
+ PipeLine* pipeLineRender;
+
PL_RTSPClient_Config rtspConfig;
- PL_AndroidMediaCodecDecoder_Config amcdConfig;
- PL_AndroidSurfaceViewRender_Config asvrConfig;
- SensetimeFaceTrackConfig sftConfig;
+ PL_AndroidMediaCodecDecoder_Config amcdConfig;
+ PL_AndroidSurfaceViewRender_Config asvrConfig;
+ SensetimeFaceTrackConfig sftConfig;
+ PL_Scale_Config plScaleCfg;
int cameraIdx;
- JavaVM* javaVM;
- JNIEnv* javaEnv;
+ JavaVM* javaVM;
+ JNIEnv* javaEnv;
jclass faceCallbackClazz;
jmethodID faceCallbackFunc;
- ANativeWindow* window;
-
+ void* windowRender;
+ void* windowDecode;
+
+ pthread_t decoder_thid;
pthread_t live_daemon_thid;
+ pthread_mutex_t live_daemon_mut;
bool running;
-
+ volatile bool killed;
+ time_t lastAliveTime;
+
bool faceCacheLocked;
- FaceCache faceCache;
+ //FaceCache faceCache;
+ FaceCacheForPLBG faceCache;
+
+ PLPLContext plplContext;
+
+ std::map<int, std::wstring> faceLabels;
+
+ std::string fontPath;
CameraWrapper() :
- pipeLine(nullptr), rtspConfig(), amcdConfig(), sftConfig(), asvrConfig(),
- cameraIdx(0), javaVM(nullptr), javaEnv(nullptr), faceCallbackClazz(0), faceCallbackFunc(0), window(nullptr),
- live_daemon_thid(0), running(false),
- faceCacheLocked(false), faceCache()
+ 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(), fontPath()
{
}
@@ -55,12 +72,18 @@
bool start();
void stop();
bool initPl();
-
+
void lockFace();
void releaseFace();
+ void setFaceLabel(int st_track_id, const std::wstring& label);
+
private:
- static void* live_daemon_thd(void* arg);
+ static void* decoder_thd(void *arg);
+ static void* live_daemon_thd(void *arg);
+
+ bool resetPl();
+ bool initPl_DecoderPl();
};
#endif
--
Gitblit v1.8.0