From 0727355ae017c0153ee7c643cdd1b0611c81627f Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 13 四月 2017 12:04:00 +0800
Subject: [PATCH] bug fix
---
VisitFace/RtspNativeCodec/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 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 5e405c9..c3d09ad 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
@@ -2,15 +2,28 @@
import android.util.Log;
import android.view.Surface;
+import java.util.ArrayList;
/**
* 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);
@@ -20,22 +33,28 @@
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 int getFaceImages(int cameraIdx, int[] faceImagesIdx, 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);
- int[] faceImagesIdx = new int[10];
- byte[] faceImages = new byte[1024 * 1024 * 1];
- int c = getFaceImages(cameraIdx, faceImagesIdx, 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);
releaseFace(cameraIdx);
--
Gitblit v1.8.0