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/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java | 96 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 78 insertions(+), 18 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 9158c6f..fa63722 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;
@@ -10,9 +11,15 @@
import java.util.ArrayList;
import java.util.List;
+import cn.com.basic.face.base.BaseApplication;
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;
+
+/**
+ * Created by houxiao on 2017/3/21 0021.
+ */
class NativeImgIdx {
public int offset;
@@ -25,7 +32,9 @@
class RefByteArray
{
public byte[] arr;
+ public byte[][] arr2;
}
+
public class RtspFaceNative {
@@ -40,8 +49,15 @@
public static native boolean setFaceCallback(int cameraIdx, String className, String funcName);
public static native void lockFace(int cameraIdx);
public static native void releaseFace(int cameraIdx);
- public static native int getFaceList(int cameraIdx, RefByteArray faceListPb);
- public static native ArrayList<NativeImgIdx> getFaceImages(int cameraIdx, RefByteArray faceImages);
+ public static native int getFaceList(int cameraIdx, int dbId, RefByteArray faceListPb);
+ //public static native ArrayList<NativeImgIdx> getFaceImages(int cameraIdx, RefByteArray faceImages);
+ public static native ArrayList<NativeImg> getFaceImages(int cameraIdx);
+
+ public static native void dbgFaceAdd(NativeImg faceImage);
+ public static native String dbgGetLog();
+
+
+ public static int COMPANY_ID = 1001;
public static void faceCallBack(int cameraIdx, int count)
{
@@ -54,28 +70,72 @@
lockFace(cameraIdx);
RefByteArray faceListPb = new RefByteArray();
- int s = getFaceList(cameraIdx, faceListPb);
+
+ try {
+ COMPANY_ID = Integer.parseInt(BaseApplication.getInstance().getDevice().getDeviceCompanyId());
+ } catch (Exception e) {
+ COMPANY_ID = 0;
+ }
+
+ int s = getFaceList(cameraIdx, COMPANY_ID, faceListPb);
Log.i("@@@", "RtspFaceNative.faceCallBack, getFaceList, cameraIdx=" + cameraIdx + ", size=" + s);
- RefByteArray faceImages = new RefByteArray();
- ArrayList<NativeImgIdx> faceImagesIdx = getFaceImages(cameraIdx, faceImages);
+ //RefByteArray faceImages = new RefByteArray();
+ //ArrayList<NativeImgIdx> faceImagesIdx = getFaceImages(cameraIdx, faceImages);
+ //int c = 0;
+ //if (faceImagesIdx != null)
+ // c = faceImagesIdx.size();
+ //Log.i("@@@", "RtspFaceNative.faceCallBack, getFaceImages, cameraIdx=" + cameraIdx + ", count=" + c);
+
+ ArrayList<NativeImg> faceImages = getFaceImages(cameraIdx);
int c = 0;
- if (faceImagesIdx != null)
- c = faceImagesIdx.size();
+ if (faceImages != null)
+ c = faceImages.size();
Log.i("@@@", "RtspFaceNative.faceCallBack, getFaceImages, cameraIdx=" + cameraIdx + ", count=" + c);
- try{
- List<Bitmap> bitmapList = new ArrayList();
- for (int i = 0; i < faceImagesIdx.size(); i++) {
- NativeImgIdx item = faceImagesIdx.get(i);
- int offset = item.offset;
- int size = item.size;
- Bitmap bitmap = Bitmap.createBitmap(item.width,item.height, Bitmap.Config.RGB_565);
- ByteBuffer byteBuffer = ByteBuffer.wrap(faceImages.arr, offset, size);
- bitmap.copyPixelsFromBuffer(byteBuffer);
- bitmapList.add(bitmap);
+ for (int i = 0; i < c; i++)
+ {
+ Log.i("@@@", "cameraIdx=" + cameraIdx +
+ ", i=" + i +
+ ", size=" + faceImages.get(i).size+
+ ", w=" + faceImages.get(i).width +
+ ", h=" + faceImages.get(i).height +
+ ", image[0]=" + faceImages.get(i).image[0] +
+ ", image[1]=" + faceImages.get(i).image[1]);
+
+ if (i == 0)
+ {
+ //Bitmap bitmap = Bitmap.createBitmap(faceImages.get(i).width, faceImages.get(i).height, Bitmap.Config.RGB_565);
+ //ByteBuffer byteBuffer = ByteBuffer.wrap(faceImages.get(i).image, 0, faceImages.get(i).size);
+ //bitmap.copyPixelsFromBuffer(byteBuffer);
+ //NativeCodec.setFaceDrawable(bitmap);
+
+ //NativeCodec.setFaceDrawable(faceImages.get(i));
}
- SurveillanceMng.getInstance().addBitmap(bitmapList, faceListPb.arr, s);
+ }
+
+ try{
+
+ 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.ARGB_8888);
+ ByteBuffer byteBuffer = ByteBuffer.wrap(item.image, offset, size);
+ bitmap.copyPixelsFromBuffer(byteBuffer);
+// String str = Base64.encodeToString(item.image, offset, size, Base64.DEFAULT);
+// System.out.println(str.length());
+// System.out.println(str);
+// surveillanceQueryItem.setBase64Image(str);
+ surveillanceQueryItem.setNativeImg(item);
+ surveillanceQueryItem.setBitmap(bitmap);
+ surveillanceQueryItem.setWidth(item.width+"");
+ surveillanceQueryItem.setHeight(item.height+"");
+ bitmapList.add(surveillanceQueryItem);
+ }
+ SurveillanceMng.getInstance().addBitmap(bitmapList, faceListPb.arr, s, cameraIdx+"");
}catch(Exception e){
e.printStackTrace();
--
Gitblit v1.8.0