From 1b4d2718a4864190a47d8b7863f36a9ae0b8055c Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 28 四月 2017 17:38:09 +0800
Subject: [PATCH] optimize
---
VisitFace/RtspNativeCodec/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java | 80 ++++++++++++++++++++++++++++++++++++----
1 files changed, 72 insertions(+), 8 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 4267ef1..09b383c 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
@@ -1,18 +1,44 @@
package cn.com.basic.face.util;
+import android.graphics.Canvas;
+import android.graphics.drawable.Drawable;
import android.util.Log;
import android.view.Surface;
+import android.widget.ImageButton;
+import android.graphics.Bitmap;
+import android.widget.ImageView;
+
+import com.example.nativecodec.NativeCodec;
+
+import java.nio.ByteBuffer;
+
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 byte[][] arr2;
+}
+
+
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);
@@ -20,26 +46,64 @@
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, int dbId, RefByteArray faceListPb);
+ //public static native ArrayList<NativeImgIdx> getFaceImages(int cameraIdx, RefByteArray faceImages);
+ public static native ArrayList<NativeImg> getFaceImages(int cameraIdx);
+
+ public static native void dbgFaceAdd(NativeImg faceImage);
+ public static native String dbgGetLog();
+
+
+ public static int COMPANY_ID = 1001;
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];
- int s = getFaceList(cameraIdx, faceListPb);
+ RefByteArray faceListPb = new RefByteArray();
+ int s = getFaceList(cameraIdx, COMPANY_ID, faceListPb);
Log.i("@@@", "RtspFaceNative.faceCallBack, getFaceList, cameraIdx=" + cameraIdx + ", size=" + s);
- byte[] faceImages = new byte[1024 * 1024 * 1];
- 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]);
+
+ if (i == 0)
+ {
+ //Bitmap bitmap = Bitmap.createBitmap(faceImages.get(i).width, faceImages.get(i).height, Bitmap.Config.RGB_565);
+ //ByteBuffer byteBuffer = ByteBuffer.wrap(faceImages.get(i).image, 0, faceImages.get(i).size);
+ //bitmap.copyPixelsFromBuffer(byteBuffer);
+ //NativeCodec.setFaceDrawable(bitmap);
+
+ NativeCodec.setFaceDrawable(faceImages.get(i));
+ }
+ }
+
releaseFace(cameraIdx);
}
--
Gitblit v1.8.0