From 4b914a5d7e3d7971cb3e3ed49047fa331bd74da3 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 13 六月 2017 17:19:34 +0800
Subject: [PATCH] milestone 1
---
VisitFace/RtspNativeCodec/app/src/main/java/com/example/nativecodec/NativeCodec.java | 68 +++++++++++++++++++++++++++++++---
1 files changed, 62 insertions(+), 6 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 3b029de..73fd4c5 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
@@ -17,6 +17,7 @@
package com.example.nativecodec;
import android.app.Activity;
+import android.app.NativeActivity;
import android.graphics.PixelFormat;
import android.graphics.SurfaceTexture;
import android.graphics.drawable.Drawable;
@@ -43,6 +44,9 @@
import android.widget.Button;
import android.widget.TextView;
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
import java.nio.ByteBuffer;
import cn.com.basic.face.util.NativeImg;
@@ -79,7 +83,7 @@
ThisActivity = this;
RtspFaceNative.init();
- RtspFaceNative.setLocalIP("192.168.1.205");
+ RtspFaceNative.setLocalIP("192.168.1.9");
mGLView1 = (MyGLSurfaceView) findViewById(R.id.glsurfaceview1);
@@ -192,6 +196,23 @@
}
});
+ mSurfaceView1.getHolder().addCallback(new SurfaceHolder.Callback() {
+ @Override
+ public void surfaceCreated(SurfaceHolder holder) {
+
+ }
+
+ @Override
+ public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
+
+ }
+
+ @Override
+ public void surfaceDestroyed(SurfaceHolder holder) {
+
+ }
+ });
+
// initialize button click handlers
// native MediaPlayer start/pause
@@ -213,9 +234,13 @@
//RtspFaceNative.setSurface(1, mSurfaceHolderDecoder1.getSurface());
+ //mSurfaceHolder1.setFormat(PixelFormat.RGBA_8888);
+ mSurfaceHolder1.setFormat(PixelFormat.RGB_565);
Surface s = mSurfaceHolder1.getSurface();
RtspFaceNative.setSurface(1, s);
+ //mSurfaceHolder2.setFormat(PixelFormat.RGBA_8888);
+ mSurfaceHolder2.setFormat(PixelFormat.RGB_565);
Surface s2 = mSurfaceHolder2.getSurface();
RtspFaceNative.setSurface(2, s2);
@@ -226,12 +251,25 @@
//sgl.release();
RtspFaceNative.setFaceCallback(1, "cn/com/basic/face/util/RtspFaceNative", "faceCallBack");
- //RtspFaceNative.setFaceCallback(2, "cn/com/basic/face/util/RtspFaceNative", "faceCallBack");
+ RtspFaceNative.setFaceCallback(2, "cn/com/basic/face/util/RtspFaceNative", "faceCallBack");
+
+ //try
+ //{
+ // String str = convertStreamToString(ThisActivity.getAssets().open("license.lic"));
+ // RtspFaceNative.dbgSetStfaceLicense(str);
+ //}
+ //catch(Exception ex)
+ //{
+ // return ;
+ //}
//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(2, "rtsp://admin:a1234567@192.168.1.68:554/h264/ch1/main/av_stream");
+ //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 = createPlayer(1, "rtsp://192.168.1.56:8554");
//byte[] arr = new byte[5];
@@ -296,6 +334,24 @@
static NativeCodec ThisActivity;
+ public String convertStreamToString(InputStream is) {
+ try
+ {
+ BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+ StringBuilder sb = new StringBuilder();
+ String line = null;
+ while ((line = reader.readLine()) != null) {
+ sb.append(line).append("\n");
+ }
+ reader.close();
+ return sb.toString();
+ }
+ catch(Exception ex)
+ {
+ return "";
+ }
+ }
+
public static void setFaceDrawable(NativeImg img)
{
//ImageView image = (ImageView)ThisActivity.findViewById(R.id.addface_image);
@@ -312,7 +368,7 @@
ThisActivity.runOnUiThread(new Runnable() {
@Override
public void run() {
- Bitmap bitmap = Bitmap.createBitmap(faceImg.width, faceImg.height, Bitmap.Config.ARGB_8888);
+ Bitmap bitmap = Bitmap.createBitmap(faceImg.width, faceImg.height, Bitmap.Config.RGB_565);//ARGB_8888
ByteBuffer byteBuffer = ByteBuffer.wrap(faceImg.image, 0, faceImg.size);
bitmap.copyPixelsFromBuffer(byteBuffer);
@@ -410,7 +466,7 @@
/** Load jni .so on initialization */
static {
System.loadLibrary("rtspface");
- System.loadLibrary("opencv_java3");
+ //System.loadLibrary("opencv_java3");
}
// VideoSink abstracts out the difference between Surface and SurfaceTexture
--
Gitblit v1.8.0