From e473f9eeb0233afcbd38de5de975dea4d131026d Mon Sep 17 00:00:00 2001
From: pans <pans@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 16 八月 2017 15:26:27 +0800
Subject: [PATCH] fix Remote client bug
---
VisitFace/RtspNativeCodec/app/src/main/java/com/example/nativecodec/NativeCodec.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 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 400dadc..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
@@ -46,6 +46,7 @@
import android.widget.TextView;
import java.io.BufferedReader;
+import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.ByteBuffer;
@@ -85,15 +86,26 @@
setContentView(R.layout.main);
ThisActivity = this;
+ try {
+ Process su = Runtime.getRuntime().exec("su");
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ //Runtime.getRuntime().exec(new String[]{"/system/bin/su","-c", cmd});
+
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.75");
+ //server
+ RtspFaceNative.setLocalIP("192.168.1.94");
+ //client
+ //RtspFaceNative.setLocalIP("192.168.1.97");
+
mGLView1 = (MyGLSurfaceView) findViewById(R.id.glsurfaceview1);
@@ -286,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(1, "rtsp://192.168.1.93:8554/");
//mCreated = createPlayer(1, "rtsp://192.168.1.56:8554");
//byte[] arr = new byte[5];
@@ -484,7 +497,8 @@
/** Load jni .so on initialization */
static {
- System.loadLibrary("rtspface");
+ // System.loadLibrary("rtspface_client");
+ System.loadLibrary("rtspface_server");
//System.loadLibrary("opencv_java3");
}
--
Gitblit v1.8.0