From 943e709dfb580c4aa277611ef169c54c446078b7 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期一, 27 三月 2017 12:53:25 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/OneFragment.java | 75 +++++++++++++++++--------------------
1 files changed, 35 insertions(+), 40 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/OneFragment.java b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/OneFragment.java
index 22c5acb..6e6308c 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/OneFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/com/bsk/zhangbo/demoforbsk/ui/fragment/OneFragment.java
@@ -1,11 +1,8 @@
package com.bsk.zhangbo.demoforbsk.ui.fragment;
-import android.content.res.AssetManager;
import android.graphics.Rect;
import android.graphics.SurfaceTexture;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.ViewPager;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
@@ -16,14 +13,10 @@
import android.view.View;
import android.widget.RadioButton;
import android.widget.RadioGroup;
-import android.widget.Toast;
-import android.widget.VideoView;
import com.bsk.zhangbo.demoforbsk.R;
-import com.bsk.zhangbo.demoforbsk.adapter.MyFragmentPagerAdapter;
import com.bsk.zhangbo.demoforbsk.adapter.OneBottomRecylerViewAdapter;
import com.bsk.zhangbo.demoforbsk.base.BaseFragment;
-import com.bsk.zhangbo.demoforbsk.ui.activity.TestARGB8888Activity;
import com.bsk.zhangbo.demoforbsk.util.RtspFaceNative;
import com.bsk.zhangbo.demoforbsk.util.WindowsUtil;
import com.bsk.zhangbo.demoforbsk.widget.MyGLSurfaceView;
@@ -31,10 +24,9 @@
import com.orhanobut.logger.Logger;
import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
import java.util.List;
+import cn.com.basic.face.discern.query.item.FacePhotoItem;
/**
@@ -55,7 +47,7 @@
String mSourceString = "clips/testfile.mp4";
SurfaceView mSurfaceView1;
- MyGLSurfaceView mGLView1;
+ SurfaceView mSurfaceView2;
SurfaceHolder mSurfaceHolder1;
VideoSink mSelectedVideoSink;
@@ -70,7 +62,7 @@
/** Load jni .so on initialization */
static {
- //System.loadLibrary("rtspface");//xiuxi
+ System.loadLibrary("rtspface");//xiuxi
}
@@ -100,16 +92,11 @@
mAdapter = new OneBottomRecylerViewAdapter(getActivity());
- mGLView1 = (MyGLSurfaceView) view.findViewById(R.id.surfaceview2);
+ mSurfaceView2 = (SurfaceView) view.findViewById(R.id.surfaceview2);
mSurfaceView1 = (SurfaceView) view.findViewById(R.id.surfaceview1);
RtspFaceNative.init();
- try {
- Thread.sleep(3000);
- }catch (Exception e) {
- e.printStackTrace();
- }
RtspFaceNative.setSurface(1, mSurfaceView1.getHolder().getSurface());
- RtspFaceNative.setSurface(2, mGLView1.getHolder().getSurface());
+ RtspFaceNative.setSurface(2, mSurfaceView2.getHolder().getSurface());
mSurfaceHolder1 = mSurfaceView1.getHolder();
@@ -140,9 +127,11 @@
//openGL
- mGLView1.onResume();
+ if(mSurfaceView2 instanceof MyGLSurfaceView) {
+ ((MyGLSurfaceView)mSurfaceView2).onResume();
+ }
if (mGLView1VideoSink == null) {
- mGLView1VideoSink = new GLViewVideoSink(mGLView1);
+ mGLView1VideoSink = new GLViewVideoSink(mSurfaceView2);
}
mSelectedVideoSink = mGLView1VideoSink;
@@ -167,8 +156,8 @@
if (mSourceString != null) {
//mCreated = createStreamingMediaPlayer(getResources().getAssets(),
// mSourceString);
- mCreated = RtspFaceNative.createPlayer(1, "rtsp://admin:admin12345@192.168.1.70:554/h264/ch1/main/av_stream");
- mCreated = RtspFaceNative.createPlayer(2, "rtsp://admin:admin12345@192.168.1.70:554/h264/ch1/main/av_stream");
+ mCreated = RtspFaceNative.createPlayer(1, "rtsp://admin:admin12345@192.168.1.70:554/h264/ch1/sub/av_stream");
+ mCreated = RtspFaceNative.createPlayer(2, "rtsp://admin:admin12345@192.168.1.70:554/h264/ch1/sub/av_stream");
////mCreated = createPlayer(2, "rtsp://admin:admin12345@192.168.1.70:554/h264/ch1/main/av_stream");
}
}
@@ -184,11 +173,6 @@
}
});
thread.start();//xiuxi
- }
-
- @Override
- protected void initToolbar(Bundle savedInstanceState) {
-
}
@Override
@@ -219,11 +203,12 @@
// switchSurface();
mList = new ArrayList();
for (int i = 0; i < 125; i++) {
- mList.add(""+i);
+ FacePhotoItem item = new FacePhotoItem();
+ //item.setType();
+ mList.add(item);
}
mAdapter.setList(mList);
mRecyclerViewRegister.setAdapter(mAdapter);
-
}
private class SpaceItemDecoration extends RecyclerView.ItemDecoration {
@@ -241,8 +226,6 @@
}
}
}
-
-
void switchSurface() {
if (mCreated && mNativeCodecPlayerVideoSink != mSelectedVideoSink) {
@@ -269,7 +252,9 @@
@Override
public void onPause() {
mIsPlaying = false;
- mGLView1.onPause();
+ if(mSurfaceView2 instanceof MyGLSurfaceView) {
+ ((MyGLSurfaceView)mSurfaceView2).onPause();
+ }
//setPlayingStreamingMediaPlayer(false);//xiuxi
super.onPause();
}
@@ -277,7 +262,9 @@
@Override
public void onResume() {
super.onResume();
- mGLView1.onResume();
+ if(mSurfaceView2 instanceof MyGLSurfaceView) {
+ ((MyGLSurfaceView)mSurfaceView2).onResume();
+ }
}
/**
@@ -332,22 +319,30 @@
static class GLViewVideoSink extends VideoSink {
- private final MyGLSurfaceView mMyGLSurfaceView;
+ private final SurfaceView SurfaceView;
+ private final SurfaceHolder mSurfaceHolder;
- GLViewVideoSink(MyGLSurfaceView myGLSurfaceView) {
- mMyGLSurfaceView = myGLSurfaceView;
+ GLViewVideoSink(SurfaceView myGLSurfaceView) {
+ SurfaceView = myGLSurfaceView;
+ mSurfaceHolder = SurfaceView.getHolder();
}
@Override
void setFixedSize(int width, int height) {
+ mSurfaceHolder.setFixedSize(width, height);
}
@Override
void useAsSinkForNative() {
- SurfaceTexture st = mMyGLSurfaceView.getSurfaceTexture();
- Surface s = new Surface(st);
- RtspFaceNative.setSurface(2, s);
- s.release();
+ if(SurfaceView instanceof MyGLSurfaceView) {
+ SurfaceTexture st = ((MyGLSurfaceView)SurfaceView).getSurfaceTexture();
+ Surface s = new Surface(st);
+ RtspFaceNative.setSurface(2, s);
+ s.release();
+ } else {
+ RtspFaceNative.setSurface(2, SurfaceView.getHolder().getSurface());
+ }
+
}
}
--
Gitblit v1.8.0