From 22fe3eb94f8e65ebad5d55b12c371a0b69bfc04a Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 12 五月 2017 10:18:12 +0800
Subject: [PATCH] add release

---
 VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h
index cd5f404..649caf5 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h
@@ -9,6 +9,7 @@
 #include <PipeLine.h>
 #include <PL_RTSPClient.h>
 #include <PL_AndroidMediaCodecDecoder.h>
+#include <PL_AndroidSurfaceViewRender.h>
 #include <PL_SensetimeFaceTrack.h>
 
 //#include "looper.h"
@@ -24,16 +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;
     JavaVM* javaVM;
     JNIEnv* javaEnv;
 	jclass faceCallbackClazz;
 	jmethodID faceCallbackFunc;
-	ANativeWindow* window;
-	
+	void* windowRender;
+	void* windowDecode;
+
 	pthread_t live_daemon_thid;
 	bool running;
 	
@@ -41,8 +44,8 @@
 	FaceCache faceCache;
 
 	CameraWrapper() : 
-		pipeLine(nullptr), rtspConfig(), amcdConfig(), sftConfig(), 
-		cameraIdx(0), javaVM(nullptr), javaEnv(nullptr), faceCallbackClazz(0), faceCallbackFunc(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