From e26a5550539fa0cad91313bf9670df605199a324 Mon Sep 17 00:00:00 2001
From: pans <pans@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 15 八月 2017 13:55:25 +0800
Subject: [PATCH] capnproto fix bug
---
VisitFace/RtspNativeCodec/app/src/main/java/com/example/nativecodec/NativeCodec.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 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 9fd8a32..98a6922 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
@@ -95,13 +95,17 @@
RtspFaceNative.init();
for (int i=0 ;i < 32; i+=2){
- RtspFaceNative.setFaceLabel(1, i, "涓枃鍚嶅瓧");
- RtspFaceNative.setFaceLabel(1, i+1, "abcd");
- RtspFaceNative.setFaceLabel(2, i, "涓枃鍚嶅瓧");
- RtspFaceNative.setFaceLabel(2, i+1, "abcd");
+// RtspFaceNative.setFaceLabel(1, i, "涓枃鍚嶅瓧");
+// RtspFaceNative.setFaceLabel(1, i+1, "abcd");
+// RtspFaceNative.setFaceLabel(2, i, "涓枃鍚嶅瓧");
+// RtspFaceNative.setFaceLabel(2, i+1, "abcd");
}
- RtspFaceNative.setLocalIP("192.168.1.93");
+ //server
+ RtspFaceNative.setLocalIP("192.168.1.94");
+ //client
+ //RtspFaceNative.setLocalIP("192.168.1.97");
+
mGLView1 = (MyGLSurfaceView) findViewById(R.id.glsurfaceview1);
@@ -294,9 +298,10 @@
//mCreated = createStreamingMediaPlayer(getResources().getAssets(), mSourceString);
//#todo ok
//mCreated = RtspFaceNative.createPlayer(1, "rtsp://admin:admin@192.168.1.188:554/cam/realmonitor?channel=1&subtype=2");
- mCreated = RtspFaceNative.createPlayer(1, "rtsp://admin:admin12345@192.168.1.202:554/h264/ch1/main/av_stream");
+ //mCreated = RtspFaceNative.createPlayer(1, "rtsp://admin:admin12345@192.168.1.202:554/h264/ch1/main/av_stream");
//mCreated = RtspFaceNative.createPlayer(2, "rtsp://Admin:1234@192.168.1.22/h264");
- //mCreated = RtspFaceNative.createPlayer(2, "rtsp://admin:a1234567@192.168.1.201:554/h264/ch1/main/av_stream");
+ mCreated = RtspFaceNative.createPlayer(2, "rtsp://admin:a1234567@192.168.1.201:554/h264/ch1/main/av_stream");
+ //mCreated = RtspFaceNative.createPlayer(1, "rtsp://192.168.1.93:8554/");
//mCreated = createPlayer(1, "rtsp://192.168.1.56:8554");
//byte[] arr = new byte[5];
@@ -492,8 +497,8 @@
/** Load jni .so on initialization */
static {
- System.loadLibrary("rtspface_client");
- //System.loadLibrary("rtspface_server");
+ // System.loadLibrary("rtspface_client");
+ System.loadLibrary("rtspface_server");
//System.loadLibrary("opencv_java3");
}
--
Gitblit v1.8.0