From a05971bb73cced9426e11e26708a3f3cd2c3fc17 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 11 四月 2017 17:02:07 +0800
Subject: [PATCH] add release
---
VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h
index 75b1b30..cd5f404 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h
@@ -1,6 +1,9 @@
#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>
@@ -13,11 +16,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
{
@@ -29,7 +28,10 @@
SensetimeFaceTrackConfig sftConfig;
int cameraIdx;
- jmethodID faceCallback;
+ JavaVM* javaVM;
+ JNIEnv* javaEnv;
+ jclass faceCallbackClazz;
+ jmethodID faceCallbackFunc;
ANativeWindow* window;
pthread_t live_daemon_thid;
@@ -40,7 +42,7 @@
CameraWrapper() :
pipeLine(nullptr), rtspConfig(), amcdConfig(), sftConfig(),
- cameraIdx(0), faceCallback(0), window(nullptr),
+ cameraIdx(0), javaVM(nullptr), javaEnv(nullptr), faceCallbackClazz(0), faceCallbackFunc(0), window(nullptr),
live_daemon_thid(0), running(false),
faceCacheLocked(false), faceCache()
{
--
Gitblit v1.8.0