optimize

houxiao

2017-05-11 61fd77beb5f02d1ce8dcd458317dbca7a5d4246b

 VisitFace/RtspNativeCodec/app/src/main/java/com/example/nativecodec/NativeCodec.java

@@ -41,6 +41,7 @@
import android.graphics.Canvas;
import android.util.AttributeSet;
import android.widget.Button;
import android.widget.TextView;

import java.nio.ByteBuffer;

@@ -54,6 +55,9 @@

    SurfaceView mSurfaceView1;
    SurfaceHolder mSurfaceHolder1;

    SurfaceView mSurfaceView2;
    SurfaceHolder mSurfaceHolder2;

    VideoSink mSelectedVideoSink;
    VideoSink mNativeCodecPlayerVideoSink;
@@ -82,6 +86,9 @@
        // set up the Surface 1 video sink
        mSurfaceView1 = (SurfaceView) findViewById(R.id.surfaceview1);
        mSurfaceHolder1 = mSurfaceView1.getHolder();

        mSurfaceView2 = (SurfaceView) findViewById(R.id.surfaceview2);
        mSurfaceHolder2 = mSurfaceView2.getHolder();



@@ -202,17 +209,30 @@
                    }
                    if (mSourceString != null) {

                        RtspFaceNative.setSurface(1, mSurfaceHolder1.getSurface());
                        mGLView1VideoSink.useAsSinkForNative();
                        //RtspFaceNative.setSurface(1, s, mSurfaceHolder1.getSurface());

                        //mCreated = createStreamingMediaPlayer(getResources().getAssets(), mSourceString);
                        //#todo ok
                        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(1, "rtsp://192.168.1.56:8554");
                        //RtspFaceNative.setSurface(1, mSurfaceHolderDecoder1.getSurface());

                        Surface s = mSurfaceHolder1.getSurface();
                        RtspFaceNative.setSurface(1, s, s);

                        Surface s2 = mSurfaceHolder2.getSurface();
                        RtspFaceNative.setSurface(2, s2, s2);

                        //SurfaceTexture st = mGLView1VideoSink.mMyGLSurfaceView.getSurfaceTexture();
                        //Surface sgl = new Surface(st);
                        //RtspFaceNative.setSurface(2, sgl, sgl);
                        //mGLView1VideoSink.useAsSinkForNative();
                        //sgl.release();

                        RtspFaceNative.setFaceCallback(1, "cn/com/basic/face/util/RtspFaceNative", "faceCallBack");
                        //RtspFaceNative.setFaceCallback(2, "cn/com/basic/face/util/RtspFaceNative", "faceCallBack");

                        //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 = createPlayer(1, "rtsp://192.168.1.56:8554");

                        //byte[] arr = new byte[5];
                        //arr[0] = 3; arr[1] = 4; arr[2] = 5;
@@ -292,12 +312,15 @@
                ThisActivity.runOnUiThread(new Runnable() {
                    @Override
                    public void run() {
                        Bitmap bitmap = Bitmap.createBitmap(faceImg.width, faceImg.height, Bitmap.Config.RGB_565);
                        Bitmap bitmap = Bitmap.createBitmap(faceImg.width, faceImg.height, Bitmap.Config.ARGB_8888);
                        ByteBuffer byteBuffer = ByteBuffer.wrap(faceImg.image, 0, faceImg.size);
                        bitmap.copyPixelsFromBuffer(byteBuffer);

                        ImageView image = (ImageView)ThisActivity.findViewById(R.id.addface_image);
                        image.setImageBitmap(bitmap);

                        TextView textView1 = (TextView)ThisActivity.findViewById(R.id.textView1);
                        textView1.setText(RtspFaceNative.dbgGetLog());
                    }
                });
            }
@@ -417,7 +440,7 @@
            Surface s = mSurfaceHolder.getSurface();
            Log.i("@@@", "setting surface " + s);
            //mSurfaceHolder1.setFormat(PixelFormat.RGBA_8888);
            RtspFaceNative.setSurface(1, s);
            //RtspFaceNative.setSurface(1, s);
        }

    }
@@ -439,7 +462,7 @@
            SurfaceTexture st = mMyGLSurfaceView.getSurfaceTexture();
            Surface s = new Surface(st);
            //setEGLConfigChooser(8, 8, 8, 8, 0, 0);
            RtspFaceNative.setSurface(2, s);
            //RtspFaceNative.setSurface(1, s);
            s.release();
        }