From d53b1e0d18c75420fd7bd7b37178c50d40f2a779 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 18 四月 2017 14:54:41 +0800
Subject: [PATCH] bugfix getFaceListImage
---
VisitFace/RtspNativeCodec/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java b/VisitFace/RtspNativeCodec/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java
index 0c84030..50f474d 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java
+++ b/VisitFace/RtspNativeCodec/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java
@@ -19,7 +19,18 @@
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 {
@@ -35,7 +46,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)
{
@@ -51,13 +63,30 @@
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]);
+ }
+
releaseFace(cameraIdx);
}
--
Gitblit v1.8.0