From a5fc9f0acaa8b92c8d78f060cd4cdabab2793c62 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 17 八月 2017 10:30:34 +0800
Subject: [PATCH] merge home base
---
VisitFace/RtspNativeCodec/app/src/main/java/com/example/nativecodec/NativeCodec.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 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..4226691 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
@@ -21,6 +21,7 @@
import android.graphics.PixelFormat;
import android.graphics.SurfaceTexture;
import android.graphics.drawable.Drawable;
+import android.media.MediaCodecInfo;
import android.os.Bundle;
import android.util.Log;
import android.util.Xml;
@@ -53,6 +54,8 @@
import cn.com.basic.face.util.NativeImg;
import cn.com.basic.face.util.RtspFaceNative;
+
+import static java.lang.Thread.sleep;
public class NativeCodec extends Activity {
static final String TAG = "NativeCodec";
@@ -94,14 +97,14 @@
//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");
- }
+ //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");
+ RtspFaceNative.setLocalIP("192.168.1.112");
mGLView1 = (MyGLSurfaceView) findViewById(R.id.glsurfaceview1);
@@ -294,15 +297,14 @@
//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(2, "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");
+ //mCreated = RtspFaceNative.createPlayer(1, "rtsp://admin:a1234567@192.168.1.201:554/h264/ch1/main/av_stream");
+ mCreated = RtspFaceNative.createPlayer(1, "rtsp://192.168.1.94:8554");
//byte[] arr = new byte[5];
//arr[0] = 3; arr[1] = 4; arr[2] = 5;
//RtspFaceNative.getFaceList(1, arr);
-
}
}
if (mCreated) {
@@ -310,9 +312,7 @@
//setPlayingStreamingMediaPlayer(mIsPlaying);
}
}
-
});
-
// native MediaPlayer rewind
((Button) findViewById(R.id.rewind_native)).setOnClickListener(new View.OnClickListener() {
--
Gitblit v1.8.0