From 2d6b0924c7ec3e78f0276d17d7353e0469962be7 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 03 七月 2017 18:08:22 +0800
Subject: [PATCH]
---
VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h
index e59bc18..1ea6201 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h
@@ -11,6 +11,7 @@
#include <PL_AndroidMediaCodecDecoder.h>
#include <PL_AndroidSurfaceViewRender.h>
#include <PL_SensetimeFaceTrack.h>
+#include <PL_Paint.h>
//#include "looper.h"
#include <android/native_window_jni.h>
@@ -22,8 +23,10 @@
class CameraWrapper
{
public:
- PipeLine* pipeLine;
-
+ PipeLine* pipeLineDecoderDetector;
+ PipeLine* pipeLineAnalyzer;
+ PipeLine* pipeLineRender;
+
PL_RTSPClient_Config rtspConfig;
PL_AndroidMediaCodecDecoder_Config amcdConfig;
PL_AndroidSurfaceViewRender_Config asvrConfig;
@@ -34,20 +37,24 @@
JNIEnv* javaEnv;
jclass faceCallbackClazz;
jmethodID faceCallbackFunc;
- ANativeWindow* windowRender;
- ANativeWindow* windowDecode;
+ void* windowRender;
+ void* windowDecode;
pthread_t live_daemon_thid;
bool running;
bool faceCacheLocked;
- FaceCache faceCache;
+ //FaceCache faceCache;
+ FaceCacheForPLBG faceCache;
+
+ PLPLContext plplContext;
CameraWrapper() :
- pipeLine(nullptr), rtspConfig(), amcdConfig(), sftConfig(), asvrConfig(),
+ 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),
- faceCacheLocked(false), faceCache()
+ faceCacheLocked(false), faceCache(),
+ plplContext()
{
}
--
Gitblit v1.8.0