From 94e704acde59df60bd42f6f90b94d462d1bfa37c Mon Sep 17 00:00:00 2001 From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674> Date: 星期日, 23 七月 2017 12:09:41 +0800 Subject: [PATCH] --- VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h | 41 +++++++++++++++++++++++++++-------------- 1 files changed, 27 insertions(+), 14 deletions(-) diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h index 1ea6201..cb4c4e2 100644 --- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h +++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h @@ -12,7 +12,7 @@ #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> @@ -28,33 +28,40 @@ 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; 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; - FaceCacheForPLBG faceCache; + //FaceCache faceCache; + FaceCacheForPLBG faceCache; PLPLContext plplContext; + std::map<int, std::wstring> faceLabels; + 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), - live_daemon_thid(0), running(false), + 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() + plplContext(), faceLabels() { } @@ -63,12 +70,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