From c7fe31931a26a941ca2adf002e40b47a049a604c Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 27 四月 2017 11:07:57 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java
index ef2ddbb..2d6c4af 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java
@@ -1,6 +1,7 @@
package cn.com.basic.face.util;
import android.graphics.Bitmap;
+import android.util.Base64;
import android.util.Log;
import android.view.Surface;
@@ -11,6 +12,7 @@
import java.util.List;
import cn.com.basic.face.base.MainActivity;
+import cn.com.basic.face.discern.query.item.SurveillanceQueryItem;
import cn.com.basic.face.fragment.RegisterFragment;
import cn.com.basic.face.service.SurveillanceMng;
@@ -59,19 +61,19 @@
//public static native ArrayList<NativeImgIdx> getFaceImages(int cameraIdx, RefByteArray faceImages);
public static native ArrayList<NativeImg> getFaceImages(int cameraIdx);
- public static void faceCallBack(int cameraIdx, int count)
+ public static void faceCallBack(int cameraInOrOut, int count)
{
- Log.i("@@@", "RtspFaceNative.faceCallBack, cameraIdx=" + cameraIdx + ", count=" + count);
+ Log.i("@@@", "RtspFaceNative.faceCallBack, cameraIdx=" + cameraInOrOut + ", count=" + count);
// something else
if (count <= 0)
return;
- lockFace(cameraIdx);
+ lockFace(cameraInOrOut);
RefByteArray faceListPb = new RefByteArray();
- int s = getFaceList(cameraIdx, faceListPb);
- Log.i("@@@", "RtspFaceNative.faceCallBack, getFaceList, cameraIdx=" + cameraIdx + ", size=" + s);
+ int s = getFaceList(cameraInOrOut, faceListPb);
+ Log.i("@@@", "RtspFaceNative.faceCallBack, getFaceList, cameraIdx=" + cameraInOrOut + ", size=" + s);
//RefByteArray faceImages = new RefByteArray();
//ArrayList<NativeImgIdx> faceImagesIdx = getFaceImages(cameraIdx, faceImages);
@@ -80,15 +82,15 @@
// c = faceImagesIdx.size();
//Log.i("@@@", "RtspFaceNative.faceCallBack, getFaceImages, cameraIdx=" + cameraIdx + ", count=" + c);
- ArrayList<NativeImg> faceImages = getFaceImages(cameraIdx);
+ ArrayList<NativeImg> faceImages = getFaceImages(cameraInOrOut);
int c = 0;
if (faceImages != null)
c = faceImages.size();
- Log.i("@@@", "RtspFaceNative.faceCallBack, getFaceImages, cameraIdx=" + cameraIdx + ", count=" + c);
+ Log.i("@@@", "RtspFaceNative.faceCallBack, getFaceImages, cameraIdx=" + cameraInOrOut + ", count=" + c);
for (int i = 0; i < c; i++)
{
- Log.i("@@@", "cameraIdx=" + cameraIdx +
+ Log.i("@@@", "cameraIdx=" + cameraInOrOut +
", i=" + i +
", size=" + faceImages.get(i).size+
", w=" + faceImages.get(i).width +
@@ -98,23 +100,28 @@
}
try{
- List<Bitmap> bitmapList = new ArrayList();
+ List<SurveillanceQueryItem> bitmapList = new ArrayList();
for (int i = 0; i < faceImages.size(); i++) {
NativeImg item = faceImages.get(i);
+ SurveillanceQueryItem surveillanceQueryItem = new SurveillanceQueryItem();
int offset = 0;
int size = item.size;
Bitmap bitmap = Bitmap.createBitmap(item.width,item.height, Bitmap.Config.RGB_565);
ByteBuffer byteBuffer = ByteBuffer.wrap(item.image, offset, size);
bitmap.copyPixelsFromBuffer(byteBuffer);
- bitmapList.add(bitmap);
+ surveillanceQueryItem.setBase64Image(Base64.encodeToString(item.image, offset, size, Base64.DEFAULT));
+ surveillanceQueryItem.setBitmap(bitmap);
+ surveillanceQueryItem.setWidth(item.width+"");
+ surveillanceQueryItem.setHeight(item.height+"");
+ bitmapList.add(surveillanceQueryItem);
}
- SurveillanceMng.getInstance().addBitmap(bitmapList, faceListPb.arr, s);
+ SurveillanceMng.getInstance().addBitmap(bitmapList, faceListPb.arr, s, cameraInOrOut+"");
}catch(Exception e){
e.printStackTrace();
}
- releaseFace(cameraIdx);
+ releaseFace(cameraInOrOut);
}
}
--
Gitblit v1.8.0