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/FaceCache.h |   27 +++++++++++++++++++++++----
 1 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCache.h b/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCache.h
index ed2bb5c..710298c 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCache.h
+++ b/VisitFace/RtspNativeCodec/app/src/main/cpp/FaceCache.h
@@ -2,23 +2,42 @@
 #define __FaceCache_H__
 
 #include <PipeLine.h>
+#include <vector>
+
+struct NativeImgIdx
+{
+	int offset;
+	int size;
+	int type;
+	int width;
+	int height;
+
+	NativeImgIdx() : offset(0), size(0), type(0), width(0), height(0)
+	{}
+
+	operator std::string() const;
+};
 
 class FaceCache
 {
 public:
+
+#ifdef USE_ST_SDK 
 	FaceCache();
 	~FaceCache();
+#else
+	FaceCache() : _ctx(nullptr) {}
+	~FaceCache() {}
+#endif
 	
 	// returns count of face
 	int cachePm(const PipeMaterial& pm);
 	
-	bool getFaceListPb(uint8_t* buffer, size_t& buffSize);
+	bool getFaceListPb(uint8_t* buffer, size_t& buffMaxSize);
 	
-	bool getFaceListImage(int* buffIdx, size_t& count, uint8_t* buffImg, size_t& buffImgSize);
+	bool getFaceListImage(std::vector<NativeImgIdx>& imgIdxes, uint8_t* buffImg, size_t& buffImgMaxSize);
 	
 private:
-	bool extractFace();
-	
 	void* _ctx;
 };
 

--
Gitblit v1.8.0