From dea825c24eea9fa92dd9f0ccf2e24af4ed89683c Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 10 八月 2017 11:48:31 +0800
Subject: [PATCH] fix for compile
---
VisitFace/RtspNativeCodec/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java | 56 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 44 insertions(+), 12 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 50f474d..c058faf 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,7 +1,18 @@
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.view.SurfaceHolder;
+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;
/**
@@ -9,6 +20,7 @@
*/
class NativeImgIdx {
+ public int st_track_id;
public int offset;
public int size;
public int type;
@@ -22,15 +34,6 @@
public byte[][] arr2;
}
-class NativeImg
-{
- public int size;
- public int type;
- public int width;
- public int height;
- public byte[] image;
-}
-
public class RtspFaceNative {
@@ -38,16 +41,34 @@
public static native void init();
public static native void setLocalIP(String ipaddr);
- public static native void setSurface(int cameraIdx, Surface surface);
+ public static native void setSurface(int cameraIdx, Surface surfaceRender);
public static native boolean createPlayer(int cameraIdx, String uri);
public static native void shutdown(int cameraIdx);
// typedef void (* Java_com_example_nativecodec_NativeCodec_FaceCallback_func)(int cameraIdx, int count);
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, RefByteArray faceListPb);
+ 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 native void dbgSetStfaceLicense(String lic);
+
+ //public static native void dbgReadTexture();
+
+ public static native void setCaptureSurface(Surface surfaceCapture);
+ public static native void startCapturePlayer(String uri);
+ public static native void stopCapturePlayer();
+ public static native ArrayList<NativeImg> getCaptureImages();
+ public static native void teleCall(String phoneNumber);
+ public static native void teleHang();
+ public static native void teleShutdown();
+
+ public static native void setFaceLabel(int cameraIdx, int stTrackId, String phoneNumber);
+
+ public static int COMPANY_ID = 1001;
public static void faceCallBack(int cameraIdx, int count)
{
@@ -60,7 +81,7 @@
lockFace(cameraIdx);
RefByteArray faceListPb = new RefByteArray();
- int s = getFaceList(cameraIdx, faceListPb);
+ int s = getFaceList(cameraIdx, COMPANY_ID, faceListPb);
Log.i("@@@", "RtspFaceNative.faceCallBack, getFaceList, cameraIdx=" + cameraIdx + ", size=" + s);
//RefByteArray faceImages = new RefByteArray();
@@ -80,11 +101,22 @@
{
Log.i("@@@", "cameraIdx=" + cameraIdx +
", i=" + i +
+ ", st_track_id=" + faceImages.get(i).st_track_id+
", 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