From 98b473c1c23c742915698b7d60b0cd99e8106a4d Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 13 四月 2017 16:22:58 +0800
Subject: [PATCH]
---
/dev/null | 13 ------
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java | 2
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java | 71 ++++++++++++++++-------------------
3 files changed, 34 insertions(+), 52 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java
index 1b90897..13e0bb0 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java
@@ -36,7 +36,7 @@
@ViewInject(R.id.fragment_supervisory_exit_camera)
VideoView fragment_supervisory_exit_camera;
- static boolean useNative = false;
+ static boolean useNative = true;
static {
if (useNative) {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/NativeImgIdx.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/NativeImgIdx.java
deleted file mode 100644
index dd40edc..0000000
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/NativeImgIdx.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package cn.com.basic.face.util;
-
-/**
- * Created by houxiao on 2017/4/12.
- */
-
-public class NativeImgIdx {
- public int offset;
- public int size;
- public int type;
- public int width;
- public int height;
-}
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 ddb98d0..f305f04 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,18 +1,29 @@
package cn.com.basic.face.util;
-import android.util.Base64;
+import android.util.Log;
import android.view.Surface;
-
-import org.xutils.http.RequestParams;
-
-import java.io.File;
-import java.io.FileOutputStream;
import java.util.ArrayList;
-import cn.com.basic.face.base.BaseApplication;
-import cn.com.basic.face.service.RegisterMng;
+/**
+ * Created by houxiao on 2017/3/21 0021.
+ */
+
+class NativeImgIdx {
+ public int offset;
+ public int size;
+ public int type;
+ public int width;
+ public int height;
+}
+
+class RefByteArray
+{
+ public byte[] arr;
+}
public class RtspFaceNative {
+
+ //cn.com.basic.face.util.RtspFaceNative
public static native void init();
public static native void setSurface(int cameraIdx, Surface surface);
@@ -22,49 +33,35 @@
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, byte[] faceListPb);
- public static native ArrayList<NativeImgIdx> getFaceImages(int cameraIdx, byte[] faceImages);
+ public static native int getFaceList(int cameraIdx, RefByteArray faceListPb);
+ public static native ArrayList<NativeImgIdx> getFaceImages(int cameraIdx, RefByteArray faceImages);
public static void faceCallBack(int cameraIdx, int count)
{
+ Log.i("@@@", "RtspFaceNative.faceCallBack, cameraIdx=" + cameraIdx + ", count=" + count);
+
+ // something else
+ if (count <= 0)
+ return;
lockFace(cameraIdx);
- byte[] faceListPb = new byte[1024 * 1024 * 1];
+ RefByteArray faceListPb = new RefByteArray();
int s = getFaceList(cameraIdx, faceListPb);
+ Log.i("@@@", "RtspFaceNative.faceCallBack, getFaceList, cameraIdx=" + cameraIdx + ", size=" + s);
- byte[] faceImages = new byte[1024 * 1024 * 1];
+ RefByteArray faceImages = new RefByteArray();
ArrayList<NativeImgIdx> faceImagesIdx = getFaceImages(cameraIdx, faceImages);
int c = 0;
if (faceImagesIdx != null)
c = faceImagesIdx.size();
-
- for (int i = 0; i < c; i++) {
- System.out.println(i);
-// faceImagesIdx.get(i).offset, faceImagesIdx.get(i).size;
- 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, faceImagesIdx.get(i).offset, faceImagesIdx.get(i).size);
- f.close();
-
-
- RequestParams params = new RequestParams();
-// String encodedImage = Base64.encodeToString(faceImages, Base64.DEFAULT);
- params.addBodyParameter("choosePhoto", f1);
- RegisterMng.getInstance().add(params);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
+ Log.i("@@@", "RtspFaceNative.faceCallBack, getFaceImages, cameraIdx=" + cameraIdx + ", count=" + c);
releaseFace(cameraIdx);
}
+
+}
+
// static int i = 1;
// public static void faceCallBack(int cameraIdx, int count)
@@ -111,5 +108,3 @@
// 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