From 63d598d4443f906b34bedaf49e870b7a2be1a5c8 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 06 四月 2017 12:14:30 +0800
Subject: [PATCH] bug fix for android device
---
VisitFace/RtspNativeCodec/app/src/main/java/com/example/nativecodec/NativeCodec.java | 40 ++++++++++++++++++++++++++--------------
1 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/src/main/java/com/example/nativecodec/NativeCodec.java b/VisitFace/RtspNativeCodec/app/src/main/java/com/example/nativecodec/NativeCodec.java
index c9d8eac..e6fd85f 100644
--- a/VisitFace/RtspNativeCodec/app/src/main/java/com/example/nativecodec/NativeCodec.java
+++ b/VisitFace/RtspNativeCodec/app/src/main/java/com/example/nativecodec/NativeCodec.java
@@ -33,6 +33,8 @@
import android.widget.RadioButton;
import android.widget.Spinner;
+import com.bsk.zhangbo.demoforbsk.util.RtspFaceNative;
+
import java.io.IOException;
public class NativeCodec extends Activity {
@@ -58,7 +60,7 @@
super.onCreate(icicle);
setContentView(R.layout.main);
- init();
+ RtspFaceNative.init();
mGLView1 = (MyGLSurfaceView) findViewById(R.id.glsurfaceview1);
@@ -185,13 +187,18 @@
}
if (mSourceString != null) {
- setSurface(1, mSurfaceHolder1.getSurface());
+ RtspFaceNative.setSurface(1, mSurfaceHolder1.getSurface());
mGLView1VideoSink.useAsSinkForNative();
//mCreated = createStreamingMediaPlayer(getResources().getAssets(), mSourceString);
- mCreated = createPlayer(1, "rtsp://admin:admin12345@192.168.1.70:554/h264/ch1/main/av_stream");
- mCreated = createPlayer(2, "rtsp://admin:admin12345@192.168.1.70:554/h264/ch1/main/av_stream");
+ //#todo ok
+ mCreated = RtspFaceNative.createPlayer(1, "rtsp://admin:admin12345@192.168.1.70:554/h264/ch1/main/av_stream");
+ mCreated = RtspFaceNative.createPlayer(2, "rtsp://admin:admin12345@192.168.1.70:554/h264/ch1/sub/av_stream");
//mCreated = createPlayer(1, "rtsp://192.168.1.56:8554");
+
+ //byte[] arr = new byte[5];
+ //arr[0] = 3; arr[1] = 4; arr[2] = 5;
+ //RtspFaceNative.getFaceList(1, arr);
}
}
@@ -266,8 +273,8 @@
@Override
protected void onDestroy()
{
- shutdown(1);
- shutdown(2);
+ RtspFaceNative.shutdown(1);
+ RtspFaceNative.shutdown(2);
mCreated = false;
super.onDestroy();
}
@@ -286,16 +293,21 @@
//public static native void setSurface(Surface surface);
//public static native void rewindStreamingMediaPlayer();
-
- public static native void init();
- 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);
-
+ //public static native void init();
+ //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);
+ //// typedef void (* Java_com_example_nativecodec_NativeCodec_FaceCallback_func)(int cameraIdx, int count);
+ //public static native boolean setFaceCallback(int cameraIdx, String func);
+ //public static native void lockFace(int cameraIdx);
+ //public static native void releaseFace(int cameraIdx);
+ //public static native boolean getFaceList(int cameraIdx, byte[] faceListPb);
+ //public static native boolean getFaceImages(int cameraIdx, byte[] faceImagesIdx, byte[] faceImages);
/** Load jni .so on initialization */
static {
System.loadLibrary("rtspface");
+ //System.loadLibrary("opencv_java3");
}
// VideoSink abstracts out the difference between Surface and SurfaceTexture
@@ -324,7 +336,7 @@
void useAsSinkForNative() {
Surface s = mSurfaceHolder.getSurface();
Log.i("@@@", "setting surface " + s);
- setSurface(1, s);
+ RtspFaceNative.setSurface(1, s);
}
}
@@ -345,7 +357,7 @@
void useAsSinkForNative() {
SurfaceTexture st = mMyGLSurfaceView.getSurfaceTexture();
Surface s = new Surface(st);
- setSurface(2, s);
+ RtspFaceNative.setSurface(2, s);
s.release();
}
--
Gitblit v1.8.0