From 50e17913a83e05cea0d724c71db1f520a08d8a82 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 24 四月 2017 17:43:12 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 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 ef2ddbb..217bdb2 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
@@ -59,19 +59,19 @@
//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)
+ public static void faceCallBack(int cameraInOrOut, int count)
{
- Log.i("@@@", "RtspFaceNative.faceCallBack, cameraIdx=" + cameraIdx + ", count=" + count);
+ Log.i("@@@", "RtspFaceNative.faceCallBack, cameraIdx=" + cameraInOrOut + ", count=" + count);
// something else
if (count <= 0)
return;
- lockFace(cameraIdx);
+ lockFace(cameraInOrOut);
RefByteArray faceListPb = new RefByteArray();
- int s = getFaceList(cameraIdx, faceListPb);
- Log.i("@@@", "RtspFaceNative.faceCallBack, getFaceList, cameraIdx=" + cameraIdx + ", size=" + s);
+ int s = getFaceList(cameraInOrOut, faceListPb);
+ Log.i("@@@", "RtspFaceNative.faceCallBack, getFaceList, cameraIdx=" + cameraInOrOut + ", size=" + s);
//RefByteArray faceImages = new RefByteArray();
//ArrayList<NativeImgIdx> faceImagesIdx = getFaceImages(cameraIdx, faceImages);
@@ -80,15 +80,15 @@
// c = faceImagesIdx.size();
//Log.i("@@@", "RtspFaceNative.faceCallBack, getFaceImages, cameraIdx=" + cameraIdx + ", count=" + c);
- ArrayList<NativeImg> faceImages = getFaceImages(cameraIdx);
+ ArrayList<NativeImg> faceImages = getFaceImages(cameraInOrOut);
int c = 0;
if (faceImages != null)
c = faceImages.size();
- Log.i("@@@", "RtspFaceNative.faceCallBack, getFaceImages, cameraIdx=" + cameraIdx + ", count=" + c);
+ Log.i("@@@", "RtspFaceNative.faceCallBack, getFaceImages, cameraIdx=" + cameraInOrOut + ", count=" + c);
for (int i = 0; i < c; i++)
{
- Log.i("@@@", "cameraIdx=" + cameraIdx +
+ Log.i("@@@", "cameraIdx=" + cameraInOrOut +
", i=" + i +
", size=" + faceImages.get(i).size+
", w=" + faceImages.get(i).width +
@@ -108,13 +108,13 @@
bitmap.copyPixelsFromBuffer(byteBuffer);
bitmapList.add(bitmap);
}
- SurveillanceMng.getInstance().addBitmap(bitmapList, faceListPb.arr, s);
+ SurveillanceMng.getInstance().addBitmap(bitmapList, faceListPb.arr, s, cameraInOrOut+"");
}catch(Exception e){
e.printStackTrace();
}
- releaseFace(cameraIdx);
+ releaseFace(cameraInOrOut);
}
}
--
Gitblit v1.8.0