From 109ffe9a777658936a38d0c146579a67c60a0d17 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 11 五月 2017 17:48:48 +0800
Subject: [PATCH]
---
VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h
index 75b1b30..649caf5 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h
@@ -1,11 +1,15 @@
#ifndef __CameraWrapper_H__
#define __CameraWrapper_H__
+#define MAX_FACE 5
+#define MAX_FACE_WIDTH 240
+#define MAX_FACE_HEIGHT 320
#include "FaceCache.h"
#include <PipeLine.h>
#include <PL_RTSPClient.h>
#include <PL_AndroidMediaCodecDecoder.h>
+#include <PL_AndroidSurfaceViewRender.h>
#include <PL_SensetimeFaceTrack.h>
//#include "looper.h"
@@ -13,11 +17,7 @@
#include <media/NdkMediaCodec.h>
#include <pthread.h>
-
-#define MAX_FACE 5
-#define MAX_FACE_WIDTH 240
-#define MAX_FACE_HEIGHT 320
-//#define USE_ST_SDK
+#include <jni.h>
class CameraWrapper
{
@@ -25,13 +25,18 @@
PipeLine* pipeLine;
PL_RTSPClient_Config rtspConfig;
- PL_AndroidMediaCodecDecoder_Config amcdConfig;
- SensetimeFaceTrackConfig sftConfig;
-
+ PL_AndroidMediaCodecDecoder_Config amcdConfig;
+ PL_AndroidSurfaceViewRender_Config asvrConfig;
+ SensetimeFaceTrackConfig sftConfig;
+
int cameraIdx;
- jmethodID faceCallback;
- ANativeWindow* window;
-
+ JavaVM* javaVM;
+ JNIEnv* javaEnv;
+ jclass faceCallbackClazz;
+ jmethodID faceCallbackFunc;
+ void* windowRender;
+ void* windowDecode;
+
pthread_t live_daemon_thid;
bool running;
@@ -39,8 +44,8 @@
FaceCache faceCache;
CameraWrapper() :
- pipeLine(nullptr), rtspConfig(), amcdConfig(), sftConfig(),
- cameraIdx(0), faceCallback(0), window(nullptr),
+ pipeLine(nullptr), rtspConfig(), amcdConfig(), sftConfig(), asvrConfig(),
+ cameraIdx(0), javaVM(nullptr), javaEnv(nullptr), faceCallbackClazz(0), faceCallbackFunc(0), windowRender(nullptr), windowDecode(nullptr),
live_daemon_thid(0), running(false),
faceCacheLocked(false), faceCache()
{
--
Gitblit v1.8.0