diff --git a/.idea/misc.xml b/.idea/misc.xml
index 586fd4e..cc72de3 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
diff --git a/README.md b/README.md
index 7cf9905..d208538 100644
--- a/README.md
+++ b/README.md
@@ -2,12 +2,12 @@
 直播SDK，推流，录制视频，滤镜。
 
 博客教程：http://blog.csdn.net/King1425/article/details/79392158<br/>
-交流群号：364886309 
+交流群号：364886309 ，949792060
 
 概述：
 ---
 **现在把我们项目中的直播SDK开源出来，我们是境外直播平台，百万用户，经过半年迭代，SDK已经相当稳定，大家可以放心使用。https://github.com/WangShuo1143368701/WSLiveDemo**
-这个sdk是我根据这个[librestreaming](https://github.com/lakeinchina/librestreaming)修修改改出来的，由于改了太多的代码，用法已经不一样了。
+
 
 之前写过一篇[ffmpeg实战教程（十一）手把手教你实现直播功能，不依赖第三方SDK](http://blog.csdn.net/king1425/article/details/72560673)
 是用ffmpeg实现的推流，但是在实际移动端直播项目中，推流是不适合用ffmpeg的。
@@ -22,6 +22,7 @@
 支持分开设置预览分辨率，编码的分辨率<br/>
 支持gpu滤镜，并可以通过opengles绘制图像纹理来自定义滤镜。<br/>
 支持设fbo滤镜组。<br/>
+支持设置水印<br/>
 支持前后摄像头快速切换，不会打断推流。<br/>
 支持后台推流，后台录制视频<br/>
 美颜滤镜可动态调节磨皮，美白，红润。<br/>
@@ -40,6 +41,11 @@
 -----
 采用相机回调纹理texture,OpenGL渲染后直接把textureID传给编码器的方案，中间没有数据格式转换，没有glReadPixel()函数耗时问题。所以性能较其它方案要好的多。缺点是必须是Android4.3以上。
 
+关于拉流：
+-----
+https://github.com/WangShuo1143368701/WS_IJK
+优化过的IJK播放器，秒开实现，推流端断网回调等。。。
+
 关于使用：
 -----
 
@@ -118,14 +124,15 @@
     //Add the dependency
 
    dependencies {
-	        compile 'com.github.WangShuo1143368701:WSLiveDemo:v1.5'
+	         compile 'com.github.WangShuo1143368701:WSLiveDemo:v1.7'
 	}
 
 ```
 
 关于学习：
 -----
-欢迎加入音视频交流群：364886309
+欢迎加入音视频交流群：364886309，949792060
+
 
 
 
diff --git a/app/src/main/java/com/wangshuo/wslive/wslivedemo/LiveActivity.java b/app/src/main/java/com/wangshuo/wslive/wslivedemo/LiveActivity.java
index bbd1b6a..b051536 100644
--- a/app/src/main/java/com/wangshuo/wslive/wslivedemo/LiveActivity.java
+++ b/app/src/main/java/com/wangshuo/wslive/wslivedemo/LiveActivity.java
@@ -1,5 +1,7 @@
 package com.wangshuo.wslive.wslivedemo;
 
+import android.graphics.BitmapFactory;
+import android.graphics.Rect;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.widget.Toast;
@@ -12,6 +14,7 @@
 import me.lake.librestreaming.ws.StreamAVOption;
 import me.lake.librestreaming.ws.StreamLiveCameraView;
 import me.lake.librestreaming.ws.filter.hardfilter.GPUImageBeautyFilter;
+import me.lake.librestreaming.ws.filter.hardfilter.WatermarkFilter;
 import me.lake.librestreaming.ws.filter.hardfilter.extra.GPUImageCompatibleFilter;
 
 public class LiveActivity extends AppCompatActivity {
@@ -47,7 +50,7 @@ public void initLiveConfig() {
         mLiveCameraView.addStreamStateListener(resConnectionListener);
         LinkedList<BaseHardVideoFilter> files = new LinkedList<>();
         files.add(new GPUImageCompatibleFilter(new GPUImageBeautyFilter()));
-        //files.add(new GPUImageCompatibleFilter(new GPUImageAddBlendFilter()));
+        files.add(new WatermarkFilter(BitmapFactory.decodeResource(getResources(),R.mipmap.live),new Rect(100,100,200,200)));
         mLiveCameraView.setHardVideoFilter(new HardVideoGroupFilter(files));
     }
 
diff --git a/libWSLive/src/main/java/me/lake/librestreaming/client/RESClient.java b/libWSLive/src/main/java/me/lake/librestreaming/client/RESClient.java
index 6b3a891..17d4a05 100644
--- a/libWSLive/src/main/java/me/lake/librestreaming/client/RESClient.java
+++ b/libWSLive/src/main/java/me/lake/librestreaming/client/RESClient.java
@@ -8,6 +8,8 @@
 import android.os.Build;
 import android.widget.Toast;
 
+import java.lang.ref.WeakReference;
+
 import me.lake.librestreaming.core.listener.RESConnectionListener;
 import me.lake.librestreaming.core.listener.RESScreenShotListener;
 import me.lake.librestreaming.core.listener.RESVideoChangeListener;
@@ -34,7 +36,7 @@ public class RESClient {
     private RESFlvDataCollecter dataCollecter;
     //是否在推流
     public boolean isStreaming = false;
-    private Activity mActivity;
+    private WeakReference<Activity> mActivity;
 
     public RESClient() {
         SyncOp = new Object();
@@ -44,7 +46,7 @@ public RESClient() {
 
     public void setContext(Context context){
         if(context instanceof Activity){
-            this.mActivity = (Activity) context;
+            this.mActivity = new WeakReference<Activity>((Activity) context);
         }
     }
 
@@ -101,15 +103,10 @@ public void startStreaming(String rtmpAddr) {
                 rtmpSender.start(rtmpAddr == null ? coreParameters.rtmpAddr : rtmpAddr);
                 audioClient.start(dataCollecter);
                 LogTools.d("RESClient,startStreaming()");
-            }catch (IllegalStateException e){
-                if(mActivity !=null){
-                    Toast.makeText(mActivity,"可能没有权限",Toast.LENGTH_LONG).show();
-                    mActivity.finish();
-                }
             }catch (Exception e){
-                if(mActivity !=null){
-                    Toast.makeText(mActivity,"可能没有权限",Toast.LENGTH_LONG).show();
-                    mActivity.finish();
+                if(mActivity.get() !=null){
+                    Toast.makeText(mActivity.get(),"可能没有权限",Toast.LENGTH_LONG).show();
+                    mActivity.get().finish();
                 }
             }
 
@@ -520,6 +517,10 @@ public void setMirror(boolean isEnableMirror,boolean isEnablePreviewMirror,boole
         videoClient.setMirror(isEnableMirror,isEnablePreviewMirror,isEnableStreamMirror);
     }
 
+    public void setNeedResetEglContext(boolean bol){
+        videoClient.setNeedResetEglContext(bol);
+    }
+
     static {
         System.loadLibrary("restreaming");
     }
diff --git a/libWSLive/src/main/java/me/lake/librestreaming/client/RESVideoClient.java b/libWSLive/src/main/java/me/lake/librestreaming/client/RESVideoClient.java
index 26b5ac6..1032272 100644
--- a/libWSLive/src/main/java/me/lake/librestreaming/client/RESVideoClient.java
+++ b/libWSLive/src/main/java/me/lake/librestreaming/client/RESVideoClient.java
@@ -460,4 +460,7 @@ public void setVideoEncoder(final MediaVideoEncoder encoder) {
     public void setMirror(boolean isEnableMirror,boolean isEnablePreviewMirror,boolean isEnableStreamMirror) {
         videoCore.setMirror(isEnableMirror,isEnablePreviewMirror,isEnableStreamMirror);
     }
+    public void setNeedResetEglContext(boolean bol){
+        videoCore.setNeedResetEglContext(bol);
+    }
 }
diff --git a/libWSLive/src/main/java/me/lake/librestreaming/core/RESHardVideoCore.java b/libWSLive/src/main/java/me/lake/librestreaming/core/RESHardVideoCore.java
index f441ec0..857da22 100644
--- a/libWSLive/src/main/java/me/lake/librestreaming/core/RESHardVideoCore.java
+++ b/libWSLive/src/main/java/me/lake/librestreaming/core/RESHardVideoCore.java
@@ -877,5 +877,9 @@ private void processStMatrix(float[] matrix, boolean needMirror) {
 
         return;
     }
+
+    public void setNeedResetEglContext(boolean bol){
+        mNeedResetEglContext = bol;
+    }
     //encoder mp4 end
 }
diff --git a/libWSLive/src/main/java/me/lake/librestreaming/core/RESSoftVideoCore.java b/libWSLive/src/main/java/me/lake/librestreaming/core/RESSoftVideoCore.java
index 5db68f6..ab4e3b2 100644
--- a/libWSLive/src/main/java/me/lake/librestreaming/core/RESSoftVideoCore.java
+++ b/libWSLive/src/main/java/me/lake/librestreaming/core/RESSoftVideoCore.java
@@ -548,5 +548,8 @@ public void setVideoEncoder(final MediaVideoEncoder encoder) {
     @Override
     public void setMirror(boolean isEnableMirror, boolean isEnablePreviewMirror, boolean isEnableStreamMirror) {
 
+    }
+    public void setNeedResetEglContext(boolean bol){
+
     }
 }
diff --git a/libWSLive/src/main/java/me/lake/librestreaming/core/RESVideoCore.java b/libWSLive/src/main/java/me/lake/librestreaming/core/RESVideoCore.java
index c370136..5e2f0a0 100644
--- a/libWSLive/src/main/java/me/lake/librestreaming/core/RESVideoCore.java
+++ b/libWSLive/src/main/java/me/lake/librestreaming/core/RESVideoCore.java
@@ -47,4 +47,7 @@ public interface RESVideoCore {
     void setVideoEncoder(final MediaVideoEncoder encoder);
 
     void setMirror(boolean isEnableMirror,boolean isEnablePreviewMirror,boolean isEnableStreamMirror);
+    void setNeedResetEglContext(boolean bol);
+
+
 }
diff --git a/libWSLive/src/main/java/me/lake/librestreaming/ws/StreamLiveCameraView.java b/libWSLive/src/main/java/me/lake/librestreaming/ws/StreamLiveCameraView.java
index e82d162..23b4982 100644
--- a/libWSLive/src/main/java/me/lake/librestreaming/ws/StreamLiveCameraView.java
+++ b/libWSLive/src/main/java/me/lake/librestreaming/ws/StreamLiveCameraView.java
@@ -152,6 +152,7 @@ public void stopStreaming(){
     private boolean isRecord = false;
     public void startRecord(){
         if(resClient != null){
+            resClient.setNeedResetEglContext(true);
             try {
                 mMuxer = new MediaMuxerWrapper(".mp4");    // if you record audio only, ".m4a" is also OK.
                 new MediaVideoEncoder(mMuxer, mMediaEncoderListener, StreamAVOption.recordVideoWidth, StreamAVOption.recordVideoHeight);
@@ -170,6 +171,7 @@ public void startRecord(){
      * 停止录制
      */
     public String stopRecord() {
+        isRecord = false;
         if (mMuxer != null) {
             String path = mMuxer.getFilePath();
             mMuxer.stopRecording();
@@ -178,7 +180,6 @@ public String stopRecord() {
             return path;
         }
         System.gc();
-        isRecord = false;
         return null;
     }
 
@@ -385,7 +386,7 @@ public void onSurfaceTextureUpdated(SurfaceTexture surface) {
     /**
      * callback methods from encoder
      */
-    private final MediaEncoder.MediaEncoderListener mMediaEncoderListener = new MediaEncoder.MediaEncoderListener() {
+    MediaEncoder.MediaEncoderListener mMediaEncoderListener = new MediaEncoder.MediaEncoderListener() {
         @Override
         public void onPrepared(final MediaEncoder encoder) {
             if (encoder instanceof MediaVideoEncoder && resClient != null)
diff --git a/libWSLive/src/main/java/me/lake/librestreaming/ws/filter/hardfilter/WatermarkFilter.java b/libWSLive/src/main/java/me/lake/librestreaming/ws/filter/hardfilter/WatermarkFilter.java
new file mode 100644
index 0000000..383a845
--- /dev/null
+++ b/libWSLive/src/main/java/me/lake/librestreaming/ws/filter/hardfilter/WatermarkFilter.java
@@ -0,0 +1,149 @@
+package me.lake.librestreaming.ws.filter.hardfilter;
+
+import android.graphics.Bitmap;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.opengl.GLES11Ext;
+import android.opengl.GLES20;
+
+import java.nio.FloatBuffer;
+
+import me.lake.librestreaming.filter.hardvideofilter.BaseHardVideoFilter;
+import me.lake.librestreaming.tools.GLESTools;
+
+
+public class WatermarkFilter extends BaseHardVideoFilter {
+    protected int glProgram;
+    protected int glCamTextureLoc;
+    protected int glCamPostionLoc;
+    protected int glCamTextureCoordLoc;
+    protected int glImageTextureLoc;
+    protected int glImageRectLoc;
+    protected String vertexShader_filter = "" +
+            "attribute vec4 aCamPosition;\n" +
+            "attribute vec2 aCamTextureCoord;\n" +
+            "varying vec2 vCamTextureCoord;\n" +
+            "void main(){\n" +
+            "   gl_Position= aCamPosition;\n" +
+            "   vCamTextureCoord = aCamTextureCoord;\n" +
+            "}";
+    protected String fragmentshader_filter = "" +
+            "precision mediump float;\n" +
+            "varying mediump vec2 vCamTextureCoord;\n" +
+            "uniform sampler2D uCamTexture;\n" +
+            "uniform sampler2D uImageTexture;\n" +
+            "uniform vec4 imageRect;\n" +
+            "void main(){\n" +
+            "   lowp vec4 c1 = texture2D(uCamTexture, vCamTextureCoord);\n" +
+            "   lowp vec2 vCamTextureCoord2 = vec2(vCamTextureCoord.x,1.0-vCamTextureCoord.y);\n" +
+            "   if(vCamTextureCoord2.x>imageRect.r && vCamTextureCoord2.x<imageRect.b && vCamTextureCoord2.y>imageRect.g && vCamTextureCoord2.y<imageRect.a)\n" +
+            "   {\n" +
+            "        vec2 imagexy = vec2((vCamTextureCoord2.x-imageRect.r)/(imageRect.b-imageRect.r),(vCamTextureCoord2.y-imageRect.g)/(imageRect.a-imageRect.g));\n" +
+            "        lowp vec4 c2 = texture2D(uImageTexture, imagexy);\n" +
+            "        lowp vec4 outputColor = c2+c1*c1.a*(1.0-c2.a);\n" +
+            "        outputColor.a = 1.0;\n" +
+            "        gl_FragColor = outputColor;\n" +
+            "   }else\n" +
+            "   {\n" +
+            "       gl_FragColor = c1;\n" +
+            "   }\n" +
+            "}";
+    protected int imageTexture = GLESTools.NO_TEXTURE;
+
+    protected final Object syncBitmap = new Object();
+    protected Bitmap iconBitmap;
+    protected boolean needUpdate;
+    protected RectF iconRectF;
+    protected Rect iconRect;
+
+    public WatermarkFilter(Bitmap _bitmap, Rect _rect) {
+        iconBitmap = _bitmap;
+        needUpdate = true;
+        iconRectF = new RectF();
+        iconRect = _rect;
+    }
+
+    protected WatermarkFilter() {
+        iconBitmap = null;
+        needUpdate = false;
+        iconRectF = new RectF(0,0,0,0);
+    }
+
+    public void updateIcon(Bitmap _bitmap, Rect _rect) {
+        synchronized (syncBitmap) {
+            if (_bitmap != null) {
+                iconBitmap = _bitmap;
+                needUpdate = true;
+            }
+            if (_rect != null) {
+                iconRect = _rect;
+            }
+        }
+    }
+
+
+    @Override
+    public void onInit(int VWidth, int VHeight) {
+        super.onInit(VWidth, VHeight);
+        glProgram = GLESTools.createProgram(vertexShader_filter, fragmentshader_filter);
+        GLES20.glUseProgram(glProgram);
+        glCamTextureLoc = GLES20.glGetUniformLocation(glProgram, "uCamTexture");
+        glImageTextureLoc = GLES20.glGetUniformLocation(glProgram, "uImageTexture");
+        glCamPostionLoc = GLES20.glGetAttribLocation(glProgram, "aCamPosition");
+        glCamTextureCoordLoc = GLES20.glGetAttribLocation(glProgram, "aCamTextureCoord");
+        glImageRectLoc = GLES20.glGetUniformLocation(glProgram, "imageRect");
+
+    }
+
+    @Override
+    public void onDraw(int cameraTexture, int targetFrameBuffer, FloatBuffer shapeBuffer, FloatBuffer textrueBuffer) {
+        synchronized (syncBitmap) {
+            if (needUpdate) {
+                if (imageTexture != GLESTools.NO_TEXTURE) {
+                    GLES20.glDeleteTextures(1, new int[]{imageTexture}, 0);
+                }
+                imageTexture = GLESTools.loadTexture(iconBitmap, GLESTools.NO_TEXTURE);
+            }
+        }
+        iconRectF.top = iconRect.top / (float) SIZE_HEIGHT;
+        iconRectF.bottom = iconRect.bottom / (float) SIZE_HEIGHT;
+        iconRectF.left = iconRect.left / (float) SIZE_WIDTH;
+        iconRectF.right = iconRect.right / (float) SIZE_WIDTH;
+        GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, targetFrameBuffer);
+        GLES20.glUseProgram(glProgram);
+        GLES20.glUniform4f(glImageRectLoc, iconRectF.left, iconRectF.top, iconRectF.right, iconRectF.bottom);
+        GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
+        GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, cameraTexture);
+        GLES20.glUniform1i(glCamTextureLoc, 0);
+        GLES20.glActiveTexture(GLES20.GL_TEXTURE1);
+        GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, imageTexture);
+        GLES20.glUniform1i(glImageTextureLoc, 1);
+        GLES20.glEnableVertexAttribArray(glCamPostionLoc);
+        GLES20.glEnableVertexAttribArray(glCamTextureCoordLoc);
+        shapeBuffer.position(0);
+        GLES20.glVertexAttribPointer(glCamPostionLoc, 2,
+                GLES20.GL_FLOAT, false,
+                2 * 4, shapeBuffer);
+        textrueBuffer.position(0);
+        GLES20.glVertexAttribPointer(glCamTextureCoordLoc, 2,
+                GLES20.GL_FLOAT, false,
+                2 * 4, textrueBuffer);
+        GLES20.glViewport(0, 0, SIZE_WIDTH, SIZE_HEIGHT);
+        GLES20.glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+        GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT);
+        GLES20.glDrawElements(GLES20.GL_TRIANGLES, drawIndecesBuffer.limit(), GLES20.GL_UNSIGNED_SHORT, drawIndecesBuffer);
+        GLES20.glFinish();
+        GLES20.glDisableVertexAttribArray(glCamPostionLoc);
+        GLES20.glDisableVertexAttribArray(glCamTextureCoordLoc);
+        GLES20.glBindTexture(GLES11Ext.GL_TEXTURE_EXTERNAL_OES, 0);
+        GLES20.glUseProgram(0);
+        GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, 0);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        GLES20.glDeleteProgram(glProgram);
+        GLES20.glDeleteTextures(1, new int[]{imageTexture}, 0);
+    }
+}