From ad80ce23000b88857d0c012ec7809b1303f47e5c Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 04 七月 2017 17:23:30 +0800
Subject: [PATCH] aaaa
---
VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h
index 1ea6201..21aa478 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h
@@ -12,6 +12,7 @@
#include <PL_AndroidSurfaceViewRender.h>
#include <PL_SensetimeFaceTrack.h>
#include <PL_Paint.h>
+#include <PL_Queue.h>
//#include "looper.h"
#include <android/native_window_jni.h>
@@ -27,7 +28,9 @@
PipeLine* pipeLineAnalyzer;
PipeLine* pipeLineRender;
- PL_RTSPClient_Config rtspConfig;
+ PL_Queue* queueFrame;
+
+ PL_RTSPClient_Config rtspConfig;
PL_AndroidMediaCodecDecoder_Config amcdConfig;
PL_AndroidSurfaceViewRender_Config asvrConfig;
SensetimeFaceTrackConfig sftConfig;
@@ -40,7 +43,8 @@
void* windowRender;
void* windowDecode;
- pthread_t live_daemon_thid;
+ pthread_t decoder_thid;
+ pthread_t analyzer_thid;
bool running;
bool faceCacheLocked;
@@ -50,9 +54,9 @@
PLPLContext plplContext;
CameraWrapper() :
- pipeLineDecoderDetector(nullptr), pipeLineAnalyzer(nullptr), pipeLineRender(nullptr), rtspConfig(), amcdConfig(), asvrConfig(), sftConfig(),
+ pipeLineDecoderDetector(nullptr), pipeLineAnalyzer(nullptr), pipeLineRender(nullptr), queueFrame(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),
+ decoder_thid(0), analyzer_thid(0), running(false),
faceCacheLocked(false), faceCache(),
plplContext()
{
@@ -68,7 +72,8 @@
void releaseFace();
private:
- static void* live_daemon_thd(void* arg);
+ static void* decoder_thd(void *arg);
+ static void* analyzer_thd(void *arg);
};
#endif
--
Gitblit v1.8.0