From f97741ef79bc496cbf0581527e1f54b369d246be Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 10 八月 2017 14:54:06 +0800
Subject: [PATCH] bug fix
---
VisitFace/RtspNativeCodec/app/src/main/java/com/example/nativecodec/NativeCodec.java | 44 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 36 insertions(+), 8 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 73fd4c5..9fd8a32 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
@@ -23,6 +23,7 @@
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.util.Log;
+import android.util.Xml;
import android.view.Surface;
import android.view.SurfaceHolder;
import android.view.SurfaceView;
@@ -45,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;
@@ -63,6 +65,9 @@
SurfaceView mSurfaceView2;
SurfaceHolder mSurfaceHolder2;
+ SurfaceView mSurfaceView3;
+ SurfaceHolder mSurfaceHolder3;
+
VideoSink mSelectedVideoSink;
VideoSink mNativeCodecPlayerVideoSink;
@@ -79,11 +84,24 @@
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
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();
- RtspFaceNative.setLocalIP("192.168.1.9");
+ 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.setLocalIP("192.168.1.93");
mGLView1 = (MyGLSurfaceView) findViewById(R.id.glsurfaceview1);
@@ -94,6 +112,8 @@
mSurfaceView2 = (SurfaceView) findViewById(R.id.surfaceview2);
mSurfaceHolder2 = mSurfaceView2.getHolder();
+ mSurfaceView3 = (SurfaceView) findViewById(R.id.surfaceview3);
+ mSurfaceHolder3 = mSurfaceView3.getHolder();
mSurfaceHolder1.addCallback(new SurfaceHolder.Callback() {
@@ -213,7 +233,15 @@
}
});
- // initialize button click handlers
+ ((SurfaceView) findViewById(R.id.surfaceview3)).setOnClickListener(new View.OnClickListener() {
+ public void onClick(View view) {
+ mSurfaceHolder3.setFormat(PixelFormat.RGB_565);
+ Surface s3 = mSurfaceHolder3.getSurface();
+ RtspFaceNative.setCaptureSurface(s3);
+ }
+ });
+
+ // initialize button click handlers
// native MediaPlayer start/pause
((Button) findViewById(R.id.start_native)).setOnClickListener(new View.OnClickListener() {
@@ -265,11 +293,10 @@
//mCreated = createStreamingMediaPlayer(getResources().getAssets(), mSourceString);
//#todo ok
- //mCreated = RtspFaceNative.createPlayer(1, "rtsp://admin:admin12345@192.168.1.70:554/h264/ch1/main/av_stream");
//mCreated = RtspFaceNative.createPlayer(1, "rtsp://admin:admin@192.168.1.188:554/cam/realmonitor?channel=1&subtype=2");
- //mCreated = RtspFaceNative.createPlayer(1, "rtsp://Admin:1234@192.168.1.71/h264");
- //mCreated = RtspFaceNative.createPlayer(1, "rtsp://Admin:1234@192.168.1.71/h264_2");
- mCreated = RtspFaceNative.createPlayer(2, "rtsp://admin:a1234567@192.168.1.68:554/h264/ch1/sub/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 = createPlayer(1, "rtsp://192.168.1.56:8554");
//byte[] arr = new byte[5];
@@ -465,7 +492,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