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 |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h
index 0d9f851..649caf5 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/CameraWrapper.h
@@ -34,8 +34,9 @@
     JNIEnv* javaEnv;
 	jclass faceCallbackClazz;
 	jmethodID faceCallbackFunc;
-	ANativeWindow* window;
-	
+	void* windowRender;
+	void* windowDecode;
+
 	pthread_t live_daemon_thid;
 	bool running;
 	
@@ -44,7 +45,7 @@
 
 	CameraWrapper() : 
 		pipeLine(nullptr), rtspConfig(), amcdConfig(), sftConfig(), asvrConfig(),
-        cameraIdx(0), javaVM(nullptr), javaEnv(nullptr), faceCallbackClazz(0), faceCallbackFunc(0), window(nullptr),
+        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