From 72505b6ff2ee0342a6950af306da0942718ca0b4 Mon Sep 17 00:00:00 2001
From: pans <pans@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 18 八月 2017 15:54:36 +0800
Subject: [PATCH] capnp fix bug
---
VisitFace/RtspNativeCodec/app/src/main/java/cn/com/basic/face/util/RtspFaceNative.java | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 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 3daa5a3..9974950 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
@@ -4,6 +4,7 @@
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;
@@ -19,6 +20,7 @@
*/
class NativeImgIdx {
+ public int st_track_id;
public int offset;
public int size;
public int type;
@@ -39,7 +41,7 @@
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);
@@ -51,6 +53,20 @@
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;
@@ -83,13 +99,14 @@
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]);
+// 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)
{
@@ -98,10 +115,13 @@
//bitmap.copyPixelsFromBuffer(byteBuffer);
//NativeCodec.setFaceDrawable(bitmap);
- NativeCodec.setFaceDrawable(faceImages.get(i));
+ // NativeCodec.setFaceDrawable(faceImages.get(i));
}
+ setFaceLabel(cameraIdx+1, faceImages.get(i).st_track_id , "4444444edddddd");
}
+ //#todo fix setFacelable
+
releaseFace(cameraIdx);
}
--
Gitblit v1.8.0