From 9e5babf9db52e64bdae60137be7696e56241fca6 Mon Sep 17 00:00:00 2001
From: xingzilong <xingzilong@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 18 八月 2017 18:12:17 +0800
Subject: [PATCH] H264 NALU解析 并在RTSPServer判断
---
VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperClient.h | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperClient.h b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperClient.h
index 9705fa6..4cd8077 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperClient.h
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapperClient.h
@@ -24,16 +24,15 @@
{
public:
PipeLine* pipeLineDecoderDetector;
- PipeLine* pipeLineAnalyzer;
PipeLine* pipeLineRender;
PL_RTSPClient_Config rtspConfig;
PL_AndroidMediaCodecDecoder_Config amcdConfig;
PL_AndroidSurfaceViewRender_Config asvrConfig;
- SensetimeFaceTrackConfig sftConfig;
PL_Scale_Config plScaleCfg;
-
+ int faceCount;
int cameraIdx;
+ bool faceCountChanged;
JavaVM* javaVM;
JNIEnv* javaEnv;
jclass faceCallbackClazz;
@@ -43,6 +42,7 @@
pthread_t decoder_thid;
pthread_t live_daemon_thid;
+ pthread_t jni_call_thid;
pthread_mutex_t live_daemon_mut;
bool running;
volatile bool killed;
@@ -59,9 +59,9 @@
std::string fontPath;
CameraWrapper() :
- pipeLineDecoderDetector(nullptr), pipeLineAnalyzer(nullptr), pipeLineRender(nullptr), rtspConfig(), amcdConfig(), asvrConfig(), sftConfig(),
+ pipeLineDecoderDetector(nullptr), pipeLineRender(nullptr), rtspConfig(), amcdConfig(), asvrConfig(),
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),
+ decoder_thid(0), live_daemon_thid(0),jni_call_thid(0), live_daemon_mut(), running(false), killed(false), lastAliveTime(0),
faceCacheLocked(false), faceCache(),
plplContext(), faceLabels(), fontPath()
{
@@ -75,12 +75,13 @@
void lockFace();
void releaseFace();
-
+ void fireFaceCount(int faceCount);
void setFaceLabel(int st_track_id, const std::wstring& label);
private:
static void* decoder_thd(void *arg);
static void* live_daemon_thd(void *arg);
+ static void* jni_call_thd(void *arg);
bool resetPl();
bool initPl_DecoderPl();
--
Gitblit v1.8.0