更新推流SDK，添加悬浮窗预览、截屏、背景图推流、音频滤镜、滤镜等功能

王琳
1 parent c39ca37a
Showing 104 changed files with 1609 additions and 124 deletions
app/build.gradle
app/src/main/AndroidManifest.xml
app/src/main/assets/KSYResource/0_pink.png
app/src/main/assets/KSYResource/0_ruddy2.png
app/src/main/assets/KSYResource/10_sunshine_night.png
app/src/main/assets/KSYResource/11_ruddy.png
app/src/main/assets/KSYResource/12_sunshine.png
app/src/main/assets/KSYResource/13_nature.png
app/src/main/assets/KSYResource/14_amatorka.png
app/src/main/assets/KSYResource/15_elegance_1.png
app/src/main/assets/KSYResource/1_freshy.png
app/src/main/assets/KSYResource/2_beauty.png
app/src/main/assets/KSYResource/3_sweety.png
app/src/main/assets/KSYResource/4_sepia.png
app/src/main/assets/KSYResource/5_blue.png
app/src/main/assets/KSYResource/6_nostalgia.png
app/src/main/assets/KSYResource/7_sakura.png
app/src/main/assets/KSYResource/8_sakura_night.png
app/src/main/assets/KSYResource/9_ruddy_night.png
app/src/main/assets/KSYResource/amaro_map.png
@@ -43,7 +43,11 @@ repositories {
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
+        compile 'com.cnlive:lib_cnlive:2.1.0'
     compile 'com.android.support:appcompat-v7:25.2.0'
     compile 'com.android.support.constraint:constraint-layout:1.0.1'
-    compile 'com.cnlive:lib_cnlive:2.0.0'
+
+    compile 'com.facebook.fresco:fresco:1.4.0'
+    compile 'com.facebook.fresco:animated-gif:1.4.0'
+    compile 'com.facebook.fresco:animated-webp:1.4.0'
 }
@@ -35,7 +35,8 @@
             android:name=".StreamActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.RiseAnimation" />
         <activity
             android:name=".CNStreamActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
@@ -46,6 +47,11 @@
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".FloatActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:launchMode="singleTop"
+            android:theme="@style/Theme.RiseAnimation"></activity>
     </application>
 </manifest>
 \ No newline at end of file
+package com.cnlive.demo.stream;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Rect;
+import android.net.Uri;
+import android.util.Log;
+
+import com.cnlive.libs.stream.Streamer;
+import com.cnlive.libs.stream.capture.CNImgTexSrcPin;
+import com.facebook.common.executors.CallerThreadExecutor;
+import com.facebook.common.references.CloseableReference;
+import com.facebook.datasource.BaseDataSubscriber;
+import com.facebook.datasource.DataSource;
+import com.facebook.datasource.DataSubscriber;
+import com.facebook.drawee.backends.pipeline.Fresco;
+import com.facebook.imagepipeline.animated.base.AnimatedDrawableFrameInfo;
+import com.facebook.imagepipeline.animated.base.AnimatedImage;
+import com.facebook.imagepipeline.animated.base.AnimatedImageFrame;
+import com.facebook.imagepipeline.core.ImagePipeline;
+import com.facebook.imagepipeline.image.CloseableAnimatedImage;
+import com.facebook.imagepipeline.image.CloseableBitmap;
+import com.facebook.imagepipeline.image.CloseableImage;
+import com.facebook.imagepipeline.request.ImageRequest;
+import com.facebook.imagepipeline.request.ImageRequestBuilder;
+
+import java.util.Date;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.stream.Stream;
+
+/**
+ * Created by Lynn on 2017/9/19.
+ */
+
+public class AnimatedImageCapture {
+    private static final String TAG = "AnimatedImageCapture";
+    private static final boolean VERBOSE = false;
+
+    private int mIndex;
+    private Date mLastDate;
+    private int mRepeatCount;   // TODO: handle gif/webp repeat count
+    private Bitmap mBitmap;
+    private Canvas mCanvas;
+    private Bitmap mTempBitmap;
+    private Timer mTimer;
+    private CloseableReference<? extends CloseableImage> mCloseableReference;
+
+    private Streamer mStreamer;
+
+    private CNImgTexSrcPin cnImgTexSrcPin;
+    private Context context;
+
+    public AnimatedImageCapture(Context context, Streamer streamer) {
+        this.context = context;
+        this.mStreamer = streamer;
+        cnImgTexSrcPin = new CNImgTexSrcPin(streamer.getGLRender());
+    }
+
+    public void showAnimatedWaterMard(String url, float x, float y, float w, float h, float a) {
+        cnImgTexSrcPin.connect(mStreamer.getImgTexPreviewMixer().getSinkPin(3));
+        cnImgTexSrcPin.connect(mStreamer.getImgTexMixer().getSinkPin(3));
+        mStreamer.getImgTexPreviewMixer().setRenderRect(3, x, y, w, h, a);
+        mStreamer.getImgTexMixer().setRenderRect(3, x, y, w, h, a);
+        start(context, url);
+    }
+
+    public void hideAnimatedWaterMark() {
+        stop();
+        cnImgTexSrcPin.disconnect(false);
+    }
+
+    public void start(Context context, String url) {
+        if (url == null) {
+            return;
+        }
+
+        Uri uri = Uri.parse(assets2Asset(url));
+        ImagePipeline imagePipeline = Fresco.getImagePipeline();
+        ImageRequest request = ImageRequestBuilder.newBuilderWithSource(uri).build();
+        DataSource<CloseableReference<CloseableImage>> dataSource =
+                imagePipeline.fetchDecodedImage(request, context);
+        dataSource.subscribe(mDataSubscriber, CallerThreadExecutor.getInstance());
+    }
+
+    private String assets2Asset(String url) {
+        if (url.startsWith("assets://")) {
+            url = url.replaceFirst("assets://", "asset:///");
+        }
+        return url;
+    }
+
+    public void stop() {
+        if (mTimer != null) {
+            mTimer.cancel();
+            mTimer = null;
+        }
+        if (mCloseableReference != null) {
+            CloseableReference.closeSafely(mCloseableReference);
+            mCloseableReference = null;
+        }
+        cnImgTexSrcPin.updateFrame(null, false);
+    }
+
+    private void updateFrame() {
+        if (mCloseableReference == null) {
+            return;
+        }
+        try {
+            CloseableImage closeableImage = mCloseableReference.get();
+            if (closeableImage instanceof CloseableBitmap) {
+                Bitmap bitmap = ((CloseableBitmap) closeableImage).getUnderlyingBitmap();
+                if (bitmap != null && !bitmap.isRecycled()) {
+                    mBitmap = Bitmap.createBitmap(bitmap);
+                    cnImgTexSrcPin.updateFrame(mBitmap, false);
+                }
+                return;
+            }
+
+            if (!(closeableImage instanceof CloseableAnimatedImage)) {
+                return;
+            }
+            AnimatedImage animatedImage = ((CloseableAnimatedImage) closeableImage).getImage();
+            int w = animatedImage.getWidth();
+            int h = animatedImage.getHeight();
+            if (mBitmap == null || mBitmap.isRecycled()) {
+                Log.d(TAG, "Got animated image " + w + "x" + h);
+                mBitmap = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888);
+                mTempBitmap = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888);
+                mCanvas = new Canvas(mBitmap);
+            }
+            if (mIndex >= animatedImage.getFrameCount()) {
+                mRepeatCount++;
+                mIndex = 0;
+                int loopCount = animatedImage.getLoopCount();
+                if (loopCount > 0 && mRepeatCount >= loopCount) {
+                    Log.d(TAG, "repeat ended, repeat times: " + mRepeatCount);
+                    return;
+                }
+            }
+
+            AnimatedImageFrame imageFrame = animatedImage.getFrame(mIndex);
+            int duration = imageFrame.getDurationMs();
+            AnimatedDrawableFrameInfo frameInfo = animatedImage.getFrameInfo(mIndex);
+            imageFrame.renderFrame(frameInfo.width, frameInfo.height, mTempBitmap);
+            if (VERBOSE) {
+                Log.d(TAG, "blend: " + frameInfo.blendOperation.name() +
+                        " dispose: " + frameInfo.disposalMethod.name() +
+                        " x=" + frameInfo.xOffset + " y=" + frameInfo.yOffset +
+                        " " + frameInfo.width + "x" + frameInfo.height);
+            }
+            if (frameInfo.blendOperation == AnimatedDrawableFrameInfo.BlendOperation.NO_BLEND) {
+                mBitmap.eraseColor(Color.TRANSPARENT);
+            }
+            Rect srcRect = new Rect(0, 0, frameInfo.width, frameInfo.height);
+            Rect dstRect = new Rect(frameInfo.xOffset, frameInfo.yOffset,
+                    frameInfo.xOffset + frameInfo.width, frameInfo.yOffset + frameInfo.height);
+            mCanvas.drawBitmap(mTempBitmap, srcRect, dstRect, null);
+            if (VERBOSE) {
+                Log.d(TAG, "frame " + mIndex + " got, duration=" + duration);
+            }
+            cnImgTexSrcPin.updateFrame(mBitmap, false);
+            imageFrame.dispose();
+
+            mIndex++;
+            if (mLastDate == null) {
+                mLastDate = new Date();
+            }
+            mLastDate = new Date(mLastDate.getTime() + duration);
+            mTimer.schedule(new TimerTask() {
+                @Override
+                public void run() {
+                    updateFrame();
+                }
+            }, mLastDate);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private DataSubscriber mDataSubscriber =
+            new BaseDataSubscriber<CloseableReference<? extends CloseableImage>>() {
+
+                @Override
+                public void onNewResultImpl(
+                        DataSource<CloseableReference<? extends CloseableImage>> dataSource) {
+                    if (!dataSource.isFinished()) {
+                        return;
+                    }
+
+                    // get ref
+                    mCloseableReference = dataSource.getResult();
+
+                    // reset
+                    mIndex = 0;
+                    mRepeatCount = 0;
+                    mLastDate = null;
+                    mBitmap = null;
+                    mTempBitmap = null;
+                    mCanvas = null;
+
+                    // create timer
+                    mTimer = new Timer("AnimatedImage");
+                    mTimer.schedule(new TimerTask() {
+                        @Override
+                        public void run() {
+                            updateFrame();
+                        }
+                    }, 0);
+                }
+
+                @Override
+                public void onFailureImpl(DataSource dataSource) {
+                    Throwable throwable = dataSource.getFailureCause();
+                    // handle failure
+                    if (throwable != null) {
+                        throwable.printStackTrace();
+                    }
+                }
+            };
+}
@@ -15,9 +15,15 @@ import android.widget.Toast;
 import com.cnlive.libs.stream.Streamer;
 import com.cnlive.libs.stream.base.IStreamer;
+import com.cnlive.libs.stream.filter.CNAudioFilterBase;
+import com.cnlive.libs.stream.filter.CNAudioReverbFilter;
 import com.cnlive.libs.stream.model.ActivityConfig;
+import java.util.LinkedList;
+import java.util.List;
+
+import static com.cnlive.libs.stream.base.IStreamer.AUDIO_REVERB_LEVEL_1;
 import static com.cnlive.libs.stream.base.IStreamer.ENCODE_METHOD_HARDWARE;
 import static com.cnlive.libs.stream.base.IStreamer.ENCODE_METHOD_SOFTWARE_COMPAT;
 import static com.cnlive.libs.stream.base.IStreamer.VIDEO_RESOLUTION_360P;
@@ -434,18 +440,30 @@ public class AudioActivity extends AppCompatActivity implements View.OnClickList
                 }).setPositiveButton("确定", new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialogInterface, int which) {
+                        List<CNAudioFilterBase> filterBases = new LinkedList<CNAudioFilterBase>();
                         switch (which) {
                             case 0:
-                                mStreamer.setAudioFilter(IStreamer.AUDIO_REVERB_LEVEL_1);
+                                CNAudioReverbFilter reverbFilter = new CNAudioReverbFilter();
+                                reverbFilter.setReverbLevel(IStreamer.AUDIO_REVERB_LEVEL_1);
+                                filterBases.add(reverbFilter);
                                 break;
                             case 1:
-                                mStreamer.setAudioFilter(IStreamer.AUDIO_REVERB_LEVEL_2);
+                                CNAudioReverbFilter reverbFilter1 = new CNAudioReverbFilter();
+                                reverbFilter1.setReverbLevel(IStreamer.AUDIO_REVERB_LEVEL_2);
+                                filterBases.add(reverbFilter1);
                                 break;
                             case 2:
-                                mStreamer.setAudioFilter(IStreamer.AUDIO_REVERB_LEVEL_3);
+                                CNAudioReverbFilter reverbFilter2 = new CNAudioReverbFilter();
+                                reverbFilter2.setReverbLevel(IStreamer.AUDIO_REVERB_LEVEL_3);
+                                filterBases.add(reverbFilter2);
                                 break;
                             case 3:
-                                mStreamer.setAudioFilter(IStreamer.AUDIO_REVERB_LEVEL_4);
+                                CNAudioReverbFilter reverbFilter3 = new CNAudioReverbFilter();
+                                reverbFilter3.setReverbLevel(IStreamer.AUDIO_REVERB_LEVEL_4);
+                                filterBases.add(reverbFilter3);
+                                break;
+                            default:
+                                mStreamer.getAudioFilterMgt().setFilter(filterBases);
                                 break;
                         }
                     }
+package com.cnlive.demo.stream;
+
+import android.annotation.SuppressLint;
+
+import com.cnlive.libs.stream.Streamer;
+
+/**
+ * Created by Lynn on 2017/9/19.
+ */
+
+public class CNGlobalStreamer {
+
+    @SuppressLint("StaticFieldLeak")
+    private static Streamer sStreamer;
+
+    private CNGlobalStreamer() {
+
+    }
+
+    public static void setInstance(Streamer streamer) {
+        sStreamer = streamer;
+    }
+
+    public static Streamer getInstance() {
+        return sStreamer;
+    }
+}
@@ -3,6 +3,7 @@ package com.cnlive.demo.stream;
 import android.app.Application;
 import com.cnlive.libs.util.Config;
+import com.facebook.drawee.backends.pipeline.Fresco;
 /**
  * Created by xiansong on 2016/7/22.
@@ -14,5 +15,8 @@ public class CNStreamApplication extends Application {
         super.onCreate();
         Config.init(this, "60_irn9gh9d49", "f7b6db55616d207fd5c07e2b580b5650c690aff58fb36d",true);
+
+        // 初始化fresco库，用来支持动态水印功能
+        Fresco.initialize(this);
     }
 }
+package com.cnlive.demo.stream;
+
+import android.app.Activity;
+import android.app.Application;
+import android.content.Intent;
+import android.graphics.Color;
+import android.graphics.PixelFormat;
+import android.hardware.SensorManager;
+import android.net.Uri;
+import android.opengl.GLSurfaceView;
+import android.os.Build;
+import android.provider.Settings;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.OrientationEventListener;
+import android.view.Surface;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.Toast;
+
+import com.cnlive.libs.stream.Streamer;
+
+public class FloatActivity extends Activity {
+
+    private static final String TAG = "FloatViewActivity";
+
+    private final static int OVERLAY_PERMISSION_RESULT_CODE = 10;
+
+    private GLSurfaceView mCameraView;
+    private int mLastRotation;
+    private OrientationEventListener mOrientationEventListener;
+
+    //preview window just demo
+    private FloatView mFloatLayout; //悬浮窗口的layout, 可以是xml,也可以在代码中创建
+    private ImageView mFloatClose;  //关闭悬浮窗口
+    private ImageView mFloatBack;   //跳转到上一个页面，不停止推流
+    private WindowManager.LayoutParams mWmParams;  //layout的布局
+    private WindowManager mWindowManager;
+    private volatile boolean mPreviewWindowShow = false;  //悬浮摄像头预览window是否正在显示
+
+    //ButtonListener
+    private ButtonObserver mObserverButton;  //所有按键响应
+
+    // logo path
+    private String mLogoPath = "file:///sdcard/test.png";
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        Log.d(TAG, "onCreate");
+        super.onCreate(savedInstanceState);
+        requestWindowFeature(Window.FEATURE_NO_TITLE);
+        setContentView(R.layout.activity_float);
+        mObserverButton = new ButtonObserver();
+        mLastRotation = getDisplayRotation();
+        mFloatBack = (ImageView) findViewById(R.id.float_back);
+        mFloatBack.setOnClickListener(mObserverButton);
+
+        mOrientationEventListener = new OrientationEventListener(this,
+                SensorManager.SENSOR_DELAY_NORMAL) {
+            @Override
+            public void onOrientationChanged(int orientation) {
+                int rotation = getDisplayRotation();
+                if (rotation != mLastRotation) {
+                    Log.d(TAG, "Rotation changed " + mLastRotation + "->" + rotation);
+                    onSwitchRotate();
+                    mLastRotation = rotation;
+                }
+            }
+        };
+        if (mOrientationEventListener.canDetectOrientation()) {
+            mOrientationEventListener.enable();
+        }
+
+        addFloatViewWithPermCheck();
+    }
+
+    @Override
+    protected void onResume() {
+        Log.d(TAG, "onResume");
+        super.onResume();
+    }
+
+    @Override
+    protected void onPause() {
+        Log.d(TAG, "onPause");
+        super.onPause();
+    }
+
+    @Override
+    protected void onDestroy() {
+        Log.d(TAG, "onDestroy");
+        super.onDestroy();
+        if (mOrientationEventListener != null) {
+            mOrientationEventListener.disable();
+        }
+        removeSurfaceWindow();
+        CNGlobalStreamer.setInstance(null);
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        switch (keyCode) {
+            case KeyEvent.KEYCODE_BACK:
+                onBackoffClick();
+                return true;
+            default:
+                break;
+        }
+        return super.onKeyDown(keyCode, event);
+    }
+
+    private void onBackoffClick() {
+        CNGlobalStreamer.getInstance().pause();
+        CNGlobalStreamer.getInstance().setDisplayPreview((GLSurfaceView) null);
+        FloatActivity.this.finish();
+    }
+
+    /**
+     * 初始化悬浮窗口示例
+     */
+    private void initSurfaceWindow() {
+        if (mWindowManager == null) {
+            mWmParams = new WindowManager.LayoutParams();
+            mWindowManager = (WindowManager) getApplication().
+                    getSystemService(Application.WINDOW_SERVICE);
+
+            //设置window type
+            mWmParams.type = WindowManager.LayoutParams.TYPE_TOAST;
+
+            //设置图片格式，效果为背景透明
+            mWmParams.format = PixelFormat.RGBA_8888;
+
+            //设置浮动窗口不可聚焦（实现操作除浮动窗口外的其他可见窗口的操作）
+            mWmParams.flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
+            //开启硬件加速，以支持TextureView
+            mWmParams.flags |= WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED;
+            //接收touch事件
+            mWmParams.flags |= WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH;
+            //排版不受限制
+            mWmParams.flags |= WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS;
+            //调整悬浮窗显示的停靠位置为右侧底部
+            mWmParams.gravity = Gravity.RIGHT | Gravity.BOTTOM;
+
+            // 以屏幕左上角为原点，设置x、y初始值，相对于gravity
+            mWmParams.x = 0;
+            mWmParams.y = 0;
+
+            //设置悬浮窗口长宽数据(这里取屏幕长宽的等比率缩小值作为悬浮窗口的长宽)
+            int screenWidth = mWindowManager.getDefaultDisplay().getWidth();
+            int screenHeight = mWindowManager.getDefaultDisplay().getHeight();
+            int width;
+            int height;
+
+            boolean isLandscape = (getDisplayRotation() % 180) != 0;
+            if ((isLandscape && screenWidth < screenHeight) ||
+                    (!isLandscape) && screenWidth > screenHeight) {
+                screenWidth = mWindowManager.getDefaultDisplay().getHeight();
+                screenHeight = mWindowManager.getDefaultDisplay().getWidth();
+            }
+
+            if (screenWidth < screenHeight) {
+                width = align(screenWidth / 3, 8);
+                height = align(screenHeight / 3, 8);
+            } else {
+                width = align(screenWidth / 3, 8);
+                height = align(screenHeight / 3, 8);
+            }
+            mWmParams.width = WindowManager.LayoutParams.WRAP_CONTENT;
+            mWmParams.height = WindowManager.LayoutParams.WRAP_CONTENT;
+
+            LayoutInflater inflater = LayoutInflater.from(getApplication());
+
+            //获取浮动窗口视图所在布局
+            mFloatLayout = (FloatView) inflater.inflate(R.layout.float_preview, null);
+
+            mFloatClose = new ImageView(this);
+            mFloatClose.setImageResource(R.drawable.float_close);
+            mFloatClose.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    onBackoffClick();
+                }
+            });
+
+            mCameraView = new GLSurfaceView(this);
+            CNGlobalStreamer.getInstance().setDisplayPreview(mCameraView);
+            RelativeLayout.LayoutParams previewLayoutParams =
+                    new RelativeLayout.LayoutParams(width, height);
+            mFloatLayout.addView(mCameraView, previewLayoutParams);
+            RelativeLayout.LayoutParams closeParams =
+                    new RelativeLayout.LayoutParams(50, 50);
+            closeParams.setMargins(10,10,0,0);
+            mFloatLayout.addView(mFloatClose, closeParams);
+
+            mFloatLayout.setWmParams(mWmParams);
+        }
+    }
+
+    private class ButtonObserver implements View.OnClickListener {
+        @Override
+        public void onClick(View view) {
+            switch (view.getId()) {
+                case R.id.float_back:
+                    onBackoffClick();
+                    break;
+                default:
+                    break;
+            }
+        }
+    }
+
+    private void addSurfaceWindow() {
+        if (mWindowManager != null) {
+            //添加mFloatLayout
+            mWindowManager.addView(mFloatLayout, mWmParams);
+        }
+        mPreviewWindowShow = true;
+    }
+
+    private void removeSurfaceWindow() {
+        if (mWindowManager != null) {
+            mWindowManager.removeViewImmediate(mFloatLayout);
+        }
+        mPreviewWindowShow = false;
+    }
+
+    private void updateViewPosition() {
+        if (mWmParams != null && mWindowManager != null) {
+            mWmParams.gravity = Gravity.RIGHT | Gravity.BOTTOM;
+
+            // 以屏幕左上角为原点，设置x、y初始值，相对于gravity
+            mWmParams.x = 0;
+            mWmParams.y = 0;
+            mWindowManager.updateViewLayout(mFloatLayout, mWmParams);  //刷新显示
+        }
+    }
+
+    private int align(int val, int align) {
+        return (val + align - 1) / align * align;
+    }
+
+    private int getDisplayRotation() {
+        int rotation = getWindowManager().getDefaultDisplay().getRotation();
+        switch (rotation) {
+            case Surface.ROTATION_0:
+                return 0;
+            case Surface.ROTATION_90:
+                return 90;
+            case Surface.ROTATION_180:
+                return 180;
+            case Surface.ROTATION_270:
+                return 270;
+        }
+        return 0;
+    }
+
+    private void addFloatViewWithPermCheck() {
+        // 6.0 需要检查overlay权限
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && !Settings.canDrawOverlays(this)) {
+            Intent intent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
+                    Uri.parse("package:" + getPackageName()));
+            startActivityForResult(intent, OVERLAY_PERMISSION_RESULT_CODE);
+        } else {
+            initSurfaceWindow();
+            addSurfaceWindow();
+        }
+    }
+
+    /**
+     * 申请overlay权限窗口返回
+     *
+     * @param requestCode
+     * @param resultCode
+     * @param data
+     */
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == OVERLAY_PERMISSION_RESULT_CODE) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                if (!Settings.canDrawOverlays(this)) {
+                    // SYSTEM_ALERT_WINDOW permission not granted...
+                    Toast.makeText(FloatActivity.this, "SYSTEM_ALERT_WINDOW not granted",
+                            Toast.LENGTH_SHORT).show();
+                } else {
+                    initSurfaceWindow();
+                    addSurfaceWindow();
+                }
+            }
+        }
+    }
+
+    /**
+     * 旋转摄像头预览示例代码
+     */
+    private void onSwitchRotate() {
+        if (mPreviewWindowShow) {
+            int rotation = getDisplayRotation();
+            Log.i(TAG, "onSwitchRotate: " + mLastRotation + "->" + rotation);
+            CNGlobalStreamer.getInstance().setRotateDegrees(rotation);
+
+            boolean isLastLandscape = (mLastRotation % 180) != 0;
+            boolean isLandscape = (rotation % 180) != 0;
+            if (isLastLandscape != isLandscape) {
+                int width = mCameraView.getHeight();
+                int height = mCameraView.getWidth();
+                RelativeLayout.LayoutParams previewLayoutParams =
+                        (RelativeLayout.LayoutParams) mCameraView.getLayoutParams();
+                previewLayoutParams.width = width;
+                previewLayoutParams.height = height;
+                //更新CameraPreview布局
+                mFloatLayout.updateViewLayout(mCameraView, previewLayoutParams);
+
+                updateViewPosition();
+                updateWaterMark(isLandscape);
+            }
+        }
+    }
+
+    // update water mark position while screen orientation changed
+    private void updateWaterMark(boolean isLandscape) {
+        Streamer streamer = CNGlobalStreamer.getInstance();
+        streamer.hideWaterMarkLogo();
+        streamer.hideWaterMarkTime();
+        if (!isLandscape) {
+            streamer.showWaterMarkLogo(mLogoPath, 0.08f, 0.04f, 0.20f, 0, 0.8f);
+            streamer.showWaterMarkTime(0.03f, 0.01f, 0.35f, Color.WHITE, 1.0f);
+        } else {
+            streamer.showWaterMarkLogo(mLogoPath, 0.05f, 0.09f, 0, 0.20f, 0.8f);
+            streamer.showWaterMarkTime(0.01f, 0.03f, 0.22f, Color.WHITE, 1.0f);
+        }
+    }
+}
+package com.cnlive.demo.stream;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.Gravity;
+import android.view.MotionEvent;
+import android.view.WindowManager;
+import android.widget.RelativeLayout;
+
+/**
+ * Created by Lynn on 2017/9/19.
+ */
+
+public class FloatView extends RelativeLayout {
+    private float mTouchStartX;
+    private float mTouchStartY;
+    private float mLastX;
+    private float mLastY;
+    private float mMaxX = 0;
+    private float mMaxY = 0;
+
+    private WindowManager mWindowManager;
+    private WindowManager.LayoutParams mWmParams;
+
+    public FloatView(Context context) {
+        super(context);
+        init();
+    }
+
+    public FloatView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public FloatView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    public void setWmParams(WindowManager.LayoutParams params) {
+        mWmParams = params;
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        //获取相对屏幕的坐标，即以屏幕左上角为原点
+        mLastX = event.getRawX();
+        mLastY = event.getRawY();
+
+        switch (event.getAction()) {
+            case MotionEvent.ACTION_DOWN:
+                //获取相对View的坐标，即以此View左上角为原点
+                mTouchStartX = event.getX();
+                mTouchStartY = event.getY();
+                break;
+            case MotionEvent.ACTION_MOVE:
+                updateViewPosition();
+                break;
+            case MotionEvent.ACTION_UP:
+                mTouchStartX = 0;
+                mTouchStartY = 0;
+                break;
+        }
+        return true;
+    }
+
+    private void init() {
+        mWindowManager = (WindowManager) getContext().getApplicationContext()
+                .getSystemService(Context.WINDOW_SERVICE);
+    }
+
+    private void updateViewPosition() {
+        if (mWmParams != null) {
+            mMaxX = mWindowManager.getDefaultDisplay().getWidth() - this.getWidth();
+            mMaxY = mWindowManager.getDefaultDisplay().getHeight() - this.getHeight();
+
+            //更新浮动窗口位置参数
+            float newX = (mLastX - mTouchStartX);
+            float newY = (mLastY - mTouchStartY);
+            //以屏幕左上角为原点
+            mWmParams.gravity = Gravity.LEFT | Gravity.TOP;
+
+            //不能移除屏幕最左边和最上边
+            if (newX < 0) {
+                newX = 0;
+            }
+
+            if (newY < 0) {
+                newY = 0;
+            }
+
+            //不能移出屏幕最右边和最下边
+            if (newX > mMaxX) {
+                newX = mMaxX;
+            }
+
+            if (newY > mMaxY) {
+                newY = mMaxY;
+            }
+            mWmParams.x = (int) newX;
+            mWmParams.y = (int) newY;
+            mWindowManager.updateViewLayout(this, mWmParams);  //刷新显示
+
+        }
+    }
+}
@@ -8,7 +8,9 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
 import android.graphics.Color;
+import android.hardware.Camera;
 import android.opengl.GLSurfaceView;
 import android.os.Build;
 import android.os.Bundle;
@@ -23,35 +25,42 @@ import android.view.Window;
 import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
+import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.Chronometer;
 import android.widget.CompoundButton;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.SeekBar;
 import android.widget.TextView;
 import android.widget.Toast;
 import com.cnlive.libs.stream.Streamer;
+import com.cnlive.libs.stream.base.ICNAudioEffectFilter;
 import com.cnlive.libs.stream.base.IStreamer;
 import com.cnlive.libs.stream.base.ImgBeautyProFilter;
 import com.cnlive.libs.stream.base.ImgFilterBase;
+import com.cnlive.libs.stream.filter.CNAudioEffectFilter;
+import com.cnlive.libs.stream.filter.CNAudioFilterBase;
+import com.cnlive.libs.stream.filter.CNAudioReverbFilter;
 import com.cnlive.libs.stream.model.ActivityConfig;
-import com.ksyun.media.player.IMediaPlayer;
+import java.io.BufferedOutputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.LinkedList;
 import java.util.List;
 import static com.cnlive.libs.stream.base.IStreamer.ENCODE_METHOD_HARDWARE;
 import static com.cnlive.libs.stream.base.IStreamer.ENCODE_METHOD_SOFTWARE_COMPAT;
+import static com.cnlive.libs.stream.base.IStreamer.ENCODE_PROFILE_BALANCE;
+import static com.cnlive.libs.stream.base.IStreamer.ENCODE_PROFILE_HIGH_PERFORMANCE;
+import static com.cnlive.libs.stream.base.IStreamer.ENCODE_PROFILE_LOW_POWER;
 import static com.cnlive.libs.stream.base.IStreamer.VIDEO_RESOLUTION_360P;
-import static com.cnlive.libs.stream.model.Filters.BEAUTY_DISABLE;
-import static com.cnlive.libs.stream.model.Filters.BEAUTY_ILLUSION;
-import static com.cnlive.libs.stream.model.Filters.BEAUTY_PRO;
-import static com.cnlive.libs.stream.model.Filters.BEAUTY_SMOOTH;
-import static com.cnlive.libs.stream.model.Filters.BEAUTY_SOFT;
-import static com.cnlive.libs.stream.model.Filters.BEAUTY_SOFT_EXT;
-import static com.cnlive.libs.stream.model.Filters.BEAUTY_SOFT_SHARPEN;
-import static com.cnlive.libs.stream.model.Filters.DENOISE;
-import static com.cnlive.libs.stream.model.Filters.SKIN_WHITEN;
+import static com.cnlive.libs.stream.model.Filters.*;
 /**
  * Created by Administrator on 2016/8/29.
@@ -66,6 +75,8 @@ public class StreamActivity extends Activity {
     private View mDeleteView;
     private View mSwitchCameraView;
     private View mFlashView;
+    private ImageView mExposureView;
+    private ImageView mAddView;
     private TextView mShootingText;
     private CheckBox mWaterMarkCheckBox;
     private CheckBox mBeautyCheckBox;
@@ -74,6 +85,12 @@ public class StreamActivity extends Activity {
     private CheckBox mMuteCheckBox;
     private CheckBox mAudioOnlyCheckBox;
     private CheckBox mFrontMirrorCheckBox;
+    private CheckBox mBgImg;
+    private Button mAudioMix;
+    private Button mBgmFilter;
+    private Button mCaptureScreen;
+
+    private VerticalSeekBar mExposureSeekBar;
     private ButtonObserver mObserverButton;
     private CheckBoxObserver mCheckBoxObserver;
@@ -86,12 +103,16 @@ public class StreamActivity extends Activity {
     private boolean isFlashOpened = false;
     private String mBgmPath = "/sdcard/test.mp3";
     private String mLogoPath = "file:///sdcard/cnlive_logo.png";
+    private String mAnimatedLogoPath = "assets://cnlive_logo.gif";
+    private String mBgImagePath = "assets://bg.jpg";
     private String activityId;
     private String channelId;
     private int isHorizontalScreen = 0;
+    private boolean mShowAnimatedLogo;
+
     private final static int PERMISSION_REQUEST_CAMERA_AUDIOREC = 1;
     private static final String START_STRING = "开始直播";
     private static final String STOP_STRING = "停止直播";
@@ -112,6 +133,8 @@ public class StreamActivity extends Activity {
     private TextView mRuddyText;
     private AppCompatSeekBar mRuddySeekBar;
+    private AnimatedImageCapture animatedImageCapture;
+
     public static void startActivity(Context context,
                                      String activityID,
                                      String channelID,
@@ -142,6 +165,7 @@ public class StreamActivity extends Activity {
         channelId = bundle.getString(CHANNELID);
         mIsLandscape = bundle.getBoolean(LANDSCAPE, false);
         initStreamer();
+        startCameraPreviewWithPermCheck();
     }
@@ -163,8 +187,15 @@ public class StreamActivity extends Activity {
         //闪光灯
         mFlashView = findViewById(R.id.flash);
         mFlashView.setOnClickListener(mObserverButton);
+        //亮度
+        mExposureView = (ImageView) findViewById(R.id.exposure);
+        mExposureView.setOnClickListener(mObserverButton);
+        //悬浮窗
+        mAddView = (ImageView) findViewById(R.id.add);
+        mAddView.setOnClickListener(mObserverButton);
+
         mCheckBoxObserver = new CheckBoxObserver();
-        //美艳
+        //美颜
         mBeautyCheckBox = (CheckBox) findViewById(R.id.click_to_switch_beauty);
         mBeautyCheckBox.setOnCheckedChangeListener(mCheckBoxObserver);
         //背景音乐
@@ -186,6 +217,28 @@ public class StreamActivity extends Activity {
         mAudioOnlyCheckBox = (CheckBox) findViewById(R.id.audio_only);
         mAudioOnlyCheckBox.setOnCheckedChangeListener(mCheckBoxObserver);
+        //音频滤镜
+        mAudioMix = (Button) findViewById(R.id.audio_mix);
+        mAudioMix.setOnClickListener(mObserverButton);
+
+        //bgm升降调
+        mBgmFilter = (Button) findViewById(R.id.bgm_filter);
+        mBgmFilter.setOnClickListener(mObserverButton);
+
+        //截屏
+        mCaptureScreen = (Button) findViewById(R.id.click_to_capture_screenshot);
+        mCaptureScreen.setOnClickListener(mObserverButton);
+
+        //背景图推流
+        mBgImg = (CheckBox) findViewById(R.id.bg_img);
+        mBgImg.setOnCheckedChangeListener(mCheckBoxObserver);
+
+        //亮度调节seekbar
+        mExposureSeekBar = (VerticalSeekBar) findViewById(R.id.exposure_seekBar);
+        mExposureSeekBar.setProgress(50);
+        mExposureSeekBar.setSecondaryProgress(50);
+        mExposureSeekBar.setOnSeekBarChangeListener(verticalSeekBarlistener);
+
         mBeautyChooseView = findViewById(R.id.beauty_choose);
         mBeautySpinner = (AppCompatSpinner) findViewById(R.id.beauty_spin);
         mBeautyGrindLayout = (LinearLayout) findViewById(R.id.beauty_grind);
@@ -213,8 +266,27 @@ public class StreamActivity extends Activity {
         //分别设置预览和推流分辨率
         mStreamer.setPreviewResolution(VIDEO_RESOLUTION_360P);
         mStreamer.setTargetResolution(VIDEO_RESOLUTION_360P);
+//        //采集分辨率
+//        mStreamer.setCameraCaptureResolution(VIDEO_RESOLUTION_360P);
         //设置编码模式（硬编/软编/软编兼容）
-        mStreamer.setEncodeMethod(ENCODE_METHOD_SOFTWARE_COMPAT);
+        mStreamer.setEncodeMethod(ENCODE_METHOD_HARDWARE);
+
+//        //设置场景
+//        mStreamer.setVideoEncodeScene(IStreamer.ENCODE_SCENE_GAME);
+
+//        //H265
+//        mStreamer.setVideoCodecId(IStreamer.CODEC_ID_HEVC);
+//        //H264
+//        mStreamer.setVideoCodecId(IStreamer.CODEC_ID_AVC);
+
+//        //功耗
+//        mStreamer.setVideoEncodeProfile(ENCODE_PROFILE_LOW_POWER);低
+//        mStreamer.setVideoEncodeProfile(ENCODE_PROFILE_BALANCE);平衡
+//        mStreamer.setVideoEncodeProfile(ENCODE_PROFILE_HIGH_PERFORMANCE);高性能
+
+//        //双声道推流
+//        mStreamer.setAudioChannels(2);
+
         //设置横竖屏方向
         mStreamer.setRotateDegrees(mIsLandscape ? 90 : 0);//设置屏幕旋转角度
@@ -243,22 +315,35 @@ public class StreamActivity extends Activity {
         //设置错误回调，收到该回调后，一般是发生了严重错误，比如网络断开等
         mStreamer.setOnErrorListener(mOnErrorListener);
         //设置美颜滤镜
-        mStreamer.getImgTexFilterMgt().setFilter(mStreamer.getGLRender(), DENOISE.getFilter());
+        mStreamer.getImgTexFilterMgt().setFilter(mStreamer.getGLRender(), CN_FILTER_BEAUTY_DENOISE.getFilter());
         mStreamer.setEnableImgBufBeauty(true);
         initBeautyUI();
+        mStreamer.setFilterOnErrorListener(new ImgFilterBase.OnErrorListener() {
+            @Override
+            public void onError(int i) {
+                Toast.makeText(StreamActivity.this, "当前机型不支持该滤镜", Toast.LENGTH_SHORT).show();
+                mStreamer.setFilter(CN_FILTER_BEAUTY_DISABLE.getFilter());
+            }
+        });
+
         //手动变焦
         mStreamer.setCameraCapture(mStreamer.getCameraCapture());
         mCameraPreviewView.setOnTouchListener(mStreamer.getCameraTouchHelper());
         mStreamer.setCameraHintView(mCameraHintView);
         mStreamer.setEnableTouchFocus(true);
         mStreamer.setEnableZoom(true);
+
+        animatedImageCapture = new AnimatedImageCapture(this, mStreamer);
     }
     private void initBeautyUI() {
         String[] items = new String[]{"DISABLE", "BEAUTY_SOFT", "SKIN_WHITEN", "BEAUTY_ILLUSION",
-                "BEAUTY_DENOISE", "BEAUTY_SMOOTH", "BEAUTY_SOFT_EXT", "BEAUTY_SOFT_SHARPEN", "BEAUTY_PRO"};
+                "BEAUTY_DENOISE", "BEAUTY_SMOOTH", "BEAUTY_PRO", "BEAUTY_PRO1", "BEAUTY_PRO2", "BEAUTY_PRO3",
+                "BEAUTY_PRO4", "ToneCurve", "复古", "胶片", "Amatorka",
+                "ELEGANCE", "1977", "Amaro", "Brannan", "EarlyBird", "Hefe", "Hudson", "ink",
+                "Lomo", "LordKelvin", "Nash", "Rise", "Sierra", "Sutro", "Toaster", "Valencia", "Walden", "XproII"};
         ArrayAdapter<String> adapter = new ArrayAdapter<>(this,
                 android.R.layout.simple_spinner_item, items);
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
@@ -270,34 +355,35 @@ public class StreamActivity extends Activity {
                 if (textView != null) {
                     textView.setTextColor(getResources().getColor(R.color.colorAccent));
                 }
-                switch (position) {
-                    case 0:
-                        mStreamer.setFilter(BEAUTY_DISABLE.getFilter());
-                        break;
-                    case 1:
-                        mStreamer.setFilter(BEAUTY_SOFT.getFilter());
-                        break;
-                    case 2:
-                        mStreamer.setFilter(SKIN_WHITEN.getFilter());
-                        break;
-                    case 3:
-                        mStreamer.setFilter(BEAUTY_ILLUSION.getFilter());
-                        break;
-                    case 4:
-                        mStreamer.setFilter(DENOISE.getFilter());
-                        break;
-                    case 5:
-                        mStreamer.setFilter(BEAUTY_SMOOTH.getFilter());
-                        break;
-                    case 6:
-                        mStreamer.setFilter(BEAUTY_SOFT_EXT.getFilter());
-                        break;
-                    case 7:
-                        mStreamer.setFilter(BEAUTY_SOFT_SHARPEN.getFilter());
-                        break;
-                    case 8:
-                        mStreamer.setFilter(BEAUTY_PRO.getFilter());
-                        break;
+
+                if (position == 0) {
+                    mStreamer.setFilter(CN_FILTER_BEAUTY_DISABLE.getFilter());
+                } else if (position <= 5) {
+                    mStreamer.setFilter(position + 15);
+                } else if (position == 6) {
+                    mStreamer.setFilter(CN_FILTER_BEAUTY_PRO.getFilter());
+                } else if (position == 7) {
+                    mStreamer.setFilter(CN_FILTER_BEAUTY_PRO1.getFilter());
+                } else if (position == 8) {
+                    mStreamer.setFilter(CN_FILTER_BEAUTY_PRO2.getFilter());
+                } else if (position == 9) {
+                    mStreamer.setFilter(CN_FILTER_BEAUTY_PRO3.getFilter());
+                } else if (position == 10) {
+                    mStreamer.setFilter(CN_FILTER_BEAUTY_PRO4.getFilter());
+                } else if (position == 11) {
+                    mStreamer.setToneCurveFilterStream(StreamActivity.this.getResources().openRawResource(R.raw.tone_cuver_sample));
+                } else if (position == 12) {
+                    mStreamer.setToneCurveFilterStream(StreamActivity.this.getResources().openRawResource(R.raw.fugu));
+                } else if (position == 13) {
+                    mStreamer.setToneCurveFilterStream(StreamActivity.this.getResources().openRawResource(R.raw.jiaopian));
+                } else if (position == 14) {
+                    //设置风格滤镜
+                    mStreamer.setSpecialEffectsFilter(CN_SPECIAL_EFFECT_AMATORKA.getFilter());
+                } else if (position == 15) {
+                    mStreamer.setSpecialEffectsFilter(CN_SPECIAL_EFFECT_ELEGANCE.getFilter());
+                } else if (position >= 16 && position <= 32) {
+                    int diff = position - 16;
+                    mStreamer.setFilter(CN_FILTER_BEAUTY_1977.getFilter() + diff);
                 }
                 List<ImgFilterBase> filters = mStreamer.getFilter();
                 if (filters != null && !filters.isEmpty()) {
@@ -363,10 +449,81 @@ public class StreamActivity extends Activity {
         mBeautySpinner.setSelection(4);
     }
+    private boolean[] mChooseFilter = {false, false, false, false
+            , false, false, false, false, false, false};
+
+    private void showChooseAudioFilter() {
+        AlertDialog alertDialog;
+        alertDialog = new AlertDialog.Builder(this)
+                .setTitle("音频滤镜")
+                .setMultiChoiceItems(new String[]{"录音棚", "KTV", "小舞台", "演唱会", "萝莉",
+                                "大叔", "庄严", "机器人"}, mChooseFilter,
+                        new DialogInterface.OnMultiChoiceClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which, boolean isChecked) {
+                                if (isChecked) {
+                                    mChooseFilter[which] = true;
+                                }
+                            }
+                        }).setPositiveButton("确定", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        List<CNAudioFilterBase> filterBases = new LinkedList<CNAudioFilterBase>();
+                        if (mChooseFilter[0]) {
+                            CNAudioReverbFilter reverbFilter = new CNAudioReverbFilter();
+                            reverbFilter.setReverbLevel(IStreamer.AUDIO_REVERB_LEVEL_1);
+                            filterBases.add(reverbFilter);
+                        }
+                        if (mChooseFilter[1]) {
+                            CNAudioReverbFilter reverbFilter = new CNAudioReverbFilter();
+                            reverbFilter.setReverbLevel(IStreamer.AUDIO_REVERB_LEVEL_2);
+                            filterBases.add(reverbFilter);
+                        }
+                        if (mChooseFilter[2]) {
+                            CNAudioReverbFilter reverbFilter = new CNAudioReverbFilter();
+                            reverbFilter.setReverbLevel(IStreamer.AUDIO_REVERB_LEVEL_3);
+                            filterBases.add(reverbFilter);
+                        }
+                        if (mChooseFilter[3]) {
+                            CNAudioReverbFilter reverbFilter = new CNAudioReverbFilter();
+                            reverbFilter.setReverbLevel(IStreamer.AUDIO_REVERB_LEVEL_4);
+                            filterBases.add(reverbFilter);
+                        }
+                        if (mChooseFilter[4]) {
+                            CNAudioEffectFilter effectFilter = new CNAudioEffectFilter(ICNAudioEffectFilter.AUDIO_EFFECT_TYPE_FEMALE);
+                            filterBases.add(effectFilter);
+                        }
+                        if (mChooseFilter[5]) {
+                            CNAudioEffectFilter effectFilter = new CNAudioEffectFilter(ICNAudioEffectFilter.AUDIO_EFFECT_TYPE_MALE);
+                            filterBases.add(effectFilter);
+                        }
+
+                        if (mChooseFilter[6]) {
+                            CNAudioEffectFilter effectFilter = new CNAudioEffectFilter(ICNAudioEffectFilter.AUDIO_EFFECT_TYPE_HEROIC);
+                            filterBases.add(effectFilter);
+                        }
+
+                        if (mChooseFilter[7]) {
+                            CNAudioEffectFilter effectFilter = new CNAudioEffectFilter(ICNAudioEffectFilter.AUDIO_EFFECT_TYPE_ROBOT);
+                            filterBases.add(effectFilter);
+                        }
+
+                        if (!mChooseFilter[0] && !mChooseFilter[1] && !mChooseFilter[2] && !mChooseFilter[3] && !mChooseFilter[4] && !mChooseFilter[5] && !mChooseFilter[6] && !mChooseFilter[7]) {
+                            filterBases = null;
+                        }
+                        mStreamer.getAudioFilterMgt().setFilter(filterBases);
+
+                        dialog.dismiss();
+                    }
+                }).create();
+        alertDialog.setCancelable(false);
+        alertDialog.show();
+    }
+
     @Override
     public void onResume() {
         super.onResume();
-        startCameraPreviewWithPermCheck();
+        mStreamer.setDisplayPreview(mCameraPreviewView);
         mStreamer.resume();
         if (mStreamer.isRecording() && !mAudioOnlyCheckBox.isChecked()) {
             mStreamer.setAudioOnly(false);
@@ -380,17 +537,18 @@ public class StreamActivity extends Activity {
     public void onPause() {
         super.onPause();
         mStreamer.pause();
-        mStreamer.stopCameraPreview();
-        if (mStreamer.isRecording() && !mAudioOnlyCheckBox.isChecked()) {
-            mStreamer.setAudioOnly(true);
-            mStreamer.setMuteAudio(true);
-        }
+//        mStreamer.stopCameraPreview();
+//        if (mStreamer.isRecording() && !mAudioOnlyCheckBox.isChecked()) {
+//            mStreamer.setAudioOnly(true);
+//            mStreamer.setMuteAudio(true);
+//        }
         hideWaterMark();
     }
     @Override
     public void onDestroy() {
         super.onDestroy();
+        animatedImageCapture.stop();
         if (mMainHandler != null) {
             mMainHandler.removeCallbacksAndMessages(null);
             mMainHandler = null;
@@ -429,6 +587,87 @@ public class StreamActivity extends Activity {
         mRecording = false;
     }
+    private int mChooseBGMFilter = 3;
+    private String[] mBGMFilterName = {"-3", "-2", "-1", "0", "1", "2", "3"};
+
+    //bgm升降调
+    private void onChooseBGMFilter() {
+        AlertDialog alertDialog;
+        alertDialog = new AlertDialog.Builder(this)
+                .setTitle("请选择背景音乐变调等级")
+                .setSingleChoiceItems(mBGMFilterName, mChooseBGMFilter, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        mChooseBGMFilter = which;
+                    }
+                })
+                .setPositiveButton("确定", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        int level = Integer.parseInt(mBGMFilterName[mChooseBGMFilter]);
+                        CNAudioEffectFilter audioEffectFilter = new CNAudioEffectFilter(ICNAudioEffectFilter.AUDIO_EFFECT_TYPE_PITCH);
+                        audioEffectFilter.setPitchLevel(level);
+                        mStreamer.getBGMAudioFilterMgt().setFilter(audioEffectFilter);
+                        dialog.dismiss();
+                    }
+                })
+                .create();
+        alertDialog.setCancelable(false);
+        alertDialog.show();
+    }
+
+    //截屏
+    private void onCaptureScreenShotClick() {
+        mStreamer.requestScreenShot(new IStreamer.ScreenShotListener() {
+            @Override
+            public void onBitmapAvailable(Bitmap bitmap) {
+                BufferedOutputStream bos = null;
+                try {
+                    Date date = new Date();
+                    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy_MM_dd_HH_mm_ss");
+                    final String fileName = "/sdcard/screenshot" + dateFormat.format(date) + ".jpg";
+
+                    bos = new BufferedOutputStream(new FileOutputStream(fileName));
+
+                    if (bitmap != null) {
+                        bitmap.compress(Bitmap.CompressFormat.JPEG, 90, bos);
+                        runOnUiThread(new Runnable() {
+                            @Override
+                            public void run() {
+                                Toast.makeText(StreamActivity.this, "保存截图到" + fileName, Toast.LENGTH_SHORT).show();
+                            }
+                        });
+                    }
+                } catch (FileNotFoundException e) {
+                    e.printStackTrace();
+                } finally {
+                    if (bos != null)
+                        try {
+                            bos.close();
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                        }
+                }
+            }
+        });
+    }
+
+    //亮度调节
+    private void onExposureClick() {
+        if (mExposureSeekBar.getVisibility() == View.VISIBLE) {
+            mExposureSeekBar.setVisibility(View.GONE);
+        } else {
+            mExposureSeekBar.setVisibility(View.VISIBLE);
+        }
+    }
+
+    private void onAddClick() {
+        Intent intent = new Intent(getApplicationContext(), FloatActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        CNGlobalStreamer.setInstance(mStreamer);
+        startActivity(intent);
+    }
+
     private class ButtonObserver implements View.OnClickListener {
         @Override
         public void onClick(View view) {
@@ -445,12 +684,28 @@ public class StreamActivity extends Activity {
                 case R.id.click_to_shoot:
                     onShootClick();
                     break;
+                case R.id.audio_mix:
+                    showChooseAudioFilter();
+                    break;
+                case R.id.bgm_filter:
+                    onChooseBGMFilter();
+                    break;
+                case R.id.click_to_capture_screenshot:
+                    onCaptureScreenShotClick();
+                    break;
+                case R.id.exposure:
+                    onExposureClick();
+                    break;
+                case R.id.add:
+                    onAddClick();
+                    break;
                 default:
                     break;
             }
         }
     }
+
     private class CheckBoxObserver implements CompoundButton.OnCheckedChangeListener {
         @Override
@@ -477,6 +732,9 @@ public class StreamActivity extends Activity {
                 case R.id.audio_only:
                     onAudioOnlyChecked(isChecked);
                     break;
+                case R.id.bg_img:
+                    onBgImageChecked(isChecked);
+                    break;
                 default:
                     break;
             }
@@ -484,6 +742,17 @@ public class StreamActivity extends Activity {
     }
+    //背景图推流
+    private void onBgImageChecked(boolean isChecked) {
+        if (isChecked) {
+            mStreamer.stopCameraPreview();
+            mStreamer.startImageCapture(mBgImagePath);
+        } else {
+            mStreamer.startCameraPreview();
+            mStreamer.stopImageCapture();
+        }
+    }
+
     //转换摄像头
     private void onSwitchCamera() {
         mStreamer.switchCamera();
@@ -536,11 +805,11 @@ public class StreamActivity extends Activity {
     private void onBeautyChecked(boolean isChecked) {
         if (mStreamer.getVideoEncodeMethod() ==
                 IStreamer.ENCODE_METHOD_SOFTWARE_COMPAT) {
-            mStreamer.getImgTexFilterMgt().setFilter(mStreamer.getGLRender(),
-                    DENOISE.getFilter());
-            mStreamer.setEnableImgBufBeauty(true);
+            mStreamer.getImgTexFilterMgt().setFilter(mStreamer.getGLRender(), isChecked ?
+                    CN_FILTER_BEAUTY_DENOISE.getFilter() :
+                    CN_FILTER_BEAUTY_DISABLE.getFilter());
+            mStreamer.setEnableImgBufBeauty(isChecked);
         } else {
-//                showChooseFilter();
             mBeautyChooseView.setVisibility(isChecked ? View.VISIBLE : View.INVISIBLE);
         }
     }
@@ -587,17 +856,21 @@ public class StreamActivity extends Activity {
     //显示水印
     private void showWaterMark() {
         if (!mIsLandscape) {
-            /**
-             * 设置并显示logo水印
-             *
-             * @param path  logo图片文件的路径
-             * @param x     logo的显示位置，0-1之间，相对于视频
-             * @param y     logo的显示位置，0-1之间，相对于视频
-             * @param w     logo的显示宽度，0-1之间，相对于视频，为0时会根据h及logo图片的比例自适应
-             * @param h     logo的显示高度，0-1之间，相对于视频，为0时会根据w及logo图片的比例自适应
-             * @param alpha logo的透明度，0-1之间
-             */
-            mStreamer.showWaterMarkLogo(mLogoPath, 0.08f, 0.04f, 0.20f, 0, 0.8f);
+            if (!mShowAnimatedLogo) {
+                /**
+                 * 设置并显示logo水印
+                 *
+                 * @param path  logo图片文件的路径
+                 * @param x     logo的显示位置，0-1之间，相对于视频
+                 * @param y     logo的显示位置，0-1之间，相对于视频
+                 * @param w     logo的显示宽度，0-1之间，相对于视频，为0时会根据h及logo图片的比例自适应
+                 * @param h     logo的显示高度，0-1之间，相对于视频，为0时会根据w及logo图片的比例自适应
+                 * @param alpha logo的透明度，0-1之间
+                 */
+                mStreamer.showWaterMarkLogo(mLogoPath, 0.08f, 0.04f, 0.20f, 0, 0.8f);
+            } else {
+                animatedImageCapture.showAnimatedWaterMard(mAnimatedLogoPath, 0.08f, 0.04f, 0.25f, 0, 0.8f);
+            }
             /**
              * 在推流视频中显示时间水印
@@ -610,15 +883,21 @@ public class StreamActivity extends Activity {
              */
             mStreamer.showWaterMarkTime(0.03f, 0.01f, 0.35f, Color.RED, 1.0f);
         } else {
-            mStreamer.showWaterMarkLogo(mLogoPath, 0.05f, 0.09f, 0, 0.08f, 0.8f);
+            if (!mShowAnimatedLogo) {
+                mStreamer.showWaterMarkLogo(mLogoPath, 0.05f, 0.09f, 0, 0.08f, 0.8f);
+            } else {
+                animatedImageCapture.showAnimatedWaterMard(mAnimatedLogoPath, 0.05f, 0.09f, 0, 0.25f, 0.8f);
+            }
             mStreamer.showWaterMarkTime(0.01f, 0.03f, 0.22f, Color.RED, 1.0f);
         }
+        mShowAnimatedLogo = !mShowAnimatedLogo;
     }
     //隐藏水印
     private void hideWaterMark() {
         mStreamer.hideWaterMarkLogo();
         mStreamer.hideWaterMarkTime();
+        animatedImageCapture.hideAnimatedWaterMark();
     }
     //摄像头权限检测
@@ -643,50 +922,6 @@ public class StreamActivity extends Activity {
         }
     }
-    //选择美颜滤镜
-    private void showChooseFilter() {
-        AlertDialog alertDialog;
-        alertDialog = new AlertDialog.Builder(this)
-                .setTitle("请选择美颜滤镜")
-                .setSingleChoiceItems(
-                        /**
-                         * BEAUTY_DISABLE	禁用美颜	无
-                         * DENOISE	        自然	美白（中）+磨皮（低）+红润（低）
-                         * SKIN_WHITEN	    白肤	美白（强）+磨皮（中）+红润（低）
-                         * BEAUTY_ILLUSION	柔肤	美白（中）+磨皮（中）+红润（低）
-                         * BEAUTY_SMOOTH	粉嫩	美白（中）+磨皮（强）+红润（中）
-                         * BEAUTY_SOFT	    嫩肤	美白（中）+磨皮（中）+红润（强）
-                         */
-                        new String[]{"BEAUTY_SOFT", "SKIN_WHITEN", "BEAUTY_ILLUSION", "DENOISE",
-                                "BEAUTY_SMOOTH"}, -1,
-                        new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int which) {
-                                switch (which) {
-                                    case 0:
-                                        mStreamer.getImgTexFilterMgt().setFilter(mStreamer.getGLRender(), BEAUTY_SOFT.getFilter());
-                                        break;
-                                    case 1:
-                                        mStreamer.getImgTexFilterMgt().setFilter(mStreamer.getGLRender(), SKIN_WHITEN.getFilter());
-                                        break;
-                                    case 2:
-                                        mStreamer.getImgTexFilterMgt().setFilter(mStreamer.getGLRender(), BEAUTY_ILLUSION.getFilter());
-                                        break;
-                                    case 3:
-                                        mStreamer.getImgTexFilterMgt().setFilter(mStreamer.getGLRender(), DENOISE.getFilter());
-                                        break;
-                                    case 4:
-                                        mStreamer.getImgTexFilterMgt().setFilter(mStreamer.getGLRender(), BEAUTY_SMOOTH.getFilter());
-                                        break;
-                                }
-                                dialog.dismiss();
-                            }
-                        })
-                .create();
-        alertDialog.setCancelable(false);
-        alertDialog.show();
-    }
-
     private IStreamer.OnInfoListener mOnInfoListener = new IStreamer.OnInfoListener() {
         @Override
         public void onInfo(int what, int msg1, int msg2) {
@@ -894,4 +1129,33 @@ public class StreamActivity extends Activity {
             return "";
         }
     };
+
+    private VerticalSeekBar.OnSeekBarChangeListener verticalSeekBarlistener = new VerticalSeekBar.OnSeekBarChangeListener() {
+        @Override
+        public void onProgressChanged(VerticalSeekBar seekBar, int progress, boolean fromUser) {
+            Camera.Parameters parameters = mStreamer.getCameraCapture().getCameraParameters();
+            if (parameters != null) {
+                int minValue = parameters.getMinExposureCompensation();
+                int maxValue = parameters.getMaxExposureCompensation();
+                int range = 100 / (maxValue - minValue);
+                parameters.setExposureCompensation(progress / range - maxValue);
+            }
+            mStreamer.getCameraCapture().setCameraParameters(parameters);
+        }
+
+        @Override
+        public void onStartTrackingTouch(VerticalSeekBar seekBar) {
+
+        }
+
+        @Override
+        public void onStopTrackingTouch(VerticalSeekBar seekBar) {
+
+        }
+
+        @Override
+        public void onRequestDisallowInterceptTouchEvent(boolean enable) {
+
+        }
+    };
 }
+package com.cnlive.demo.stream;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.GradientDrawable;
+import android.util.AttributeSet;
+import android.view.Gravity;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.TextView;
+
+/**
+ * 自定义竖直SeekBar.
+ */
+
+public class VerticalSeekBar extends FrameLayout {
+    public VerticalSeekBar(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        initialize(context);
+    }
+
+    public VerticalSeekBar(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        initialize(context);
+    }
+
+    public VerticalSeekBar(Context context) {
+        super(context);
+        initialize(context);
+    }
+
+    private View mProgressBg;
+    private View mSecondaryProgressBg;
+    private View mBg;
+    private FrameLayout mSlider;
+    private int mProgress = 50;
+    private int mSecondaryProgress = 50;
+    private int mMax = 100;
+    private boolean mTrackingTouch = false;
+    private OnSeekBarChangeListener mOnSeekBarChangeListener;
+    private int mBGSize = 6;          //进度条大小
+    private int mBGRadius = 20;     //进度条圆角
+    private int mCircleSize = 50;       //圆的大小
+    private TextView mTextView;   //字
+
+
+    public interface OnSeekBarChangeListener {
+        void onProgressChanged(VerticalSeekBar seekBar, int progress, boolean fromUser);
+
+        void onStartTrackingTouch(VerticalSeekBar seekBar);
+
+        void onStopTrackingTouch(VerticalSeekBar seekBar);
+
+        void onRequestDisallowInterceptTouchEvent(boolean enable);
+    }
+
+    private void initialize(Context context) {
+        LayoutParams params = new LayoutParams(mBGSize, LayoutParams.MATCH_PARENT);
+        params.gravity = Gravity.CENTER_HORIZONTAL;
+        mBg = new View(context);
+        addView(mBg, params);
+
+        GradientDrawable drawable = new GradientDrawable();
+        drawable.setColor(0xffbcbab8);
+        drawable.setCornerRadius(mBGRadius);
+        mBg.setBackgroundDrawable(drawable);
+
+        params = new LayoutParams(mBGSize, 0);
+        params.gravity = Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM;
+        mSecondaryProgressBg = new View(context);
+        addView(mSecondaryProgressBg, params);
+
+        drawable = new GradientDrawable();
+        drawable.setColor(0xffff5959);
+        drawable.setCornerRadius(mBGRadius);
+        mSecondaryProgressBg.setBackgroundDrawable(drawable);
+
+        params = new LayoutParams(mBGSize, 0);
+        params.gravity = Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM;
+        mProgressBg = new View(context);
+        addView(mProgressBg, params);
+
+        drawable = new GradientDrawable();
+        drawable.setColor(0xffff5959);
+        drawable.setCornerRadius(mBGRadius);
+        mProgressBg.setBackgroundDrawable(drawable);
+
+        params = new LayoutParams(mCircleSize, mCircleSize);
+        params.gravity = Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM;
+        mSlider = new FrameLayout(context);
+        addView(mSlider, params);
+
+        drawable = new GradientDrawable();
+        drawable.setColor(0xffdddddd);
+        drawable.setShape(GradientDrawable.OVAL);
+
+        params = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
+        params.gravity = Gravity.CENTER;
+        mTextView = new TextView(context);
+        mTextView.setGravity(Gravity.CENTER);
+        mTextView.setTextSize(12);
+        mTextView.setIncludeFontPadding(false);
+        mTextView.setText("0");
+        mTextView.setTextColor(0xff666666);
+        //mSlider.addView(mTextView, params);
+
+        mSlider.setBackgroundDrawable(drawable);
+
+        setClickable(true);
+    }
+
+    public String getText() {
+        return mTextView.getText().toString();
+    }
+
+    public void setmText(String mText) {
+        mTextView.setText(mText);
+    }
+
+    public void setOnSeekBarChangeListener(OnSeekBarChangeListener l) {
+        mOnSeekBarChangeListener = l;
+    }
+
+    public void setThumb(Drawable d) {
+        mSlider.setBackgroundDrawable(d);
+    }
+
+    public void setThumbSize(int w, int h) {
+        LayoutParams params = (LayoutParams) mSlider.getLayoutParams();
+        params.width = w;
+        params.height = h;
+        mSlider.setLayoutParams(params);
+    }
+
+    public void setProgressSize(int size) {
+        LayoutParams params = (LayoutParams) mProgressBg.getLayoutParams();
+        params.width = size;
+        mProgressBg.setLayoutParams(params);
+
+        params = (LayoutParams) mSecondaryProgressBg.getLayoutParams();
+        params.width = size;
+        mSecondaryProgressBg.setLayoutParams(params);
+
+        params = (LayoutParams) mBg.getLayoutParams();
+        params.width = size;
+        mBg.setLayoutParams(params);
+    }
+
+    public void setProgressBackground(Drawable drawable) {
+        mBg.setBackgroundDrawable(drawable);
+    }
+
+    public void setProgressDrawable(Drawable drawable) {
+        mProgressBg.setBackgroundDrawable(drawable);
+    }
+
+    public void setSecondaryProgressDrawable(Drawable drawable) {
+        mSecondaryProgressBg.setBackgroundDrawable(drawable);
+    }
+
+    public void setMax(int max) {
+        mMax = max;
+    }
+
+    public void setProgress(int progress) {
+        setProgress(progress, false);
+    }
+
+    public int getProgress() {
+        return mProgress;
+    }
+
+    private void setProgress(int progress, boolean fromUser) {
+        if (progress < 0)
+            progress = 0;
+        if (progress > mMax)
+            progress = mMax;
+
+        if (mProgress != progress) {
+            mProgress = progress;
+            updateProgress(fromUser);
+        }
+        mTextView.setText(progress + "");
+    }
+
+    private void updateProgress(boolean fromUser) {
+        int paddingTop = getPaddingTop();
+        int paddingBottom = getPaddingBottom();
+        int h = getHeight() - paddingTop - paddingBottom;
+        if (h > 0) {
+            LayoutParams params = (LayoutParams) mProgressBg.getLayoutParams();
+            params.height = h * mProgress / mMax;
+            mProgressBg.setLayoutParams(params);
+
+            params = (LayoutParams) mSlider.getLayoutParams();
+            params.bottomMargin = (h - params.height) * mProgress / mMax;
+            mSlider.setLayoutParams(params);
+        }
+        if (mOnSeekBarChangeListener != null) {
+            mOnSeekBarChangeListener.onProgressChanged(this, mProgress, fromUser);
+        }
+    }
+
+    public void setSecondaryProgress(int progress) {
+        if (progress < 0)
+            progress = 0;
+        if (progress > mMax)
+            progress = mMax;
+
+        mSecondaryProgress = progress;
+        updateSecondaryProgress();
+    }
+
+    private void updateSecondaryProgress() {
+        int paddingTop = getPaddingTop();
+        int paddingBottom = getPaddingBottom();
+        int h = getHeight() - paddingTop - paddingBottom;
+        if (h > 0) {
+            LayoutParams params = (LayoutParams) mSecondaryProgressBg.getLayoutParams();
+            params.height = h * mSecondaryProgress / mMax;
+            mSecondaryProgressBg.setLayoutParams(params);
+        }
+    }
+
+
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        int action = ev.getAction();
+        int y = (int) ev.getY();
+        int paddingTop = getPaddingTop();
+        int paddingBottom = getPaddingBottom();
+        int h = getHeight() - paddingTop - paddingBottom;
+        if (y < paddingTop) {
+            y = paddingTop;
+        }
+        if (y > h + paddingTop) {
+            y = h + paddingTop;
+        }
+        y -= paddingTop;
+        if (action == MotionEvent.ACTION_DOWN) {
+            if (mOnSeekBarChangeListener != null) {
+                mOnSeekBarChangeListener.onRequestDisallowInterceptTouchEvent(true);
+            }
+            int progress = mMax * (h - y) / h;
+            if (progress != mProgress) {
+                if (mTrackingTouch == false) {
+                    mTrackingTouch = true;
+                    if (mOnSeekBarChangeListener != null) {
+                        mOnSeekBarChangeListener.onStartTrackingTouch(this);
+                    }
+                }
+                setProgress(progress, true);
+            }
+        } else if (action == MotionEvent.ACTION_MOVE) {
+            int progress = mMax * (h - y) / h;
+            if (progress != mProgress) {
+                if (mTrackingTouch == false) {
+                    mTrackingTouch = true;
+                    if (mOnSeekBarChangeListener != null) {
+                        mOnSeekBarChangeListener.onStartTrackingTouch(this);
+                    }
+                }
+                setProgress(progress, true);
+            }
+        } else if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) {
+            if (mOnSeekBarChangeListener != null) {
+                mOnSeekBarChangeListener.onRequestDisallowInterceptTouchEvent(false);
+            }
+            mTrackingTouch = false;
+            if (mOnSeekBarChangeListener != null) {
+                mOnSeekBarChangeListener.onStopTrackingTouch(this);
+            }
+        }
+        return super.dispatchTouchEvent(ev);
+    }
+
+    @Override
+    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+        updateProgress(false);
+        //updateSecondaryProgress();
+        super.onSizeChanged(w, h, oldw, oldh);
+    }
+
+}
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate android:fromYDelta="100%" android:toYDelta="0%"
+               android:duration="300" android:startOffset="0" />
+</set>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate android:fromYDelta="-100%" android:toYDelta="0%"
+               android:duration="300" android:startOffset="0" />
+</set>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<set
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate android:duration="300" android:fromXDelta="-100.0%p" android:toXDelta="0.0" />
+</set>
+<?xml version="1.0" encoding="utf-8"?>
+<set
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate android:duration="300" android:fromXDelta="0.0" android:toXDelta="-100.0%p" />
+</set>
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate android:fromYDelta="0%" android:toYDelta="100%"
+               android:duration="300" android:startOffset="0" />
+</set>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate android:fromYDelta="0%" android:toYDelta="-100%"
+               android:duration="300" android:startOffset="0" />
+</set>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<set
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate android:duration="300" android:fromXDelta="100.0%p" android:toXDelta="0.0" />
+</set>
+<?xml version="1.0" encoding="utf-8"?>
+<set
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate android:duration="300" android:fromXDelta="0.0" android:toXDelta="100.0%p" />
+</set>
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="300"
+        android:fromYDelta="0%"
+        android:startOffset="0"
+        android:toYDelta="0%" />
+</set>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#00000000"
+    tools:context="com.cnlive.demo.stream.FloatActivity">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:background="@color/colorAccent">
+
+        <ImageView
+            android:id="@+id/float_back"
+            android:layout_width="25dp"
+            android:layout_height="25dp"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentTop="true"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="10dp"
+            android:scaleType="centerCrop"
+            android:src="@drawable/float_back" />
+
+    </LinearLayout>
+</RelativeLayout>
@@ -19,6 +19,18 @@
         android:layout_alignParentBottom="true"
         android:layout_alignParentTop="true" />
+    <com.cnlive.demo.stream.VerticalSeekBar
+        android:id="@+id/exposure_seekBar"
+        android:layout_width="wrap_content"
+        android:layout_height="200dp"
+        android:layout_alignParentRight="true"
+        android:layout_marginRight="20dp"
+        android:layout_marginTop="100dp"
+        android:progressBackgroundTint="#9b9b9b"
+        android:progressTint="@color/colorAccent"
+        android:thumbTint="#C0303030"
+        android:visibility="gone" />
+
     <include
         android:id="@+id/actionbar"
         layout="@layout/titlebar"
@@ -21,6 +21,56 @@
             android:layout_marginBottom="10dp"
             android:orientation="horizontal">
+            <Button
+                android:id="@+id/audio_mix"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_weight="1"
+                android:background="#11123456"
+                android:text="音频滤镜"
+                android:textColor="@android:color/white"
+                android:textSize="14sp" />
+
+            <Button
+                android:id="@+id/bgm_filter"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_weight="1"
+                android:background="#11123456"
+                android:text="bgm升降调"
+                android:textColor="@android:color/white" />
+
+            <Button
+                android:id="@+id/click_to_capture_screenshot"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_weight="1"
+                android:background="#11123456"
+                android:text="截屏"
+                android:textColor="@android:color/white" />
+
+            <CheckBox
+                android:id="@+id/bg_img"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginLeft="10dp"
+                android:layout_weight="1"
+                android:background="#11123456"
+                android:text="背景图推流"
+                android:textColor="@android:color/white"
+                android:textSize="14sp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:orientation="horizontal">
+
             <CheckBox
                 android:id="@+id/watermark"
                 android:layout_width="0dp"
@@ -126,7 +176,7 @@
                 android:layout_weight="1"
                 android:background="#11123456"
                 android:checked="true"
-                android:text="美颜"
+                android:text="美颜滤镜"
                 android:textColor="@android:color/white"
                 android:textSize="14sp"></CheckBox>
+<?xml version="1.0" encoding="utf-8"?>
+<com.cnlive.demo.stream.FloatView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+
+</com.cnlive.demo.stream.FloatView>
 \ No newline at end of file
@@ -17,36 +17,56 @@
         android:textSize="19sp" />
     <ImageView
+        android:id="@+id/add"
+        android:layout_width="22dp"
+        android:layout_height="22dp"
+        android:layout_gravity="center_vertical"
+        android:layout_marginRight="10dp"
+        android:layout_marginTop="8dp"
+        android:layout_toLeftOf="@+id/exposure"
+        android:background="@drawable/float_view" />
+
+    <ImageView
+        android:id="@+id/exposure"
+        android:layout_width="22dp"
+        android:layout_height="22dp"
+        android:layout_gravity="center_vertical"
+        android:layout_marginRight="10dp"
+        android:layout_marginTop="8dp"
+        android:layout_toLeftOf="@+id/flash"
+        android:background="@drawable/exposure" />
+
+    <ImageView
         android:id="@+id/flash"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="22dp"
+        android:layout_height="22dp"
         android:layout_gravity="center_vertical"
         android:layout_marginRight="12dp"
         android:layout_marginTop="8dp"
         android:layout_toLeftOf="@+id/switch_cam"
-        android:background="@drawable/icon_record_flash_off"></ImageView>
+        android:background="@drawable/flash"></ImageView>
     <ImageView
         android:id="@+id/switch_cam"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="22dp"
+        android:layout_height="22dp"
         android:layout_alignParentTop="true"
         android:layout_gravity="center_vertical"
         android:layout_marginRight="12dp"
         android:layout_marginTop="8dp"
         android:layout_toLeftOf="@+id/backoff"
-        android:background="@drawable/icon_record_flip_off" />
+        android:background="@drawable/switch_camera" />
     <ImageView
         android:id="@+id/backoff"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="22dp"
+        android:layout_height="22dp"
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_alignParentTop="true"
         android:layout_gravity="center_vertical"
         android:layout_marginRight="2dp"
         android:layout_marginTop="8dp"
-        android:background="@drawable/icon_record_close_off" />
+        android:background="@drawable/close" />
 </RelativeLayout>
 \ No newline at end of file
+#extension GL_OES_EGL_image_external : require
+precision mediump float;
+uniform samplerExternalOES texture;
+varying vec2 v_TexCoordinate;
+
+void main () {
+    vec4 color = texture2D(texture, v_TexCoordinate);
+    gl_FragColor = color;
+}
 \ No newline at end of file
+test: test
+admin: OBF:1u2a1toa1w8v1tok1u30,admin
+attribute vec4 vPosition;
+attribute vec4 vTexCoordinate;
+uniform mat4 textureTransform;
+varying vec2 v_TexCoordinate;
+
+void main () {
+    v_TexCoordinate = (textureTransform * vTexCoordinate).xy;
+    gl_Position = vPosition;
+}
 \ No newline at end of file
@@ -8,4 +8,28 @@
         <item name="colorAccent">@color/colorAccent</item>
     </style>
+    <style name="DefaultAnimation" parent="@android:style/Animation.Activity">
+        <item name="android:activityOpenEnterAnimation">@anim/slide_right_in</item>
+        <item name="android:activityOpenExitAnimation">@anim/slide_left_out</item>
+        <item name="android:activityCloseEnterAnimation">@anim/slide_left_in</item>
+        <item name="android:activityCloseExitAnimation">@anim/slide_right_out</item>
+    </style>
+
+
+    <style name="Theme.NoTitleBar" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowAnimationStyle">@style/DefaultAnimation</item>
+    </style>
+
+    <style name="RiseAnimation" parent="@android:style/Animation.Activity">
+        <item name="android:activityOpenEnterAnimation">@anim/slide_in_bottom</item>
+        <item name="android:activityOpenExitAnimation">@anim/slide_stand</item>
+        <item name="android:activityCloseEnterAnimation">@anim/slide_left_in</item>
+        <item name="android:activityCloseExitAnimation">@anim/slide_right_out</item>
+    </style>
+
+    <style name="Theme.RiseAnimation" parent="@style/Theme.NoTitleBar">
+        <item name="android:windowAnimationStyle">@style/RiseAnimation</item>
+    </style>
+
 </resources>