From 2ae0446917184b36996823e9dbf452dba82e8994 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 21 四月 2017 12:31:44 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java | 114 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 62 insertions(+), 52 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 f305f04..ef2ddbb 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,8 +1,18 @@
package cn.com.basic.face.util;
+import android.graphics.Bitmap;
import android.util.Log;
import android.view.Surface;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
import java.util.ArrayList;
+import java.util.List;
+
+import cn.com.basic.face.base.MainActivity;
+import cn.com.basic.face.fragment.RegisterFragment;
+import cn.com.basic.face.service.SurveillanceMng;
/**
* Created by houxiao on 2017/3/21 0021.
@@ -19,13 +29,25 @@
class RefByteArray
{
public byte[] arr;
+ public byte[][] arr2;
}
+
+class NativeImg
+{
+ public int size;
+ public int type;
+ public int width;
+ public int height;
+ public byte[] image;
+}
+
public class RtspFaceNative {
//cn.com.basic.face.util.RtspFaceNative
public static native void init();
+ public static native void setLocalIP(String ipaddr);
public static native void setSurface(int cameraIdx, Surface surface);
public static native boolean createPlayer(int cameraIdx, String uri);
public static native void shutdown(int cameraIdx);
@@ -34,7 +56,8 @@
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 ArrayList<NativeImgIdx> getFaceImages(int cameraIdx, RefByteArray faceImages);
+ public static native ArrayList<NativeImg> getFaceImages(int cameraIdx);
public static void faceCallBack(int cameraIdx, int count)
{
@@ -50,61 +73,48 @@
int s = getFaceList(cameraIdx, 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);
+
+ 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]);
+ }
+
+ try{
+ List<Bitmap> bitmapList = new ArrayList();
+ for (int i = 0; i < faceImages.size(); i++) {
+ NativeImg item = faceImages.get(i);
+ 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);
+ }
+ SurveillanceMng.getInstance().addBitmap(bitmapList, faceListPb.arr, s);
+
+ }catch(Exception e){
+ e.printStackTrace();
+ }
releaseFace(cameraIdx);
}
}
-
-
-// static int i = 1;
-// public static void faceCallBack(int cameraIdx, int count)
-// {
-// lockFace(cameraIdx);
-//
-// byte[] faceListPb = new byte[1024 * 1024 * 1];
-// int s = getFaceList(cameraIdx, faceListPb);
-//
-// //;byte(faceListPb,s)
-//
-//
-// int[] faceImagesIdx = new int[10];
-// byte[] faceImages = new byte[1024 * 1024 * 1];
-// int c = getFaceImages(cameraIdx, faceImagesIdx, faceImages);
-//
-// try {
-// File path = BaseApplication.getInstance().getFilesDir();
-// File f1 = new File(path, ""+i);
-// if (!f1.exists()) {
-// f1.createNewFile();
-// }
-// FileOutputStream f = new FileOutputStream(f1);
-// f.write(faceImages);
-// f.close();
-// RequestParams params = new RequestParams();
-// String encodedImage = Base64.encodeToString(faceImages, Base64.DEFAULT);
-// params.addBodyParameter("choosePhoto", encodedImage);
-// RegisterMng.getInstance().add(params);
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
-//
-// releaseFace(cameraIdx);
-// }
-
-// public static void init() {};
-// public static void setSurface(int cameraIdx, Surface surface){};
-// public static boolean createPlayer(int cameraIdx, String uri){return true;};
-// public static void shutdown(int cameraIdx){};
-// // typedef void (* Java_com_example_nativecodec_NativeCodec_FaceCallback_func)(int cameraIdx, int count);
-// public static boolean setFaceCallback(int cameraIdx, String func){return true;};
-// public static void lockFace(int cameraIdx){};
-// public static void releaseFace(int cameraIdx){};
-// public static boolean getFaceList(int cameraIdx, byte[] faceListPb){return true;};//浜岃繘鍒�
-// public static boolean getFaceImages(int cameraIdx, byte[] faceImagesIdx, byte[] faceImages){return true;};//鍥剧墖
--
Gitblit v1.8.0