diff --git a/LiveDemo/.gitignore b/KSYLiveDemo/.gitignore
similarity index 82%
rename from LiveDemo/.gitignore
rename to KSYLiveDemo/.gitignore
index c6cbe56..39fb081 100644
--- a/LiveDemo/.gitignore
+++ b/KSYLiveDemo/.gitignore
@@ -6,3 +6,4 @@
 .DS_Store
 /build
 /captures
+.externalNativeBuild
diff --git a/LiveDemo/.idea/compiler.xml b/KSYLiveDemo/.idea/compiler.xml
similarity index 100%
rename from LiveDemo/.idea/compiler.xml
rename to KSYLiveDemo/.idea/compiler.xml
diff --git a/LiveDemo/.idea/copyright/profiles_settings.xml b/KSYLiveDemo/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from LiveDemo/.idea/copyright/profiles_settings.xml
rename to KSYLiveDemo/.idea/copyright/profiles_settings.xml
diff --git a/LiveDemo/.idea/encodings.xml b/KSYLiveDemo/.idea/encodings.xml
similarity index 100%
rename from LiveDemo/.idea/encodings.xml
rename to KSYLiveDemo/.idea/encodings.xml
diff --git a/LiveDemo/.idea/gradle.xml b/KSYLiveDemo/.idea/gradle.xml
similarity index 75%
rename from LiveDemo/.idea/gradle.xml
rename to KSYLiveDemo/.idea/gradle.xml
index 508b3d9..2d66085 100644
--- a/LiveDemo/.idea/gradle.xml
+++ b/KSYLiveDemo/.idea/gradle.xml
@@ -9,14 +9,10 @@
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
+            <option value="$PROJECT_DIR$/libksylive" />
           </set>
         </option>
-        <option name="myModules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-          </set>
-        </option>
+        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/LiveDemo/.idea/misc.xml b/KSYLiveDemo/.idea/misc.xml
similarity index 84%
rename from LiveDemo/.idea/misc.xml
rename to KSYLiveDemo/.idea/misc.xml
index 5d19981..7158618 100644
--- a/LiveDemo/.idea/misc.xml
+++ b/KSYLiveDemo/.idea/misc.xml
@@ -43,4 +43,20 @@
   <component name="ProjectType">
     <option name="id" value="Android" />
   </component>
+  <component name="masterDetails">
+    <states>
+      <state key="ProjectJDKs.UI">
+        <settings>
+          <last-edited>1.8</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+    </states>
+  </component>
 </project>
\ No newline at end of file
diff --git a/LiveDemo/.idea/modules.xml b/KSYLiveDemo/.idea/modules.xml
similarity index 52%
rename from LiveDemo/.idea/modules.xml
rename to KSYLiveDemo/.idea/modules.xml
index fc24b25..47a38b5 100644
--- a/LiveDemo/.idea/modules.xml
+++ b/KSYLiveDemo/.idea/modules.xml
@@ -2,8 +2,9 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/LiveDemo.iml" filepath="$PROJECT_DIR$/LiveDemo.iml" />
+      <module fileurl="file://$PROJECT_DIR$/KSYLiveDemo.iml" filepath="$PROJECT_DIR$/KSYLiveDemo.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/libksylive/libksylive.iml" filepath="$PROJECT_DIR$/libksylive/libksylive.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/LiveDemo/.idea/runConfigurations.xml b/KSYLiveDemo/.idea/runConfigurations.xml
similarity index 100%
rename from LiveDemo/.idea/runConfigurations.xml
rename to KSYLiveDemo/.idea/runConfigurations.xml
diff --git a/LiveDemo/app/.gitignore b/KSYLiveDemo/app/.gitignore
similarity index 100%
rename from LiveDemo/app/.gitignore
rename to KSYLiveDemo/app/.gitignore
diff --git a/LiveDemo/app/build.gradle b/KSYLiveDemo/app/build.gradle
similarity index 64%
rename from LiveDemo/app/build.gradle
rename to KSYLiveDemo/app/build.gradle
index d444681..8e46482 100644
--- a/LiveDemo/app/build.gradle
+++ b/KSYLiveDemo/app/build.gradle
@@ -2,36 +2,27 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 24
-    buildToolsVersion "24.0.0"
-
+    buildToolsVersion "24.0.1"
     defaultConfig {
         applicationId "com.ksyun.live.demo"
-        minSdkVersion 16
+        minSdkVersion 15
         targetSdkVersion 24
         versionCode 1
         versionName "1.0"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
-
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-
-    sourceSets{
-        main{
-            jniLibs.srcDir 'libs'
-        }
-    }
 }
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:24.1.1'
+    compile 'com.android.support:appcompat-v7:24.2.1'
     compile 'com.android.support:design:24.1.1'
+    compile project(':libksylive')
     compile files('libs/zxing.jar')
-    compile files('libs/bugly_crash_release.jar')
-    compile project(':livelib')
 }
diff --git a/LiveDemo/app/libs/zxing.jar b/KSYLiveDemo/app/libs/zxing.jar
similarity index 100%
rename from LiveDemo/app/libs/zxing.jar
rename to KSYLiveDemo/app/libs/zxing.jar
diff --git a/LiveDemo/livelib/proguard-rules.pro b/KSYLiveDemo/app/proguard-rules.pro
similarity index 88%
rename from LiveDemo/livelib/proguard-rules.pro
rename to KSYLiveDemo/app/proguard-rules.pro
index 7718b1c..f6159eb 100644
--- a/LiveDemo/livelib/proguard-rules.pro
+++ b/KSYLiveDemo/app/proguard-rules.pro
@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # By default, the flags in this file are appended to flags specified
-# in /Users/liubohua/Library/Android/sdk/tools/proguard/proguard-android.txt
+# in /Users/le/Library/Android/sdk/tools/proguard/proguard-android.txt
 # You can edit the include path and order by changing the proguardFiles
 # directive in build.gradle.
 #
diff --git a/LiveDemo/app/src/main/AndroidManifest.xml b/KSYLiveDemo/app/src/main/AndroidManifest.xml
similarity index 63%
rename from LiveDemo/app/src/main/AndroidManifest.xml
rename to KSYLiveDemo/app/src/main/AndroidManifest.xml
index 13c9be3..fa770ee 100644
--- a/LiveDemo/app/src/main/AndroidManifest.xml
+++ b/KSYLiveDemo/app/src/main/AndroidManifest.xml
@@ -1,17 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.ksyun.live.demo">
-
-
-
-    <uses-feature android:glEsVersion="0x00020000" android:required="true" />
-    <supports-gl-texture android:name="GL_OES_compressed_ETC1_RGB8_texture" />
-    <supports-gl-texture android:name="GL_OES_compressed_paletted_texture" />
-
+          package="com.ksyun.live.demo"
+          android:installLocation="preferExternal">
 
     <!-- 往sdcard中写入数据的权限 -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission-sdk-23 android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <!-- 在sdcard中创建/删除文件的权限 -->
     <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
     <!-- 使用权限 -->
@@ -33,13 +28,13 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.FLASHLIGHT" />
 
-
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
+
         <activity android:name="com.ksyun.live.demo.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -47,52 +42,47 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
         <activity
-            android:name="com.ksyun.live.demo.StreamActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:launchMode="singleTop" />
-        <activity
-            android:name="com.ksyun.live.demo.CameraActivityAudioEffect"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:launchMode="singleTop" />
-        <activity
-            android:name="com.ksyun.live.demo.CameraActivityPip"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:launchMode="singleTop" />
-        <activity
-            android:name="com.ksyun.live.demo.CameraActivityOther"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:launchMode="singleTop" />
-        <activity
-            android:name="com.ksyun.live.demo.CameraActivityWaterLogo"
+            android:name="com.ksyun.live.demo.player.activity.TextureVideoActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:launchMode="singleTop" />
-        <activity
-            android:name="com.ksyun.live.demo.CameraActivityAudioMix"
+
+        <activity android:name="com.ksyun.live.demo.player.activity.TextureViewMediaActivity"
+            android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
             android:configChanges="orientation|keyboardHidden|screenSize"
-            android:launchMode="singleTop" />
+            />
         <activity
-            android:name="com.ksyun.live.demo.CameraActivityBeauty"
+            android:name="com.ksyun.live.demo.player.activity.SurfaceActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:launchMode="singleTop" />
 
-
-        <activity android:name=".activity.PlayerActivity"></activity>
-
-        <activity android:name=".activity.NetMediaActivty" />
-        <activity android:name=".activity.VideoPlayerActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            />
-        <activity android:name=".activity.SettingActivity"></activity>
+        <activity android:name=".player.activity.PlayerActivity" ></activity>
+        <activity android:name="com.ksyun.live.demo.player.activity.NetMediaActivty" ></activity>
+        <activity android:name="com.ksyun.live.demo.player.activity.SettingActivity"></activity>
         <activity
             android:configChanges="orientation|keyboardHidden"
-            android:name=".activity.CaptureActivity"
+            android:name="com.ksyun.live.demo.player.activity.CaptureActivity"
             android:screenOrientation="portrait"
             android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
             android:windowSoftInputMode="stateAlwaysHidden" >
         </activity>
-        <activity android:name=".activity.HistoryActivity"></activity>
+        <activity android:name="com.ksyun.live.demo.player.activity.HistoryActivity"></activity>
+
+        <activity
+            android:name="com.ksyun.media.streamer.demo.DemoActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.RiseAnimation">
+        </activity>
+        <activity
+            android:name="com.ksyun.media.streamer.demo.CameraActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:launchMode="singleTop"
+            android:theme="@style/Theme.RiseAnimation">
+        </activity>
 
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/MainActivity.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/MainActivity.java
similarity index 80%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/MainActivity.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/MainActivity.java
index f9ccbea..be9b132 100644
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/MainActivity.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/MainActivity.java
@@ -6,8 +6,8 @@
 import android.view.View;
 import android.widget.Button;
 
-import com.ksyun.live.demo.activity.PlayerActivity;
-import com.tencent.bugly.crashreport.CrashReport;
+import com.ksyun.live.demo.player.activity.PlayerActivity;
+import com.ksyun.media.streamer.demo.DemoActivity;
 
 
 public class MainActivity extends AppCompatActivity {
@@ -20,14 +20,13 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        CrashReport.initCrashReport(getApplicationContext(), "900040861", true);
         btn_player = (Button)findViewById(R.id.btn_player);
         btn_stream = (Button)findViewById(R.id.btn_stream);
 
         btn_stream.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                Intent intent = new Intent(MainActivity.this,StreamActivity.class);
+                Intent intent = new Intent(MainActivity.this,DemoActivity.class);
                 startActivity(intent);
             }
         });
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/activity/CaptureActivity.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/CaptureActivity.java
similarity index 94%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/activity/CaptureActivity.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/CaptureActivity.java
index a645b85..8a9c5b1 100644
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/activity/CaptureActivity.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/CaptureActivity.java
@@ -1,4 +1,4 @@
-package com.ksyun.live.demo.activity;
+package com.ksyun.live.demo.player.activity;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -21,16 +21,16 @@
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.Result;
 import com.ksyun.live.demo.R;
-import com.ksyun.live.demo.zxing.camera.CameraManager;
-import com.ksyun.live.demo.zxing.decoding.CaptureActivityHandler;
-import com.ksyun.live.demo.zxing.decoding.InactivityTimer;
-import com.ksyun.live.demo.zxing.view.ViewfinderView;
-
+import com.ksyun.live.demo.player.zxing.camera.CameraManager;
+import com.ksyun.live.demo.player.zxing.decoding.CaptureActivityHandler;
+import com.ksyun.live.demo.player.zxing.decoding.InactivityTimer;
+import com.ksyun.live.demo.player.zxing.view.ViewfinderView;
 
 import java.io.IOException;
 import java.util.Vector;
 
 
+
 /**
  * Initial the camera
  * @author Ryan.Tang
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/activity/HistoryActivity.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/HistoryActivity.java
similarity index 50%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/activity/HistoryActivity.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/HistoryActivity.java
index d678688..9beb3fb 100644
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/activity/HistoryActivity.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/HistoryActivity.java
@@ -1,4 +1,4 @@
-package com.ksyun.live.demo.activity;
+package com.ksyun.live.demo.player.activity;
 
 import android.app.Activity;
 import android.content.Context;
@@ -8,37 +8,31 @@
 import android.os.Bundle;
 import android.view.View;
 import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
 import android.widget.ListView;
-import android.widget.SimpleAdapter;
 
 import com.ksyun.live.demo.R;
-import com.ksyun.live.demo.model.NetDbAdapter;
-import com.ksyun.live.demo.util.Settings;
+import com.ksyun.live.demo.player.model.NetDbAdapter;
+import com.ksyun.live.demo.player.util.Settings;
 
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * Created by liubohua on 16/7/20.
  */
 public class HistoryActivity extends Activity{
     private ListView hislist;
-    private ArrayList<Map<String,String>> listurl;
+    private ArrayList<String> listurl;
     private Cursor cursor;
     private NetDbAdapter NetDb;
 
     private SharedPreferences settings;
-    private String choosevr;
-
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_history);
-        listurl = new ArrayList<Map<String,String>>();
-        settings = getSharedPreferences("SETTINGS", Context.MODE_PRIVATE);
-        choosevr = settings.getString("choose_vr","信息为空");
+        listurl = new ArrayList<String>();
 
         hislist = (ListView) findViewById(R.id.list_history);
         NetDb = new NetDbAdapter(HistoryActivity.this);
@@ -46,26 +40,39 @@ protected void onCreate(Bundle savedInstanceState) {
         cursor = NetDb.getAllData();
         cursor.moveToFirst();
         if(cursor.getCount()>0){
-            Map<String,String> map = new HashMap<String,String>();
-            map.put("url", cursor.getString(cursor.getColumnIndex(NetDbAdapter.KEY_PATH)));
-            listurl.add(map);
+            listurl.add( cursor.getString(cursor.getColumnIndex(NetDbAdapter.KEY_PATH)));
         }
         while(cursor.moveToNext()){
-            Map<String,String> map = new HashMap<String,String>();
-            map.put("url", cursor.getString(cursor.getColumnIndex(NetDbAdapter.KEY_PATH)));
-            listurl.add(map);
+            listurl.add( cursor.getString(cursor.getColumnIndex(NetDbAdapter.KEY_PATH)));
         }
-        SimpleAdapter adapter = new SimpleAdapter(this,listurl,R.layout.list_history,new String[]{"url"},new int[]{R.id.list_history_txt});
 
+        ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,android.R.layout.simple_expandable_list_item_1,listurl);
         hislist.setAdapter(adapter);
         hislist.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
-                String path = listurl.get(i).get("url");
-                    Intent intent = new Intent(HistoryActivity.this,VideoPlayerActivity.class);
+                String path = listurl.get(i);
+
+                String chooseview;
+                settings = getSharedPreferences("SETTINGS", Context.MODE_PRIVATE);
+                chooseview = settings.getString("choose_view","undefind");
+
+                if(chooseview.equals(Settings.USEKSYTEXTURE)){
+                    Intent intent = new Intent(HistoryActivity.this,TextureVideoActivity.class);
                     intent.putExtra("path",path);
                     startActivity(intent);
 
+                }
+                else if (chooseview.equals(Settings.USEKGLRENDER)){
+                    Intent intent = new Intent(HistoryActivity.this,TextureViewMediaActivity.class);
+                    intent.putExtra("path",path);
+                    startActivity(intent);
+                }
+                else{
+                    Intent intent = new Intent(HistoryActivity.this,SurfaceActivity.class);
+                    intent.putExtra("path",path);
+                    startActivity(intent);
+                }
             }
         });
 
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/activity/JieVideoListViewAdapter.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/JieVideoListViewAdapter.java
similarity index 89%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/activity/JieVideoListViewAdapter.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/JieVideoListViewAdapter.java
index 781d4da..ce187d0 100644
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/activity/JieVideoListViewAdapter.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/JieVideoListViewAdapter.java
@@ -1,7 +1,6 @@
-package com.ksyun.live.demo.activity;
+package com.ksyun.live.demo.player.activity;
 
 import android.content.Context;
-import android.provider.MediaStore;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -9,14 +8,13 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.ksyun.live.demo.player.model.MyVideoThumbLoader;
 import com.ksyun.live.demo.R;
-import com.ksyun.live.demo.model.MyVideoThumbLoader;
-import com.ksyun.live.demo.util.Video;
+import com.ksyun.live.demo.player.util.Video;
 
 import java.util.ArrayList;
 import java.util.List;
 
-
 /**
  * Created by liubohua on 16/7/12.
  */
@@ -26,7 +24,6 @@ public class JieVideoListViewAdapter extends BaseAdapter {
     private LayoutInflater mLayoutInflater;
     private MyVideoThumbLoader mVideoThumbLoader;
 
-
     public JieVideoListViewAdapter(Context context, List<Video> listVideos){
         mLayoutInflater = LayoutInflater.from(context);
         this.listVideos.addAll(listVideos);
@@ -65,7 +62,7 @@ public View getView(int i, View view, ViewGroup viewGroup) {
         }
         String path = listVideos.get(i).getPath();
         holder.img.setTag(path);
-        mVideoThumbLoader.showThumbByAsynctack(path, holder.img);
+        mVideoThumbLoader.showThumbByAsyncTask(path, holder.img);
 
         holder.title.setText(listVideos.get(i).getTitle());
         holder.path.setText(listVideos.get(i).getPath());
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/activity/LocalFragment.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/LocalFragment.java
similarity index 72%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/activity/LocalFragment.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/LocalFragment.java
index ae22452..e589182 100644
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/activity/LocalFragment.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/LocalFragment.java
@@ -1,12 +1,12 @@
-package com.ksyun.live.demo.activity;
+package com.ksyun.live.demo.player.activity;
 
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
 import android.os.Message;
 import android.support.v4.widget.SwipeRefreshLayout;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -15,29 +15,24 @@
 import android.widget.Toast;
 
 import com.ksyun.live.demo.R;
-import com.ksyun.live.demo.model.GetList;
-import com.ksyun.live.demo.util.Video;
+import com.ksyun.live.demo.player.model.GetList;
+import com.ksyun.live.demo.player.util.Settings;
+import com.ksyun.live.demo.player.util.Video;
 
 import java.util.ArrayList;
 
 
-public class LocalFragment extends android.app.Fragment implements SwipeRefreshLayout.OnRefreshListener{
+public class LocalFragment extends android.app.Fragment implements SwipeRefreshLayout.OnRefreshListener {
 
     private static final int UPDATE = 1;
-
     private ListView listView;
     private JieVideoListViewAdapter madapter;
-    private ArrayList<Video> listVideos;
-
     private ArrayList<Video> showlistVideos;
     private SwipeRefreshLayout swipeLayout;
     public static Handler mHandler;
     private GetList getList;
     private boolean updateok = false;
-
-
-
-
+    private SharedPreferences settings;
 
     public LocalFragment() {
         // Required empty public constructor
@@ -46,11 +41,7 @@ public LocalFragment() {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-    }
 
-    @Override
-    public void onResume() {
-        super.onResume();
     }
 
     @Override
@@ -59,7 +50,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 
         showlistVideos = new ArrayList<Video>();
         getList = new GetList();
-
         mHandler = new Handler(){
             @Override
             public void handleMessage(Message msg) {
@@ -67,7 +57,7 @@ public void handleMessage(Message msg) {
                 switch(msg.what){
                     case UPDATE:
                         if(updateok){
-                            updatelist();
+                            updateList();
                             swipeLayout.setRefreshing(false);
                             Toast.makeText(getActivity(), "更新成功", Toast.LENGTH_SHORT).show();
                         }else{
@@ -79,7 +69,7 @@ public void handleMessage(Message msg) {
                         if(msg.obj instanceof ArrayList) {
                             showlistVideos.clear();
                             showlistVideos.addAll((ArrayList<Video>)msg.obj);
-                            updatelist();
+                            updateList();
                         }
                         break;
                     case 3:
@@ -91,34 +81,48 @@ public void handleMessage(Message msg) {
                 }
             }
         };
+
         View view = inflater.inflate(R.layout.fragment_local, container, false);
-        swipeLayout = (SwipeRefreshLayout) view.findViewById(R.id.swipe_container);
 
+        swipeLayout = (SwipeRefreshLayout) view.findViewById(R.id.swipe_container);
         listView = (ListView)view.findViewById(R.id.list_local_frag);
-        madapter = new JieVideoListViewAdapter(getActivity(),showlistVideos);
         swipeLayout.setOnRefreshListener(this);
-        listView.setAdapter(madapter);
         listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 Video v = showlistVideos.get(position);
-                Log.e("adasdasd",v.getPath());
 
-                    Intent intent = new Intent(getActivity(),VideoPlayerActivity.class);
-                    intent.putExtra("path", v.getPath());
+                String chooseview;
+                chooseview = settings.getString("choose_view","undefind");
+               if(chooseview.equals(Settings.USEKSYTEXTURE)){
+                    Intent intent = new Intent(getActivity(),TextureVideoActivity.class);
+                    intent.putExtra("path",v.getPath());
                     startActivity(intent);
-
+               }
+               else if (chooseview.equals(Settings.USEKGLRENDER)){
+                   Intent intent = new Intent(getActivity(),TextureViewMediaActivity.class);
+                   intent.putExtra("path",v.getPath());
+                   startActivity(intent);
+               }
+               else{
+                    Intent intent = new Intent(getActivity(), SurfaceActivity.class);
+                    intent.putExtra("path",v.getPath());
+                    startActivity(intent);
+                }
             }
         });
-        getList.startThread(showlistVideos, Environment.getExternalStorageDirectory());
 
+        getList.startThread(showlistVideos, Environment.getExternalStorageDirectory());
         return view;
     }
-    public void updatelist(){
+    public void updateList(){
         madapter = new JieVideoListViewAdapter(getActivity(),showlistVideos);
         listView.setAdapter(madapter);
     }
 
+    public void setSettings( SharedPreferences set){
+        settings = set;
+    }
 
     @Override
     public void onRefresh() {
diff --git a/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/MediaController.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/MediaController.java
new file mode 100644
index 0000000..b5d15d0
--- /dev/null
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/MediaController.java
@@ -0,0 +1,603 @@
+package com.ksyun.live.demo.player.activity;
+
+import android.content.Context;
+import android.graphics.Rect;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Handler;
+import android.os.Message;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.ImageButton;
+import android.widget.PopupWindow;
+import android.widget.SeekBar;
+import android.widget.SeekBar.OnSeekBarChangeListener;
+import android.widget.TextView;
+
+import com.ksyun.live.demo.R;
+import com.ksyun.media.player.IMediaController;
+import java.lang.ref.WeakReference;
+import java.util.Formatter;
+import java.util.Locale;
+
+
+public class MediaController extends FrameLayout implements IMediaController {
+    private static final String TAG = "MediaController";
+
+    private IMediaController.MediaPlayerControl  mPlayer;
+    private Context             mContext;
+    private View                mAnchor;
+    private View                mRoot;
+    private PopupWindow         mWindow;
+    private SeekBar             mProgress;
+    private long                mSeekposition =0;
+    private TextView            mEndTime, mCurrentTime;
+    private boolean             mShowing;
+    private boolean             mDragging;
+    private static final int    sDefaultTimeout = 3000;
+    private static final int    FADE_OUT = 1;
+    private static final int    SHOW_PROGRESS = 2;
+    private boolean             mUseFastForward;
+    private boolean             mListenersSet;
+    private OnClickListener mNextListener, mPrevListener;
+    StringBuilder               mFormatBuilder;
+    Formatter                   mFormatter;
+    private ImageButton         mPauseButton;
+    private ImageButton         mFfwdButton;
+    private ImageButton         mRewButton;
+    private ImageButton         mNextButton;
+    private ImageButton         mPrevButton;
+
+    private Handler             mHandler = new MessageHandler(this);
+
+    public MediaController(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mRoot = null;
+        mContext = context;
+        mUseFastForward = true;
+        initFloatingWindow();
+        Log.i(TAG, TAG);
+    }
+
+    public MediaController(Context context, boolean useFastForward) {
+        super(context);
+        mContext = context;
+        mUseFastForward = useFastForward;
+        initFloatingWindow();
+        Log.i(TAG, TAG);
+    }
+
+    public MediaController(Context context) {
+        this(context, true);
+        Log.i(TAG, TAG);
+    }
+
+    @Override
+    public void onFinishInflate() {
+        if (mRoot != null)
+            initControllerView(mRoot);
+    }
+
+    public void setMediaPlayer(IMediaController.MediaPlayerControl player) {
+        mPlayer = player;
+        updatePausePlay();
+    }
+
+    private void initFloatingWindow() {
+        mWindow = new PopupWindow(mContext);
+        mWindow.setWidth(ViewGroup.LayoutParams.MATCH_PARENT);
+        mWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
+        mWindow.setBackgroundDrawable(new ColorDrawable(android.graphics.Color.TRANSPARENT));
+        mWindow.setAnimationStyle(0);
+    }
+        /**
+         * Set the view that acts as the anchor for the control view.
+         * This can for example be a VideoView, or your Activity's main view.
+         * @param view The view to which to anchor the controller when it is visible.
+         */
+    public void setAnchorView(View view) {
+        mAnchor = view;
+
+        removeAllViews();
+        View v = makeControllerView();
+        if (mWindow != null){
+            mWindow.setContentView(v);
+            mWindow.setWidth(LayoutParams.MATCH_PARENT);
+            mWindow.setHeight(LayoutParams.WRAP_CONTENT);
+        }
+    }
+
+    /**
+     * Create the view that holds the widgets that control playback.
+     * Derived classes can override this to create their own.
+     * @return The controller view.
+     * @hide This doesn't work as advertised
+     */
+    protected View makeControllerView() {
+        LayoutInflater inflate = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        mRoot = inflate.inflate(R.layout.media_controller, null);
+
+        initControllerView(mRoot);
+
+        return mRoot;
+    }
+
+    private void initControllerView(View v) {
+        mPauseButton = (ImageButton) v.findViewById(R.id.pause);
+        if (mPauseButton != null) {
+            mPauseButton.requestFocus();
+            mPauseButton.setOnClickListener(mPauseListener);
+        }
+
+        mFfwdButton = (ImageButton) v.findViewById(R.id.ffwd);
+        if (mFfwdButton != null) {
+            mFfwdButton.setOnClickListener(mFfwdListener);
+            mFfwdButton.setVisibility(mUseFastForward ? View.VISIBLE : View.GONE);
+
+        }
+
+        mRewButton = (ImageButton) v.findViewById(R.id.rew);
+        if (mRewButton != null) {
+            mRewButton.setOnClickListener(mRewListener);
+            mRewButton.setVisibility(mUseFastForward ? View.VISIBLE : View.GONE);
+
+        }
+
+        // By default these are hidden. They will be enabled when setPrevNextListeners() is called
+        mNextButton = (ImageButton) v.findViewById(R.id.next);
+        if (mNextButton != null  && !mListenersSet) {
+            mNextButton.setVisibility(View.GONE);
+        }
+        mPrevButton = (ImageButton) v.findViewById(R.id.prev);
+        if (mPrevButton != null && !mListenersSet) {
+            mPrevButton.setVisibility(View.GONE);
+        }
+
+        mProgress = (SeekBar) v.findViewById(R.id.mediacontroller_progress);
+        if (mProgress != null) {
+            if (mProgress instanceof SeekBar) {
+                SeekBar seeker = (SeekBar) mProgress;
+                seeker.setOnSeekBarChangeListener(mSeekListener);
+            }
+            mProgress.setMax(1000);
+        }
+
+        mEndTime = (TextView) v.findViewById(R.id.time);
+        mCurrentTime = (TextView) v.findViewById(R.id.time_current);
+        mFormatBuilder = new StringBuilder();
+        mFormatter = new Formatter(mFormatBuilder, Locale.getDefault());
+
+        installPrevNextListeners();
+    }
+
+    /**
+     * Show the controller on screen. It will go away
+     * automatically after 3 seconds of inactivity.
+     */
+    public void show() {
+        show(sDefaultTimeout);
+    }
+
+    /**
+     * Disable pause or seek buttons if the stream cannot be paused or seeked.
+     * This requires the control interface to be a MediaPlayerControlExt
+     */
+    private void disableUnsupportedButtons() {
+        if (mPlayer == null) {
+            return;
+        }
+
+        try {
+            if (mPauseButton != null && !mPlayer.canPause()) {
+                mPauseButton.setEnabled(false);
+            }
+            if (mRewButton != null && !mPlayer.canSeekBackward()) {
+                mRewButton.setEnabled(false);
+            }
+            if (mFfwdButton != null && !mPlayer.canSeekForward()) {
+                mFfwdButton.setEnabled(false);
+            }
+        } catch (IncompatibleClassChangeError ex) {
+            // We were given an old version of the interface, that doesn't have
+            // the canPause/canSeekXYZ methods. This is OK, it just means we
+            // assume the media can be paused and seeked, and so we don't disable
+            // the buttons.
+        }
+    }
+
+    /**
+     * Show the controller on screen. It will go away
+     * automatically after 'timeout' milliseconds of inactivity.
+     * @param timeout The timeout in milliseconds. Use 0 to show
+     * the controller until hide() is called.
+     */
+    public void show(int timeout) {
+        if (!mShowing && mAnchor != null) {
+            setProgress();
+            if (mPauseButton != null) {
+                mPauseButton.requestFocus();
+            }
+            disableUnsupportedButtons();
+
+            if (mWindow != null) {
+                int[] location = new int[2];
+                mAnchor.getLocationOnScreen(location);
+                Rect anchorRect = new Rect(location[0], location[1], location[0] + mAnchor.getWidth(), location[1] + mAnchor.getHeight());
+
+                mWindow.showAtLocation(mAnchor, Gravity.NO_GRAVITY, anchorRect.left, anchorRect.bottom);
+                //mWindow.showAsDropDown(mAnchor,0,0);
+                //mWindow.showAtLocation(mAnchor, Gravity.BOTTOM, 0, 0);
+            }
+
+            mShowing = true;
+        }
+        //updatePausePlay();
+
+        // cause the progress bar to be updated even if mShowing
+        // was already true.  This happens, for example, if we're
+        // paused with the progress bar showing the user hits play.
+        mHandler.sendEmptyMessage(SHOW_PROGRESS);
+
+        Message msg = mHandler.obtainMessage(FADE_OUT);
+        if (timeout != 0) {
+            mHandler.removeMessages(FADE_OUT);
+            mHandler.sendMessageDelayed(msg, timeout);
+        }
+    }
+
+    public boolean isShowing() {
+        return mShowing;
+    }
+
+    /**
+     * Remove the controller from the screen.
+     */
+    public void hide() {
+        if (mAnchor == null) {
+            return;
+        }
+
+        try {
+            if (mWindow != null)
+                mWindow.dismiss();
+
+            mHandler.removeMessages(SHOW_PROGRESS);
+        } catch (IllegalArgumentException ex) {
+            Log.w("MediaController", "already removed");
+        }
+        mShowing = false;
+    }
+
+    private String stringForTime(long timeMs) {
+        long totalSeconds = timeMs / 1000;
+
+        long seconds = totalSeconds % 60;
+        long minutes = (totalSeconds / 60) % 60;
+        long hours   = totalSeconds / 3600;
+
+        mFormatBuilder.setLength(0);
+        if (hours > 0) {
+            return mFormatter.format("%d:%02d:%02d", hours, minutes, seconds).toString();
+        } else {
+            return mFormatter.format("%02d:%02d", minutes, seconds).toString();
+        }
+    }
+
+    private int setProgress() {
+        if (mPlayer == null || mDragging) {
+            return 0;
+        }
+
+        long position = mPlayer.getCurrentPosition();
+        long duration = mPlayer.getDuration();
+        if (mProgress != null) {
+            if (duration > 0) {
+                // use long to avoid overflow
+                long pos = 1000L * position / duration;
+                mProgress.setProgress( (int) pos);
+            }
+            int percent = mPlayer.getBufferPercentage();
+            mProgress.setSecondaryProgress(percent * 10);
+        }
+
+        if (mEndTime != null)
+            mEndTime.setText(stringForTime(duration));
+        if (mCurrentTime != null)
+            mCurrentTime.setText(stringForTime(position));
+
+        return (int)position;
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        show(sDefaultTimeout);
+        return true;
+    }
+
+    @Override
+    public boolean onTrackballEvent(MotionEvent ev) {
+        show(sDefaultTimeout);
+        return false;
+    }
+
+    @Override
+    public boolean dispatchKeyEvent(KeyEvent event) {
+        if (mPlayer == null) {
+            return true;
+        }
+
+        int keyCode = event.getKeyCode();
+        final boolean uniqueDown = event.getRepeatCount() == 0
+                && event.getAction() == KeyEvent.ACTION_DOWN;
+        if (keyCode ==  KeyEvent.KEYCODE_HEADSETHOOK
+                || keyCode == KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE
+                || keyCode == KeyEvent.KEYCODE_SPACE) {
+            if (uniqueDown) {
+                doPauseResume();
+                show(sDefaultTimeout);
+                if (mPauseButton != null) {
+                    mPauseButton.requestFocus();
+                }
+            }
+            return true;
+        } else if (keyCode == KeyEvent.KEYCODE_MEDIA_PLAY) {
+            if (uniqueDown && !mPlayer.isPlaying()) {
+                mPlayer.start();
+                //updatePausePlay();
+                show(sDefaultTimeout);
+            }
+            return true;
+        } else if (keyCode == KeyEvent.KEYCODE_MEDIA_STOP
+                || keyCode == KeyEvent.KEYCODE_MEDIA_PAUSE) {
+            if (uniqueDown && mPlayer.isPlaying()) {
+                mPlayer.pause();
+                //updatePausePlay();
+                show(sDefaultTimeout);
+            }
+            return true;
+        } else if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN
+                || keyCode == KeyEvent.KEYCODE_VOLUME_UP
+                || keyCode == KeyEvent.KEYCODE_VOLUME_MUTE) {
+            // don't show the controls for volume adjustment
+            return super.dispatchKeyEvent(event);
+        } else if (keyCode == KeyEvent.KEYCODE_BACK || keyCode == KeyEvent.KEYCODE_MENU) {
+            if (uniqueDown) {
+                hide();
+            }
+            return true;
+        }
+
+        show(sDefaultTimeout);
+        return super.dispatchKeyEvent(event);
+    }
+
+    private OnClickListener mPauseListener = new OnClickListener() {
+        public void onClick(View v) {
+            doPauseResume();
+            show(sDefaultTimeout);
+        }
+    };
+
+    private OnClickListener mFullscreenListener = new OnClickListener() {
+        public void onClick(View v) {
+            show(sDefaultTimeout);
+        }
+    };
+
+    public void updatePausePlay() {
+        if (mRoot == null || mPauseButton == null || mPlayer == null) {
+            return;
+        }
+
+        if (mPlayer.isPlaying()) {
+            mPauseButton.setImageResource(R.drawable.ic_media_pause);
+        } else {
+            mPauseButton.setImageResource(R.drawable.ic_media_play);
+        }
+    }
+
+    private void doPauseResume() {
+        if (mPlayer == null) {
+            return;
+        }
+
+        if (mPlayer.isPlaying()) {
+            mPlayer.pause();
+        } else {
+            mPlayer.start();
+        }
+    }
+
+    // There are two scenarios that can trigger the seekbar listener to trigger:
+    //
+    // The first is the user using the touchpad to adjust the posititon of the
+    // seekbar's thumb. In this case onStartTrackingTouch is called followed by
+    // a number of onProgressChanged notifications, concluded by onStopTrackingTouch.
+    // We're setting the field "mDragging" to true for the duration of the dragging
+    // session to avoid jumps in the position in case of ongoing playback.
+    //
+    // The second scenario involves the user operating the scroll ball, in this
+    // case there WON'T BE onStartTrackingTouch/onStopTrackingTouch notifications,
+    // we will simply apply the updated position without suspending regular updates.
+    private OnSeekBarChangeListener mSeekListener = new OnSeekBarChangeListener() {
+        public void onStartTrackingTouch(SeekBar bar) {
+            show(3600000);
+
+            mDragging = true;
+
+            // By removing these pending progress messages we make sure
+            // that a) we won't update the progress while the user adjusts
+            // the seekbar and b) once the user is done dragging the thumb
+            // we will post one of these messages to the queue again and
+            // this ensures that there will be exactly one message queued up.
+            mHandler.removeMessages(SHOW_PROGRESS);
+        }
+
+        public void onProgressChanged(SeekBar bar, int progress, boolean fromuser) {
+            if (mPlayer == null) {
+                return;
+            }
+
+            if (!fromuser) {
+                // We're not interested in programmatically generated changes to
+                // the progress bar's position.
+                return;
+            }
+
+            long duration = mPlayer.getDuration();
+            long newposition = (duration * progress) / 1000L;
+            mSeekposition = newposition;
+            //mPlayer.seekTo( newposition );
+            if (mCurrentTime != null)
+                mCurrentTime.setText(stringForTime(newposition));
+        }
+
+        public void onStopTrackingTouch(SeekBar bar) {
+            mDragging = false;
+            mPlayer.seekTo(mSeekposition);
+            setProgress();
+            show(sDefaultTimeout);
+
+            // Ensure that progress is properly updated in the future,
+            // the call to show() does not guarantee this because it is a
+            // no-op if we are already showing.
+            mHandler.sendEmptyMessage(SHOW_PROGRESS);
+        }
+    };
+
+    @Override
+    public void setEnabled(boolean enabled) {
+        if (mPauseButton != null) {
+            mPauseButton.setEnabled(enabled);
+        }
+        if (mFfwdButton != null) {
+            mFfwdButton.setEnabled(enabled);
+        }
+        if (mRewButton != null) {
+            mRewButton.setEnabled(enabled);
+        }
+        if (mNextButton != null) {
+            mNextButton.setEnabled(enabled && mNextListener != null);
+        }
+        if (mPrevButton != null) {
+            mPrevButton.setEnabled(enabled && mPrevListener != null);
+        }
+        if (mProgress != null) {
+            if (!enabled)
+                mProgress.setProgress(0);
+
+            mProgress.setEnabled(enabled);
+        }
+        disableUnsupportedButtons();
+        super.setEnabled(enabled);
+    }
+
+    @Override
+    public void onPause() {
+        mPauseButton.setImageResource(R.drawable.ic_media_play);
+    }
+
+    @Override
+    public void onStart() {
+        mPauseButton.setImageResource(R.drawable.ic_media_pause);
+    }
+
+    private OnClickListener mRewListener = new OnClickListener() {
+        public void onClick(View v) {
+            if (mPlayer == null) {
+                return;
+            }
+
+            long pos = mPlayer.getCurrentPosition();
+            if (pos > 5000)
+                pos -= 5000; // milliseconds
+            else pos = 0;
+            mPlayer.seekTo(pos);
+            setProgress();
+
+            show(sDefaultTimeout);
+        }
+    };
+
+    private OnClickListener mFfwdListener = new OnClickListener() {
+        public void onClick(View v) {
+            if (mPlayer == null) {
+                return;
+            }
+
+            long pos = mPlayer.getCurrentPosition();
+            pos += 15000; // milliseconds
+            if (pos > mPlayer.getDuration())
+                pos = mPlayer.getDuration();
+            mPlayer.seekTo(pos);
+            setProgress();
+
+            show(sDefaultTimeout);
+        }
+    };
+
+    private void installPrevNextListeners() {
+        if (mNextButton != null) {
+            mNextButton.setOnClickListener(mNextListener);
+            mNextButton.setEnabled(mNextListener != null);
+        }
+
+        if (mPrevButton != null) {
+            mPrevButton.setOnClickListener(mPrevListener);
+            mPrevButton.setEnabled(mPrevListener != null);
+        }
+    }
+
+    public void setPrevNextListeners(OnClickListener next, OnClickListener prev) {
+        mNextListener = next;
+        mPrevListener = prev;
+        mListenersSet = true;
+
+        if (mRoot != null) {
+            installPrevNextListeners();
+
+            if (mNextButton != null) {
+                mNextButton.setVisibility(View.VISIBLE);
+            }
+            if (mPrevButton != null) {
+                mPrevButton.setVisibility(View.VISIBLE);
+            }
+        }
+    }
+
+    private static class MessageHandler extends Handler {
+        private final WeakReference<MediaController> mView;
+
+        MessageHandler(MediaController view) {
+            mView = new WeakReference<MediaController>(view);
+        }
+        @Override
+        public void handleMessage(Message msg) {
+            MediaController view = mView.get();
+            if (view == null || view.mPlayer == null) {
+                return;
+            }
+
+            int pos;
+            switch (msg.what) {
+                case FADE_OUT:
+                    view.hide();
+                    break;
+                case SHOW_PROGRESS:
+                    pos = view.setProgress();
+                    if (!view.mDragging && view.mShowing /*&& view.mPlayer.isPlaying()*/) {
+                        msg = obtainMessage(SHOW_PROGRESS);
+                        sendMessageDelayed(msg, 1000 - (pos % 1000));
+                    }
+                    break;
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/activity/NetMediaActivty.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/NetMediaActivty.java
similarity index 70%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/activity/NetMediaActivty.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/NetMediaActivty.java
index e02e5e1..2a27b88 100644
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/activity/NetMediaActivty.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/NetMediaActivty.java
@@ -1,4 +1,4 @@
-package com.ksyun.live.demo.activity;
+package com.ksyun.live.demo.player.activity;
 
 import android.content.Context;
 import android.content.Intent;
@@ -10,21 +10,18 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.ListView;
-import android.widget.SimpleAdapter;
 import android.widget.Toast;
 
-
 import com.ksyun.live.demo.R;
-import com.ksyun.live.demo.model.NetDbAdapter;
-import com.ksyun.live.demo.util.Settings;
+import com.ksyun.live.demo.player.model.NetDbAdapter;
+import com.ksyun.live.demo.player.util.Settings;
 
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
 
 
 public class NetMediaActivty extends AppCompatActivity implements View.OnClickListener{
@@ -35,20 +32,11 @@ public class NetMediaActivty extends AppCompatActivity implements View.OnClickLi
     private EditText texturl;
     private ListView netlist;
 
-
-    private SharedPreferences settings;
-    private String choosevr;
-
-    private ArrayList<Map<String,String>> listurl;
+    private ArrayList<String> listurl;
 
     private Cursor cursor;
     private NetDbAdapter NetDb;
-
-    @Override
-    protected void onResume() {
-        choosevr = settings.getString("choose_vr","信息为空");
-        super.onResume();
-    }
+    private SharedPreferences settings;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -59,30 +47,17 @@ protected void onCreate(Bundle savedInstanceState) {
         net_startvedio = (Button)findViewById(R.id.btn_net_vedio);
         netlist = (ListView)findViewById(R.id.list_net);
 
-        settings = getSharedPreferences("SETTINGS", Context.MODE_PRIVATE);
-        choosevr = settings.getString("choose_vr","信息为空");
-
-
-        final ArrayList<Map<String,String>> localurl = new ArrayList<Map<String,String>>();
-        Map<String,String> map1 = new HashMap<String,String>();
-        map1.put("url","rtmp://live.hkstv.hk.lxdns.com/live/hks");
-        Map<String,String> map2 = new HashMap<String,String>();
-        map2.put("url","http://playback.ks.zb.mi.com/record/live/107578_1467605748/hls/107578_1467605748.m3u8");
-        Map<String,String> map3 = new HashMap<String,String>();
-        map3.put("url", "http://cxy.kssws.ks-cdn.com/h265_56c26b7a7dc5f6043.mp4");
-        localurl.add(map1);
-        localurl.add(map2);
-        localurl.add(map3);
-
-        SimpleAdapter adapter = new SimpleAdapter(this,localurl,R.layout.list_history,new String[]{"url"},new int[]{R.id.list_history_txt});
-
+        final String[] sampleUrl = {"rtmp://live.hkstv.hk.lxdns.com/live/hks",
+                "http://playback.ks.zb.mi.com/record/live/107578_1467605748/hls/107578_1467605748.m3u8",
+                "http://cxy.kssws.ks-cdn.com/h265_56c26b7a7dc5f6043.mp4"};
 
+        ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,android.R.layout.simple_expandable_list_item_1,sampleUrl);
         netlist.setAdapter(adapter);
 
         netlist.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
-                texturl.setText(localurl.get(i).get("url"));
+                texturl.setText(sampleUrl[i]);
             }
         });
 
@@ -99,11 +74,26 @@ public void onClick(View view) {
                     NetDb.createDate(path);
                 }
                 NetDb.close();
-                    Intent intent = new Intent(NetMediaActivty.this,VideoPlayerActivity.class);
+
+                String chooseview;
+                settings = getSharedPreferences("SETTINGS",Context.MODE_PRIVATE);
+                chooseview = settings.getString("choose_view","undefind");
+
+               if(chooseview.equals(Settings.USEKSYTEXTURE)){
+                    Intent intent = new Intent(NetMediaActivty.this, TextureVideoActivity.class);
+                    intent.putExtra("path",path);
+                    startActivity(intent);
+                } else if (chooseview.equals(Settings.USEKGLRENDER)){
+                   Intent intent = new Intent(NetMediaActivty.this,TextureViewMediaActivity.class);
+                   intent.putExtra("path",path);
+                   startActivity(intent);
+               }
+               else{
+                    Intent intent = new Intent(NetMediaActivty.this,SurfaceActivity.class);
                     intent.putExtra("path",path);
                     startActivity(intent);
 
-
+                }
             }
         });
         setActionBarLayout(R.layout.net_actionbar,this);
@@ -139,29 +129,24 @@ public void setActionBarLayout(int layoutId, Context mContext) {
     public void onClick(View view) {
         switch (view.getId()){
             case R.id.net_history:
-
-                listurl = new ArrayList<Map<String,String>>();
+                listurl = new ArrayList<String>();
                 NetDb = new NetDbAdapter(NetMediaActivty.this);
                 NetDb.open();
                 cursor = NetDb.getAllData();
                 cursor.moveToFirst();
                 if(cursor.getCount()>0){
-                    Map<String,String> map = new HashMap<String,String>();
-                    map.put("url", cursor.getString(cursor.getColumnIndex(NetDbAdapter.KEY_PATH)));
-                    listurl.add(map);
+                    listurl.add( cursor.getString(cursor.getColumnIndex(NetDbAdapter.KEY_PATH)));
                 }
                 while(cursor.moveToNext()){
-                    Map<String,String> map = new HashMap<String,String>();
-                    map.put("url", cursor.getString(cursor.getColumnIndex(NetDbAdapter.KEY_PATH)));
-                    listurl.add(map);
+                    listurl.add( cursor.getString(cursor.getColumnIndex(NetDbAdapter.KEY_PATH)));
                 }
-                SimpleAdapter adapter = new SimpleAdapter(this,listurl,R.layout.list_history,new String[]{"url"},new int[]{R.id.list_history_txt});
 
+                ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,android.R.layout.simple_expandable_list_item_1,listurl);
                 netlist.setAdapter(adapter);
                 netlist.setOnItemClickListener(new AdapterView.OnItemClickListener() {
                     @Override
                     public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
-                        texturl.setText(listurl.get(i).get("url"));
+                        texturl.setText(listurl.get(i));
                     }
                 });
 
@@ -173,7 +158,6 @@ public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
             case R.id.net_scan:
                 Intent intent1 = new Intent(this,CaptureActivity.class);
                 startActivityForResult(intent1,0);
-
             default:
                 break;
         }
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/activity/PlayerActivity.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/PlayerActivity.java
similarity index 76%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/activity/PlayerActivity.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/PlayerActivity.java
index d186ba0..126335e 100644
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/activity/PlayerActivity.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/PlayerActivity.java
@@ -1,12 +1,17 @@
-package com.ksyun.live.demo.activity;
+package com.ksyun.live.demo.player.activity;
 
+import android.Manifest;
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Build;
 import android.os.Bundle;
+import android.support.v4.app.ActivityCompat;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
@@ -28,10 +33,27 @@ protected void onCreate(Bundle savedInstanceState) {
 
         setActionBarLayout(R.layout.media_actionbar,this);
 
+        permissionCheck();
+
         setDefaultFragment();
 
     }
 
+    private void permissionCheck() {
+        int readPerm = ActivityCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE);
+        if (readPerm != PackageManager.PERMISSION_GRANTED) {
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+                Log.e("Player", "No CAMERA or AudioRecord permission, please check");
+                Toast.makeText(this, "No CAMERA or AudioRecord permission, please check",
+                        Toast.LENGTH_LONG).show();
+            } else {
+                String[] permissions = {Manifest.permission.READ_EXTERNAL_STORAGE};
+                ActivityCompat.requestPermissions(this, permissions,
+                        1);
+            }
+        }
+    }
+
 
     public void setActionBarLayout(int layoutId, Context mContext) {
         ActionBar actionBar = getSupportActionBar();
@@ -62,6 +84,7 @@ private void setDefaultFragment() {
         FragmentManager fm = this.getFragmentManager();
         FragmentTransaction transaction = fm.beginTransaction();
         localFragment = new LocalFragment();
+        localFragment.setSettings(getSharedPreferences("SETTINGS", Context.MODE_PRIVATE));
         transaction.replace(R.id.contentFrame,localFragment);
         transaction.commit();
     }
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/activity/SettingActivity.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/SettingActivity.java
similarity index 71%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/activity/SettingActivity.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/SettingActivity.java
index 7089eb4..16ec68c 100644
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/activity/SettingActivity.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/SettingActivity.java
@@ -1,4 +1,4 @@
-package com.ksyun.live.demo.activity;
+package com.ksyun.live.demo.player.activity;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -11,8 +11,7 @@
 import android.widget.Toast;
 
 import com.ksyun.live.demo.R;
-import com.ksyun.live.demo.util.Settings;
-
+import com.ksyun.live.demo.player.util.Settings;
 
 public class SettingActivity extends AppCompatActivity implements RadioGroup.OnCheckedChangeListener{
 
@@ -23,7 +22,8 @@ public class SettingActivity extends AppCompatActivity implements RadioGroup.OnC
     private SharedPreferences settings ;
     private SharedPreferences.Editor editor;
     private RadioButton radiosurface;
-    private RadioButton radiotexture;
+    private RadioButton radioksytexture;
+    private RadioButton radioglrenderview;
     private RadioButton radiosoft;
     private RadioButton radiohard;
     private Switch debugswitch;
@@ -41,8 +41,6 @@ protected void onCreate(Bundle savedInstanceState) {
         String chooseview = settings.getString("choose_view","信息为空");
         String choosedecode = settings.getString("choose_decode","信息为空");
         String choosedebug = settings.getString("choose_debug","信息为空");
-        String choosevr = settings.getString("choose_vr","信息为空");
-
 
         mChooseSurface = (RadioGroup) findViewById(R.id.choose_surface);
         mChooseCodec = (RadioGroup) findViewById(R.id.choose_codec);
@@ -52,17 +50,16 @@ protected void onCreate(Bundle savedInstanceState) {
 
         debugswitch = (Switch)findViewById(R.id.switch_set);
 
-        initSetting(choosedecode,chooseview,choosedebug,choosevr);
-
+        initSetting(choosedecode,chooseview,choosedebug);
 
         debugswitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean isChecked) {
                 if (isChecked) {
-                    editor.putString("choose_debug",Settings.DEBUGON);
+                    editor.putString("choose_debug", Settings.DEBUGON);
                     Toast.makeText(SettingActivity.this, "Debug被打开", Toast.LENGTH_SHORT).show();
                 } else {
-                    editor.putString("choose_debug",Settings.DEBUGOFF);
+                    editor.putString("choose_debug", Settings.DEBUGOFF);
                     Toast.makeText(SettingActivity.this, "Debug被关闭", Toast.LENGTH_SHORT).show();
                 }
                 editor.commit();
@@ -70,11 +67,12 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean isChecked) {
         });
     }
 
-    private void initSetting(String choosedecode, String chooseview,String choosedebug,String choosevr) {
+    private void initSetting(String choosedecode, String chooseview,String choosedebug) {
         radiosoft = (RadioButton)findViewById(R.id.use_sw);
         radiohard = (RadioButton)findViewById(R.id.use_hw);
         radiosurface = (RadioButton)findViewById(R.id.use_surfaceview);
-        radiotexture = (RadioButton)findViewById(R.id.use_textureview);
+        radioksytexture = (RadioButton)findViewById(R.id.use_ksytextureview);
+        radioglrenderview = (RadioButton)findViewById(R.id.glrender_view);
 
         switch (choosedecode){
             case Settings.USEHARD:
@@ -85,19 +83,22 @@ private void initSetting(String choosedecode, String chooseview,String choosedeb
                 break;
             default:
                 mChooseCodec.check(radiosoft.getId());
-                editor.putString("choose_decode",Settings.USESOFT);
+                editor.putString("choose_decode", Settings.USESOFT);
                 break;
         }
         switch (chooseview){
             case Settings.USESUFACE:
                 mChooseSurface.check(radiosurface.getId());
                 break;
-            case Settings.USETEXTURE:
-                mChooseSurface.check(radiotexture.getId());
+            case Settings.USEKSYTEXTURE:
+                mChooseSurface.check(radioksytexture.getId());
+                break;
+            case Settings.USEKGLRENDER:
+                mChooseSurface.check(radioglrenderview.getId());
                 break;
             default:
                 mChooseSurface.check(radiosurface.getId());
-                editor.putString("choose_view",Settings.USESUFACE);
+                editor.putString("choose_view", Settings.USESUFACE);
                 break;
         }
         switch (choosedebug){
@@ -109,7 +110,7 @@ private void initSetting(String choosedecode, String chooseview,String choosedeb
                 break;
             default:
                 debugswitch.setChecked(false);
-                editor.putString("choose_debug",Settings.DEBUGOFF);
+                editor.putString("choose_debug", Settings.DEBUGOFF);
                 break;
         }
         editor.commit();
@@ -121,21 +122,24 @@ private void initSetting(String choosedecode, String chooseview,String choosedeb
     public void onCheckedChanged(RadioGroup radioGroup, int i) {
         switch(i){
             case R.id.use_surfaceview:
-                editor.putString("choose_view",Settings.USESUFACE);
+                editor.putString("choose_view", Settings.USESUFACE);
+                break;
+            case R.id.use_ksytextureview:
+                editor.putString("choose_view", Settings.USEKSYTEXTURE);
                 break;
-            case R.id.use_textureview:
-                editor.putString("choose_view",Settings.USETEXTURE);
+            case R.id.glrender_view:
+                editor.putString("choose_view", Settings.USEKGLRENDER);
                 break;
             case R.id.use_hw:
-                mChooseSurface.check(radiotexture.getId());
+                mChooseSurface.check(radioksytexture.getId());
                 //radiosurface.setEnabled(false);
-                Toast.makeText(SettingActivity.this, "硬解请使用TextureView", Toast.LENGTH_SHORT).show();
-                editor.putString("choose_decode",Settings.USEHARD);
-                editor.putString("choose_view",Settings.USETEXTURE);
+                Toast.makeText(SettingActivity.this, "硬解请使用KSYTextureView", Toast.LENGTH_SHORT).show();
+                editor.putString("choose_decode", Settings.USEHARD);
+                editor.putString("choose_view", Settings.USEKSYTEXTURE);
                 break;
             case  R.id.use_sw:
                 //radiosurface.setEnabled(true);
-                editor.putString("choose_decode",Settings.USESOFT);
+                editor.putString("choose_decode", Settings.USESOFT);
                 break;
             default:
                 break;
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/activity/VideoPlayerActivity.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/SurfaceActivity.java
old mode 100755
new mode 100644
similarity index 84%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/activity/VideoPlayerActivity.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/SurfaceActivity.java
index dda07b9..d26ead4
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/activity/VideoPlayerActivity.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/SurfaceActivity.java
@@ -1,866 +1,802 @@
-package com.ksyun.live.demo.activity;
-
-import android.app.Activity;
-import android.app.ActivityManager;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.res.Configuration;
-import android.graphics.Bitmap;
-import android.graphics.SurfaceTexture;
-import android.media.AudioManager;
-import android.os.Bundle;
-import android.os.Environment;
-import android.os.Handler;
-import android.os.Message;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-import android.view.Surface;
-import android.view.SurfaceHolder;
-import android.view.SurfaceHolder.Callback;
-import android.view.SurfaceView;
-import android.view.TextureView;
-import android.view.View;
-import android.view.ViewGroup.LayoutParams;
-import android.view.WindowManager;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.SeekBar;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.ksyun.live.demo.R;
-import com.ksyun.live.demo.model.Strings;
-import com.ksyun.live.demo.util.QosObject;
-import com.ksyun.live.demo.util.QosThread;
-import com.ksyun.live.demo.util.Settings;
-import com.ksyun.media.player.IMediaPlayer;
-import com.ksyun.media.player.KSYMediaMeta;
-import com.ksyun.media.player.KSYMediaPlayer;
-import com.ksyun.media.player.misc.KSYQosInfo;
-
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.Timer;
-import java.util.TimerTask;
-
-
-/**
- * @author xinbocheng@qyvideo.cn
- * 2015/5/19.
- */
-public class VideoPlayerActivity extends Activity implements TextureView.SurfaceTextureListener,View.OnClickListener{
-
-    private static final String TAG = "VideoPlayerActivity";
-
-    public static final int UPDATE_SEEKBAR = 0;
-    public static final int HIDDEN_SEEKBAR = 1;
-    public static final int UPDATE_QOSMESS  = 2;
-    public static final int UPADTE_QOSVIEW = 3;
-
-
-    private SharedPreferences settings;
-    private String chooseview;
-    private String choosedecode;
-    private String choosedebug;
-
-    private Context mContext;
-    private KSYMediaPlayer ksyMediaPlayer;
-    private QosThread mQosThread;
-
-    private Surface mSurface = null;
-    private SurfaceView mVideoSurfaceView = null;
-    private SurfaceHolder mSurfaceHolder = null;
-    private TextureView mVideoTextureView = null;
-    private SurfaceTexture mSurfaceTexture = null;
-
-    private Handler mHandler;
-
-    private LinearLayout mPlayerPanel;
-    private ImageView mPlayerStartBtn;
-    private SeekBar mPlayerSeekbar;
-    private TextView mPlayerPosition;
-    private TextView mLoadText;
-    private TextView mCpu;
-    private TextView mMemInfo;
-    private TextView mVideoResolution;
-    private TextView mVideoBitrate;
-    private TextView mFrameRate;
-    private TextView mVideoBufferTime;
-    private TextView mAudioBufferTime;
-    private TextView mServerIp;
-    private TextView mSdkVersion;
-    private TextView mDNSTime;
-    private TextView mHttpConnectionTime;
-
-    private RelativeLayout toppanel;
-    private Button reload;
-    private Button screen;
-    private Button rotate;
-    private Button mute;
-
-    private Button mPlayerScaleVideo;
-
-    private boolean mPlayerPanelShow = false;
-    private boolean mPause = false;
-    private boolean mmute = false;
-
-    private long mStartTime = 0;
-    private long mPauseStartTime = 0;
-    private long mPausedTime = 0;
-
-    private int mVideoWidth = 0;
-    private int mVideoHeight = 0;
-
-    private int mVideoScaleIndex = 0;
-    boolean useHwCodec = false;
-
-    private Timer timer = null;
-    private TimerTask timerTask= null;
-    private long bits;
-    private KSYQosInfo info;
-    private String cpuUsage;
-    private int pss;
-    private int rotatenum = 0;
-
-
-    private String mDataSource;
-
-    private IMediaPlayer.OnPreparedListener mOnPreparedListener = new IMediaPlayer.OnPreparedListener() {
-        @Override
-        public void onPrepared(IMediaPlayer mp) {
-
-
-            mVideoWidth = ksyMediaPlayer.getVideoWidth();
-            mVideoHeight = ksyMediaPlayer.getVideoHeight();
-
-            // Set Video Scaling Mode
-            ksyMediaPlayer.setVideoScalingMode(KSYMediaPlayer.VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING);
-
-            //start player
-            ksyMediaPlayer.start();
-
-            //set progress
-            setVideoProgress(0);
-
-            //start hardware info thread
-            if (mQosThread != null)
-                mQosThread.start();
-
-            //update UI
-//            mCpu.setVisibility(View.VISIBLE);
-//            mMemInfo.setVisibility(View.VISIBLE);
-
-            if(ksyMediaPlayer.getServerAddress() != null)
-                mServerIp.setText("ServerIP: "+ ksyMediaPlayer.getServerAddress());
-
-            //  get meta data
-            Bundle bundle = ksyMediaPlayer.getMediaMeta();
-            KSYMediaMeta meta = KSYMediaMeta.parse(bundle);
-            if (meta != null)
-            {
-                if (meta.mHttpConnectTime > 0) {
-                    double http_connection_time = Double.valueOf(meta.mHttpConnectTime);
-                    mHttpConnectionTime.setText("HTTP Connection Time: " + (int)http_connection_time);
-                }
-
-                int dns_time = meta.mAnalyzeDnsTime;
-                if (dns_time > 0) {
-                    mDNSTime.setText("DNS time: " + dns_time);
-                }
-            }
-
-            mSdkVersion.setText("SDK version: " + ksyMediaPlayer.getVersion());
-
-            mVideoResolution.setText("Resolution:" + ksyMediaPlayer.getVideoWidth() + "x" + ksyMediaPlayer.getVideoHeight());
-//            mVideoResolution.setVisibility(View.VISIBLE);
-//            mFrameRate.setVisibility(View.VISIBLE);
-//            mVideoBitrate.setVisibility(View.VISIBLE);
-
-            mStartTime = System.currentTimeMillis();
-            choosedebug = settings.getString("choose_debug","信息为空");
-            if(choosedebug.equals(Settings.DEBUGON)){
-                Log.e("VideoPlayer","开启");
-                mSdkVersion.setVisibility(View.VISIBLE);
-                mVideoResolution.setVisibility(View.VISIBLE);
-                mFrameRate.setVisibility(View.VISIBLE);
-                mVideoBitrate.setVisibility(View.VISIBLE);
-                mLoadText.setVisibility(View.VISIBLE);
-                mCpu.setVisibility(View.VISIBLE);
-                mMemInfo.setVisibility(View.VISIBLE);
-                mVideoBufferTime.setVisibility(View.VISIBLE);
-                mAudioBufferTime.setVisibility(View.VISIBLE);
-                mServerIp.setVisibility(View.VISIBLE);
-                mDNSTime.setVisibility(View.VISIBLE);
-                mHttpConnectionTime.setVisibility(View.VISIBLE);
-            }else{
-                Log.e("VideoPlayer","关闭");
-                mSdkVersion.setVisibility(View.GONE);
-                mVideoResolution.setVisibility(View.GONE);
-                mFrameRate.setVisibility(View.GONE);
-                mVideoBitrate.setVisibility(View.GONE);
-                mLoadText.setVisibility(View.GONE);
-                mCpu.setVisibility(View.GONE);
-                mMemInfo.setVisibility(View.GONE);
-                mVideoBufferTime.setVisibility(View.GONE);
-                mAudioBufferTime.setVisibility(View.GONE);
-                mServerIp.setVisibility(View.GONE);
-                mDNSTime.setVisibility(View.GONE);
-                mHttpConnectionTime.setVisibility(View.GONE);
-            }
-        }
-    };
-
-    private IMediaPlayer.OnBufferingUpdateListener mOnBufferingUpdateListener = new IMediaPlayer.OnBufferingUpdateListener() {
-        @Override
-        public void onBufferingUpdate(IMediaPlayer mp, int percent) {
-            long duration = ksyMediaPlayer.getDuration();
-            long progress = duration * percent/100;
-            mPlayerSeekbar.setSecondaryProgress((int)progress);
-        }
-    };
-
-    private IMediaPlayer.OnVideoSizeChangedListener mOnVideoSizeChangeListener = new IMediaPlayer.OnVideoSizeChangedListener() {
-        @Override
-        public void onVideoSizeChanged(IMediaPlayer mp, int width, int height, int sarNum, int sarDen) {
-            if(mVideoWidth > 0 && mVideoHeight > 0) {
-                if(width != mVideoWidth || height != mVideoHeight) {
-                    mVideoWidth = mp.getVideoWidth();
-                    mVideoHeight = mp.getVideoHeight();
-
-                    if(ksyMediaPlayer != null)
-                        ksyMediaPlayer.setVideoScalingMode(KSYMediaPlayer.VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING);
-                }
-            }
-        }
-    };
-
-    private IMediaPlayer.OnSeekCompleteListener mOnSeekCompletedListener = new IMediaPlayer.OnSeekCompleteListener() {
-        @Override
-        public void onSeekComplete(IMediaPlayer mp) {
-            Log.e(TAG, "onSeekComplete...............");
-        }
-    };
-
-    private IMediaPlayer.OnCompletionListener mOnCompletionListener = new IMediaPlayer.OnCompletionListener() {
-        @Override
-        public void onCompletion(IMediaPlayer mp) {
-            Toast.makeText(mContext, "OnCompletionListener, play complete.", Toast.LENGTH_LONG).show();
-            videoPlayEnd();
-        }
-    };
-
-    private IMediaPlayer.OnErrorListener mOnErrorListener = new IMediaPlayer.OnErrorListener() {
-        @Override
-        public boolean onError(IMediaPlayer mp, int what, int extra) {
-            switch (what)
-            {
-                case KSYMediaPlayer.MEDIA_ERROR_UNKNOWN:
-                    Log.e(TAG, "OnErrorListener, Error Unknown:" + what + ",extra:" + extra);
-                    break;
-                default:
-                    Log.e(TAG, "OnErrorListener, Error:" + what + ",extra:" + extra);
-            }
-
-            videoPlayEnd();
-
-            return false;
-        }
-    };
-
-    public IMediaPlayer.OnInfoListener mOnInfoListener = new IMediaPlayer.OnInfoListener() {
-        @Override
-        public boolean onInfo(IMediaPlayer iMediaPlayer, int i, int i1) {
-            switch (i) {
-                case KSYMediaPlayer.MEDIA_INFO_BUFFERING_START:
-                    Log.d(TAG, "Buffering Start.");
-                    break;
-                case KSYMediaPlayer.MEDIA_INFO_BUFFERING_END:
-                    Log.d(TAG, "Buffering End.");
-                    break;
-                case KSYMediaPlayer.MEDIA_INFO_AUDIO_RENDERING_START:
-                    Toast.makeText(mContext, "Audio Rendering Start", Toast.LENGTH_SHORT).show();
-                    break;
-                case KSYMediaPlayer.MEDIA_INFO_VIDEO_RENDERING_START:
-                    Toast.makeText(mContext, "Video Rendering Start", Toast.LENGTH_SHORT).show();
-                    break;
-                case KSYMediaPlayer.MEDIA_INFO_SUGGEST_RELOAD:
-                    // Player find a new stream(video or audio), and we could reload the video.
-                    if(ksyMediaPlayer != null)
-                        ksyMediaPlayer.reload(mDataSource, false);
-                    break;
-                case KSYMediaPlayer.MEDIA_INFO_RELOADED:
-                    Toast.makeText(mContext, "Succeed to reload video.", Toast.LENGTH_SHORT).show();
-                    Log.d(TAG, "Succeed to reload video.");
-                    return false;
-            }
-            return false;
-        }
-    };
-
-    private View.OnClickListener mVideoScaleButton = new View.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            int mode = mVideoScaleIndex % 2;
-            mVideoScaleIndex++;
-            mHandler.removeMessages(HIDDEN_SEEKBAR);
-            Message msg = new Message();
-            msg.what = HIDDEN_SEEKBAR;
-            mHandler.sendMessageDelayed(msg,3000);
-            if(ksyMediaPlayer != null) {
-                if(mode == 1)
-                    ksyMediaPlayer.setVideoScalingMode(KSYMediaPlayer.VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING);
-                else
-                    ksyMediaPlayer.setVideoScalingMode(KSYMediaPlayer.VIDEO_SCALING_MODE_SCALE_TO_FIT);
-            }
-        }
-    };
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        mContext = this.getApplicationContext();
-        useHwCodec = getIntent().getBooleanExtra("HWCodec",false);
-
-        setContentView(R.layout.qianyi_player);
-
-
-        mPlayerPanel = (LinearLayout) findViewById(R.id.player_panel);
-        mPlayerStartBtn = (ImageView) findViewById(R.id.player_start);
-        mPlayerSeekbar = (SeekBar) findViewById(R.id.player_seekbar);
-        mPlayerPosition = (TextView) findViewById(R.id.player_time);
-        mLoadText = (TextView) findViewById(R.id.loading_text);
-        mCpu = (TextView) findViewById(R.id.player_cpu);
-        mMemInfo = (TextView) findViewById(R.id.player_mem);
-        mVideoResolution = (TextView) findViewById(R.id.player_re);
-        mVideoBitrate = (TextView) findViewById(R.id.player_br);
-        mFrameRate = (TextView) findViewById(R.id.player_fr);
-        mVideoBufferTime = (TextView) findViewById(R.id.player_video_time);
-        mAudioBufferTime = (TextView) findViewById(R.id.player_audio_time);
-        mServerIp = (TextView) findViewById(R.id.player_ip);
-        mSdkVersion = (TextView) findViewById(R.id.player_sdk_version);
-        mDNSTime = (TextView) findViewById(R.id.player_dns_time);
-        mHttpConnectionTime = (TextView) findViewById(R.id.player_http_connection_time);
-
-        toppanel = (RelativeLayout)findViewById(R.id.topPanel_player);
-        reload = (Button)findViewById(R.id.player_reload);
-        rotate = (Button)findViewById(R.id.btn_rotate_player);
-        screen = (Button)findViewById(R.id.btn_screen_player);
-        mute = (Button)findViewById(R.id.btn_mute_player);
-        reload.setOnClickListener(this);
-        rotate.setOnClickListener(this);
-        screen.setOnClickListener(this);
-        mute.setOnClickListener(this);
-
-
-        mPlayerScaleVideo = (Button) findViewById(R.id.player_scale);
-        mPlayerScaleVideo.setOnClickListener(mVideoScaleButton);
-
-        mPlayerStartBtn.setOnClickListener(mStartBtnListener);
-        mPlayerSeekbar.setOnSeekBarChangeListener(mSeekBarListener);
-        mPlayerSeekbar.setEnabled(true);
-
-        mVideoTextureView = (TextureView) findViewById(R.id.player_texture);
-        mVideoTextureView.setSurfaceTextureListener(this);
-        mVideoTextureView.setOnTouchListener(mTouchListener);
-        mVideoTextureView.setKeepScreenOn(true);
-
-
-        mVideoSurfaceView = (SurfaceView) findViewById(R.id.player_surface);
-        mSurfaceHolder = mVideoSurfaceView.getHolder();
-        mSurfaceHolder.addCallback(mSurfaceCallback);
-        mVideoSurfaceView.setOnTouchListener(mTouchListener);
-        mVideoSurfaceView.setKeepScreenOn(true);
-
-        this.setVolumeControlStream(AudioManager.STREAM_MUSIC);
-
-
-        mHandler = new Handler(){
-            @Override
-            public void handleMessage(Message msg) {
-                super.handleMessage(msg);
-                switch (msg.what) {
-                    case UPDATE_SEEKBAR:
-                        setVideoProgress(0);
-                        break;
-                    case HIDDEN_SEEKBAR:
-                        mPlayerPanelShow = false;
-                        mPlayerPanel.setVisibility(View.GONE);
-                        toppanel.setVisibility(View.GONE);
-                        break;
-                    case UPDATE_QOSMESS:
-                        if(msg.obj instanceof QosObject) {
-                            updateQosInfo((QosObject)msg.obj);
-                        }
-                        break;
-                    case UPADTE_QOSVIEW:
-                        updateQosView();
-                        break;
-                }
-
-            }
-        };
-
-        if(timerTask ==null){
-            timerTask = new TimerTask() {
-                @Override
-                public void run() {
-                    try{
-                        Message message = new Message();
-                        message.what = VideoPlayerActivity.UPADTE_QOSVIEW;
-                        if(message!=null){
-                            mHandler.sendMessage(message);
-                        }
-                    }catch(NullPointerException e){
-                        e.printStackTrace();
-                    }
-
-                }
-            };
-        }
-
-        if(timer == null){
-            timer = new Timer(true);
-        }
-
-        timer.schedule(timerTask,2000,5000);
-
-
-        ActivityManager activityManager = (ActivityManager) getSystemService(ACTIVITY_SERVICE);
-
-        mQosThread = new QosThread(activityManager, mHandler,mContext);
-
-        mDataSource = getIntent().getStringExtra("path");
-
-        ksyMediaPlayer = new KSYMediaPlayer.Builder(mContext).build();
-        ksyMediaPlayer.setOnBufferingUpdateListener(mOnBufferingUpdateListener);
-        ksyMediaPlayer.setOnCompletionListener(mOnCompletionListener);
-        ksyMediaPlayer.setOnPreparedListener(mOnPreparedListener);
-        ksyMediaPlayer.setOnInfoListener(mOnInfoListener);
-        ksyMediaPlayer.setOnVideoSizeChangedListener(mOnVideoSizeChangeListener);
-        ksyMediaPlayer.setOnErrorListener(mOnErrorListener);
-        ksyMediaPlayer.setOnSeekCompleteListener(mOnSeekCompletedListener);
-        ksyMediaPlayer.setScreenOnWhilePlaying(true);
-        ksyMediaPlayer.setBufferTimeMax(5);
-
-
-        settings = getSharedPreferences("SETTINGS",Context.MODE_PRIVATE);
-        choosedecode = settings.getString("choose_decode","undefind");
-        chooseview = settings.getString("choose_view","undefind");
-
-        if(chooseview.equals(Settings.USESUFACE)){
-            mVideoTextureView.setVisibility(View.GONE);
-        }else{
-            mVideoSurfaceView.setVisibility(View.GONE);
-        }
-
-        if(choosedecode.equals(Settings.USEHARD)){
-            useHwCodec = true;
-        }else{
-            useHwCodec = false;
-        }
-
-
-        if (useHwCodec) {
-            //硬解264&265
-            ksyMediaPlayer.setDecodeMode(KSYMediaPlayer.KSYDecodeMode.KSY_DECODE_MODE_AUTO);
-        }
-        try {
-            ksyMediaPlayer.setDataSource(mDataSource);
-            ksyMediaPlayer.prepareAsync();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        timer.cancel();
-        mVideoTextureView = null;
-        mSurfaceTexture = null;
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        if(ksyMediaPlayer != null)
-        {
-            ksyMediaPlayer.pause();
-            mPause = true;
-        }
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        reinitTextureView((TextureView)findViewById(R.id.player_texture));
-        if(ksyMediaPlayer != null)
-        {
-            ksyMediaPlayer.start();
-            mPause = false;
-        }
-    }
-
-    //android <=4.4 后台切回后不会再触发onSurfaceTextureAvailable，所以在此处调用setSurfaceTexture
-    public void reinitTextureView(TextureView view) {
-        mVideoTextureView = view;
-        mVideoTextureView.setSurfaceTextureListener(this);
-        //需要检测Texture是否是available，否则在某些设备上会引起崩溃
-        if (!mVideoTextureView.isAvailable()) {
-            if (mSurfaceTexture != null) {
-                mVideoTextureView.setSurfaceTexture(mSurfaceTexture);
-            }
-        }
-    }
-
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        if(keyCode == KeyEvent.KEYCODE_BACK) {
-            videoPlayEnd();
-        }
-        return super.onKeyDown(keyCode, event);
-    }
-
-    @Override
-    public int getChangingConfigurations() {
-        return super.getChangingConfigurations();
-    }
-
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-    }
-
-    private void scaleVideoView()
-    {
-        if(ksyMediaPlayer == null || ksyMediaPlayer.getVideoHeight() <= 0 || mVideoSurfaceView == null)
-            return;
-
-        WindowManager wm = this.getWindowManager();
-        int sw = wm.getDefaultDisplay().getWidth();
-        int sh = wm.getDefaultDisplay().getHeight();
-        int videoWidth = mVideoWidth;
-        int videoHeight = mVideoHeight;
-        int visibleWidth = 0;
-        int visibleHeight = 0;
-
-        if(getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT)
-        {
-            visibleWidth = sw > sh ? sh : sw;
-            visibleHeight = (int) Math.ceil(visibleWidth * videoHeight / videoWidth);
-        }
-        else if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
-
-            if(videoHeight*sw > videoWidth*sh)
-            {
-                visibleHeight = sh;
-                visibleWidth = (int) Math.ceil(videoWidth * visibleHeight / videoHeight);
-            }
-            else
-            {
-                visibleWidth = sw;
-                visibleHeight = (int) Math.ceil(visibleWidth * videoHeight / videoWidth);
-            }
-        }
-
-        LayoutParams lp = mVideoSurfaceView.getLayoutParams();
-        lp.width = visibleWidth;
-        lp.height = visibleHeight;
-        mVideoSurfaceView.setLayoutParams(lp);
-
-        mVideoSurfaceView.invalidate();
-    }
-
-    // Maybe we could support gesture detect
-    private void dealTouchEvent(View view, MotionEvent event) {
-        mPlayerPanelShow = !mPlayerPanelShow;
-
-        if(mPlayerPanelShow) {
-            mPlayerPanel.setVisibility(View.VISIBLE);
-            toppanel.setVisibility(View.VISIBLE);
-
-            Message msg = new Message();
-            msg.what = HIDDEN_SEEKBAR;
-            mHandler.sendMessageDelayed(msg, 3000);
-        }else{
-            mPlayerPanel.setVisibility(View.GONE);
-            toppanel.setVisibility(View.GONE);
-            mHandler.removeMessages(HIDDEN_SEEKBAR);
-        }
-    }
-
-    public int setVideoProgress(int currentProgress) {
-
-        if(ksyMediaPlayer == null)
-            return -1;
-
-        long time = currentProgress > 0 ? currentProgress : ksyMediaPlayer.getCurrentPosition();
-        long length = ksyMediaPlayer.getDuration();
-
-        // Update all view elements
-        mPlayerSeekbar.setMax((int)length);
-        mPlayerSeekbar.setProgress((int)time);
-
-        if(time >= 0)
-        {
-            String progress = Strings.millisToString(time) + "/" + Strings.millisToString(length);
-            mPlayerPosition.setText(progress);
-        }
-
-        Message msg = new Message();
-        msg.what = UPDATE_SEEKBAR;
-
-        if(mHandler != null)
-            mHandler.sendMessageDelayed(msg, 1000);
-        return (int)time;
-    }
-
-    private void updateQosInfo(QosObject obj) {
-        cpuUsage = obj.cpuUsage;
-        pss = obj.pss;
-
-
-        if(ksyMediaPlayer != null)
-        {
-            bits = ksyMediaPlayer.getDecodedDataSize() * 8 / (mPause ? mPauseStartTime - mPausedTime - mStartTime : System.currentTimeMillis() - mPausedTime - mStartTime);
-
-            info = ksyMediaPlayer.getStreamQosInfo();
-
-        }
-
-    }
-
-    private void updateQosView(){
-        mCpu.setText("Cpu usage:"+cpuUsage);
-        mMemInfo.setText("Memory:" + pss + " KB");
-
-        if(ksyMediaPlayer != null) {
-            mVideoBitrate.setText("Bitrate: " + bits + " kb/s");
-            mFrameRate.setText("VideoOutputFrameRate:" + ksyMediaPlayer.getVideoOutputFramesPerSecond());
-
-            if(info != null) {
-                mVideoBufferTime.setText("VideoBufferTime:" + info.videoBufferTimeLength + "(ms)");
-                mAudioBufferTime.setText("AudioBufferTime:" + info.audioBufferTimeLength + "(ms)");
-            }
-        }
-    }
-
-    private String md5(String string)
-    {
-        byte[] hash;
-        try {
-            hash = MessageDigest.getInstance("MD5").digest(string.getBytes());
-        } catch (NoSuchAlgorithmException e) {
-            throw new RuntimeException("Huh, MD5 should be supported?", e);
-        }
-
-        StringBuilder hex = new StringBuilder(hash.length * 2);
-        for (byte b : hash) {
-            if ((b & 0xFF) < 0x10) hex.append("0");
-            hex.append(Integer.toHexString(b & 0xFF));
-        }
-
-        return hex.toString();
-    }
-
-    private void videoPlayEnd() {
-        if(ksyMediaPlayer != null)
-        {
-            ksyMediaPlayer.release();
-            ksyMediaPlayer = null;
-        }
-
-        if(mQosThread != null) {
-            mQosThread.stopThread();
-            mQosThread = null;
-        }
-
-        mHandler = null;
-
-        finish();
-    }
-
-    private View.OnClickListener mStartBtnListener = new View.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            mPause = !mPause;
-            mHandler.removeMessages(HIDDEN_SEEKBAR);
-            Message msg = new Message();
-            msg.what = HIDDEN_SEEKBAR;
-            mHandler.sendMessageDelayed(msg,3000);
-            if(mPause) {
-                mPlayerStartBtn.setBackgroundResource(R.drawable.qyvideo_pause_btn);
-                ksyMediaPlayer.pause();
-                if (chooseview.equals(Settings.USETEXTURE)){
-                }
-                mPauseStartTime = System.currentTimeMillis();
-            }else {
-                mPlayerStartBtn.setBackgroundResource(R.drawable.qyvideo_start_btn);
-                ksyMediaPlayer.start();
-                mPausedTime += System.currentTimeMillis() - mPauseStartTime;
-                mPauseStartTime = 0;
-            }
-        }
-    };
-
-    private int mVideoProgress = 0;
-    private SeekBar.OnSeekBarChangeListener mSeekBarListener = new SeekBar.OnSeekBarChangeListener() {
-        @Override
-        public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-            if(fromUser) {
-                mVideoProgress = progress;
-                mHandler.removeMessages(HIDDEN_SEEKBAR);
-                Message msg = new Message();
-                msg.what = HIDDEN_SEEKBAR;
-                mHandler.sendMessageDelayed(msg,3000);
-            }
-        }
-
-        @Override
-        public void onStartTrackingTouch(SeekBar seekBar) {
-
-        }
-
-        @Override
-        public void onStopTrackingTouch(SeekBar seekBar) {
-            ksyMediaPlayer.seekTo(mVideoProgress);
-            setVideoProgress(mVideoProgress);
-        }
-    };
-
-    private View.OnTouchListener mTouchListener = new View.OnTouchListener() {
-        @Override
-        public boolean onTouch(View v, MotionEvent event) {
-            dealTouchEvent(v, event);
-            return false;
-        }
-    };
-
-    private final Callback mSurfaceCallback = new Callback() {
-        @Override
-        public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
-            if(ksyMediaPlayer != null && ksyMediaPlayer.isPlaying())
-                ksyMediaPlayer.setVideoScalingMode(KSYMediaPlayer.VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING);
-        }
-
-        @Override
-        public void surfaceCreated(SurfaceHolder holder) {
-            if(ksyMediaPlayer != null)
-                ksyMediaPlayer.setDisplay(holder);
-        }
-
-        @Override
-        public void surfaceDestroyed(SurfaceHolder holder) {
-            Log.d(TAG, "surfaceDestroyed");
-            if(ksyMediaPlayer != null) {
-                ksyMediaPlayer.setDisplay(null);
-            }
-        }
-    };
-
-    @Override
-    public void onSurfaceTextureAvailable(SurfaceTexture surface, int i, int i1) {
-        if(mSurfaceTexture == null) {
-            mSurfaceTexture = surface;
-        }
-        if (mSurface == null){
-            mSurface = new Surface(mSurfaceTexture);
-        }
-
-        if (ksyMediaPlayer != null){
-            ksyMediaPlayer.setSurface(mSurface);
-        }
-    }
-
-    @Override
-    public void onSurfaceTextureSizeChanged(SurfaceTexture surfaceTexture, int i, int i1) {
-
-    }
-
-    @Override
-    public boolean onSurfaceTextureDestroyed(SurfaceTexture surfaceTexture) {
-        return false;
-    }
-
-    @Override
-    public void onSurfaceTextureUpdated(SurfaceTexture surfaceTexture) {
-
-    }
-
-    @Override
-    public void onClick(View view) {
-        mHandler.removeMessages(HIDDEN_SEEKBAR);
-        Message msg = new Message();
-        msg.what = HIDDEN_SEEKBAR;
-        mHandler.sendMessageDelayed(msg,3000);
-        switch (view.getId()){
-            case R.id.player_reload:
-                String mVideoUrl1 = mDataSource;
-                String mVideoUrl2 = "rtmp://live.hkstv.hk.lxdns.com/live/hks";
-                // 重新链接
-                ksyMediaPlayer.reload(mVideoUrl1, false);
-                // 播放新的视频
-                ksyMediaPlayer.reload(mVideoUrl2, true);
-                break;
-            case R.id.btn_rotate_player:
-                if (useHwCodec){
-                    Toast.makeText(VideoPlayerActivity.this, "旋屏请设置软解", Toast.LENGTH_SHORT).show();
-                }else{
-                    ksyMediaPlayer.setRotateDegree((rotatenum+90)%360);
-                    rotatenum += 90;
-                }
-                break;
-            case R.id.btn_screen_player:
-                if (useHwCodec){
-                    Toast.makeText(VideoPlayerActivity.this, "截图请设置软解", Toast.LENGTH_SHORT).show();
-                }else{
-                    Bitmap bitmap = ksyMediaPlayer.getScreenShot();
-                    savebitmap(bitmap);
-                    if(bitmap!=null){
-                        Toast.makeText(VideoPlayerActivity.this, "截图成功", Toast.LENGTH_SHORT).show();
-                    }
-                }
-                break;
-            case R.id.btn_mute_player:
-                if(ksyMediaPlayer!=null){
-                    if(mmute == false){
-                        ksyMediaPlayer.setPlayerMute(1);
-                        mmute = true;
-                    }else{
-                        ksyMediaPlayer.setPlayerMute(0);
-                        mmute = false;
-                    }
-                }
-            default:
-                break;
-        }
-    }
-
-    public void savebitmap(Bitmap bitmap){
-        File appDir = new File(Environment.getExternalStorageDirectory(),"com.ksy.recordlib.demo.demo");
-        if (!appDir.exists()) {
-            appDir.mkdir();
-        }
-        String fileName = System.currentTimeMillis() + ".jpg";
-        File file = new File(appDir, fileName);
-        try {
-            FileOutputStream fos = new FileOutputStream(file);
-            bitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos);
-            fos.flush();
-            fos.close();
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-}
+package com.ksyun.live.demo.player.activity;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.graphics.Bitmap;
+import android.graphics.SurfaceTexture;
+import android.media.AudioManager;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.Surface;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+import android.view.TextureView;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.SeekBar;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.ksyun.media.player.IMediaPlayer;
+import com.ksyun.media.player.KSYMediaMeta;
+import com.ksyun.media.player.KSYMediaPlayer;
+import com.ksyun.media.player.misc.KSYQosInfo;
+import com.ksyun.live.demo.R;
+import com.ksyun.live.demo.player.model.Strings;
+import com.ksyun.live.demo.player.util.QosObject;
+import com.ksyun.live.demo.player.util.QosThread;
+import com.ksyun.live.demo.player.util.Settings;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Timer;
+import java.util.TimerTask;
+
+public class SurfaceActivity extends Activity implements View.OnClickListener{
+
+    private static final String TAG = "SurfaceActivity";
+
+    public static final int UPDATE_SEEKBAR = 0;
+    public static final int HIDDEN_SEEKBAR = 1;
+    public static final int UPDATE_QOSMESS  = 2;
+    public static final int UPADTE_QOSVIEW = 3;
+
+    private SharedPreferences settings;
+    private String choosedecode;
+    private String choosedebug;
+
+    private Context mContext;
+    private KSYMediaPlayer ksyMediaPlayer;
+    private QosThread mQosThread;
+
+    private Surface mSurface = null;
+    private SurfaceView mVideoSurfaceView = null;
+    private SurfaceHolder mSurfaceHolder = null;
+    private TextureView mVideoTextureView = null;
+    private SurfaceTexture mSurfaceTexture = null;
+
+    private Handler mHandler;
+
+    private LinearLayout mPlayerPanel;
+    private ImageView mPlayerStartBtn;
+    private SeekBar mPlayerSeekbar;
+    private TextView mPlayerPosition;
+    private TextView mLoadText;
+    private TextView mCpu;
+    private TextView mMemInfo;
+    private TextView mVideoResolution;
+    private TextView mVideoBitrate;
+    private TextView mFrameRate;
+    private TextView mVideoBufferTime;
+    private TextView mAudioBufferTime;
+    private TextView mServerIp;
+    private TextView mSdkVersion;
+    private TextView mDNSTime;
+    private TextView mHttpConnectionTime;
+
+    private RelativeLayout toppanel;
+    private Button reload;
+    private Button screen;
+    private Button rotate;
+    private Button mute;
+
+    private Button mPlayerScaleVideo;
+
+    private boolean mPlayerPanelShow = false;
+    private boolean mPause = false;
+    private boolean mmute = false;
+
+    private long mStartTime = 0;
+    private long mPauseStartTime = 0;
+    private long mPausedTime = 0;
+
+    private int mVideoWidth = 0;
+    private int mVideoHeight = 0;
+
+    private int mVideoScaleIndex = 0;
+    boolean useHwCodec = false;
+
+    private Timer timer = null;
+    private TimerTask timerTask= null;
+    private long bits;
+    private KSYQosInfo info;
+    private String cpuUsage;
+    private int pss;
+    private int rotatenum = 0;
+
+
+    private String mDataSource;
+
+    private IMediaPlayer.OnPreparedListener mOnPreparedListener = new IMediaPlayer.OnPreparedListener() {
+        @Override
+        public void onPrepared(IMediaPlayer mp) {
+
+            mVideoWidth = ksyMediaPlayer.getVideoWidth();
+            mVideoHeight = ksyMediaPlayer.getVideoHeight();
+
+            // Set Video Scaling Mode
+            ksyMediaPlayer.setVideoScalingMode(KSYMediaPlayer.VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING);
+
+            //start player
+            ksyMediaPlayer.start();
+
+            //set progress
+            setVideoProgress(0);
+
+            if (mQosThread != null && !mQosThread.isAlive())
+                mQosThread.start();
+
+
+            if(ksyMediaPlayer.getServerAddress() != null)
+                mServerIp.setText("ServerIP: "+ ksyMediaPlayer.getServerAddress());
+
+            //  get meta data
+            Bundle bundle = ksyMediaPlayer.getMediaMeta();
+            KSYMediaMeta meta = KSYMediaMeta.parse(bundle);
+            if (meta != null)
+            {
+                if (meta.mHttpConnectTime > 0) {
+                    double http_connection_time = Double.valueOf(meta.mHttpConnectTime);
+                    mHttpConnectionTime.setText("HTTP Connection Time: " + (int)http_connection_time);
+                }
+
+                int dns_time = meta.mAnalyzeDnsTime;
+                if (dns_time > 0) {
+                    mDNSTime.setText("DNS time: " + dns_time);
+                }
+            }
+
+            mSdkVersion.setText("SDK version: " + ksyMediaPlayer.getVersion());
+
+            mVideoResolution.setText("Resolution:" + ksyMediaPlayer.getVideoWidth() + "x" + ksyMediaPlayer.getVideoHeight());
+
+            mStartTime = System.currentTimeMillis();
+            choosedebug = settings.getString("choose_debug","信息为空");
+            if(choosedebug.isEmpty() || choosedebug.equals(Settings.DEBUGOFF)){
+                Log.e("VideoPlayer","关闭");
+                mSdkVersion.setVisibility(View.GONE);
+                mVideoResolution.setVisibility(View.GONE);
+                mFrameRate.setVisibility(View.GONE);
+                mVideoBitrate.setVisibility(View.GONE);
+                mPlayerPosition.setVisibility(View.GONE);
+                mLoadText.setVisibility(View.GONE);
+                mCpu.setVisibility(View.GONE);
+                mMemInfo.setVisibility(View.GONE);
+                mVideoBufferTime.setVisibility(View.GONE);
+                mAudioBufferTime.setVisibility(View.GONE);
+                mServerIp.setVisibility(View.GONE);
+                mDNSTime.setVisibility(View.GONE);
+                mHttpConnectionTime.setVisibility(View.GONE);
+
+            }else{
+                Log.e("VideoPlayer","开启");
+
+                mSdkVersion.setVisibility(View.VISIBLE);
+                mVideoResolution.setVisibility(View.VISIBLE);
+                mFrameRate.setVisibility(View.VISIBLE);
+                mVideoBitrate.setVisibility(View.VISIBLE);
+                mPlayerPosition.setVisibility(View.VISIBLE);
+                mLoadText.setVisibility(View.VISIBLE);
+                mCpu.setVisibility(View.VISIBLE);
+                mMemInfo.setVisibility(View.VISIBLE);
+                mVideoBufferTime.setVisibility(View.VISIBLE);
+                mAudioBufferTime.setVisibility(View.VISIBLE);
+                mServerIp.setVisibility(View.VISIBLE);
+                mDNSTime.setVisibility(View.VISIBLE);
+                mHttpConnectionTime.setVisibility(View.VISIBLE);
+            }
+        }
+    };
+
+    private IMediaPlayer.OnBufferingUpdateListener mOnBufferingUpdateListener = new IMediaPlayer.OnBufferingUpdateListener() {
+        @Override
+        public void onBufferingUpdate(IMediaPlayer mp, int percent) {
+            long duration = ksyMediaPlayer.getDuration();
+            long progress = duration * percent/100;
+            mPlayerSeekbar.setSecondaryProgress((int)progress);
+        }
+    };
+
+    private IMediaPlayer.OnVideoSizeChangedListener mOnVideoSizeChangeListener = new IMediaPlayer.OnVideoSizeChangedListener() {
+        @Override
+        public void onVideoSizeChanged(IMediaPlayer mp, int width, int height, int sarNum, int sarDen) {
+            if(mVideoWidth > 0 && mVideoHeight > 0) {
+                if(width != mVideoWidth || height != mVideoHeight) {
+                    mVideoWidth = mp.getVideoWidth();
+                    mVideoHeight = mp.getVideoHeight();
+
+                    if(ksyMediaPlayer != null)
+                        ksyMediaPlayer.setVideoScalingMode(KSYMediaPlayer.VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING);
+                }
+            }
+        }
+    };
+
+    private IMediaPlayer.OnSeekCompleteListener mOnSeekCompletedListener = new IMediaPlayer.OnSeekCompleteListener() {
+        @Override
+        public void onSeekComplete(IMediaPlayer mp) {
+            Log.e(TAG, "onSeekComplete...............");
+        }
+    };
+
+    private IMediaPlayer.OnCompletionListener mOnCompletionListener = new IMediaPlayer.OnCompletionListener() {
+        @Override
+        public void onCompletion(IMediaPlayer mp) {
+            Toast.makeText(mContext, "OnCompletionListener, play complete.", Toast.LENGTH_LONG).show();
+            videoPlayEnd();
+        }
+    };
+
+    private IMediaPlayer.OnErrorListener mOnErrorListener = new IMediaPlayer.OnErrorListener() {
+        @Override
+        public boolean onError(IMediaPlayer mp, int what, int extra) {
+            switch (what)
+            {
+                case KSYMediaPlayer.MEDIA_ERROR_UNKNOWN:
+                    Log.e(TAG, "OnErrorListener, Error Unknown:" + what + ",extra:" + extra);
+                    break;
+                default:
+                    Log.e(TAG, "OnErrorListener, Error:" + what + ",extra:" + extra);
+            }
+
+            videoPlayEnd();
+
+            return false;
+        }
+    };
+
+    public IMediaPlayer.OnInfoListener mOnInfoListener = new IMediaPlayer.OnInfoListener() {
+        @Override
+        public boolean onInfo(IMediaPlayer iMediaPlayer, int i, int i1) {
+            switch (i) {
+                case KSYMediaPlayer.MEDIA_INFO_BUFFERING_START:
+                    Log.d(TAG, "Buffering Start.");
+                    break;
+                case KSYMediaPlayer.MEDIA_INFO_BUFFERING_END:
+                    Log.d(TAG, "Buffering End.");
+                    break;
+                case KSYMediaPlayer.MEDIA_INFO_AUDIO_RENDERING_START:
+                    Toast.makeText(mContext, "Audio Rendering Start", Toast.LENGTH_SHORT).show();
+                    break;
+                case KSYMediaPlayer.MEDIA_INFO_VIDEO_RENDERING_START:
+                    Toast.makeText(mContext, "Video Rendering Start", Toast.LENGTH_SHORT).show();
+                    break;
+                case KSYMediaPlayer.MEDIA_INFO_SUGGEST_RELOAD:
+                    // Player find a new stream(video or audio), and we could reload the video.
+                    if(ksyMediaPlayer != null)
+                        ksyMediaPlayer.reload(mDataSource, false);
+                    break;
+                case KSYMediaPlayer.MEDIA_INFO_RELOADED:
+                    Toast.makeText(mContext, "Succeed to reload video.", Toast.LENGTH_SHORT).show();
+                    Log.d(TAG, "Succeed to reload video.");
+                    return false;
+            }
+            return false;
+        }
+    };
+
+    private IMediaPlayer.OnLogEventListener mOnLogEventListener = new IMediaPlayer.OnLogEventListener() {
+        @Override
+        public void onLogEvent(IMediaPlayer iMediaPlayer, String s) {
+            Log.e(TAG, "OnLogEventListener:"+s);
+        }
+    };
+
+    private View.OnClickListener mVideoScaleButton = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            int mode = mVideoScaleIndex % 2;
+            mVideoScaleIndex++;
+            mHandler.removeMessages(HIDDEN_SEEKBAR);
+            Message msg = new Message();
+            msg.what = HIDDEN_SEEKBAR;
+            mHandler.sendMessageDelayed(msg,3000);
+            if(ksyMediaPlayer != null) {
+                if(mode == 1)
+                    ksyMediaPlayer.setVideoScalingMode(KSYMediaPlayer.VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING);
+                else
+                    ksyMediaPlayer.setVideoScalingMode(KSYMediaPlayer.VIDEO_SCALING_MODE_SCALE_TO_FIT);
+            }
+        }
+    };
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mContext = this.getApplicationContext();
+        useHwCodec = getIntent().getBooleanExtra("HWCodec",false);
+
+        setContentView(R.layout.activity_surface);
+
+        mPlayerPanel = (LinearLayout) findViewById(R.id.player_panel);
+        mPlayerStartBtn = (ImageView) findViewById(R.id.player_start);
+        mPlayerSeekbar = (SeekBar) findViewById(R.id.player_seekbar);
+        mPlayerPosition = (TextView) findViewById(R.id.player_time);
+        mLoadText = (TextView) findViewById(R.id.loading_text);
+        mCpu = (TextView) findViewById(R.id.player_cpu);
+        mMemInfo = (TextView) findViewById(R.id.player_mem);
+        mVideoResolution = (TextView) findViewById(R.id.player_re);
+        mVideoBitrate = (TextView) findViewById(R.id.player_br);
+        mFrameRate = (TextView) findViewById(R.id.player_fr);
+        mVideoBufferTime = (TextView) findViewById(R.id.player_video_time);
+        mAudioBufferTime = (TextView) findViewById(R.id.player_audio_time);
+        mServerIp = (TextView) findViewById(R.id.player_ip);
+        mSdkVersion = (TextView) findViewById(R.id.player_sdk_version);
+        mDNSTime = (TextView) findViewById(R.id.player_dns_time);
+        mHttpConnectionTime = (TextView) findViewById(R.id.player_http_connection_time);
+
+        toppanel = (RelativeLayout)findViewById(R.id.topPanel_player);
+        reload = (Button)findViewById(R.id.player_reload);
+        rotate = (Button)findViewById(R.id.btn_rotate_player);
+        screen = (Button)findViewById(R.id.btn_screen_player);
+        mute = (Button)findViewById(R.id.btn_mute_player);
+        reload.setOnClickListener(this);
+        rotate.setOnClickListener(this);
+        screen.setOnClickListener(this);
+        mute.setOnClickListener(this);
+
+
+        mPlayerScaleVideo = (Button) findViewById(R.id.player_scale);
+        mPlayerScaleVideo.setOnClickListener(mVideoScaleButton);
+
+        mPlayerStartBtn.setOnClickListener(mStartBtnListener);
+        mPlayerSeekbar.setOnSeekBarChangeListener(mSeekBarListener);
+        mPlayerSeekbar.setEnabled(true);
+
+
+        mVideoSurfaceView = (SurfaceView) findViewById(R.id.player_surface);
+        mSurfaceHolder = mVideoSurfaceView.getHolder();
+        mSurfaceHolder.addCallback(mSurfaceCallback);
+        mVideoSurfaceView.setOnTouchListener(mTouchListener);
+        mVideoSurfaceView.setKeepScreenOn(true);
+
+        this.setVolumeControlStream(AudioManager.STREAM_MUSIC);
+
+
+        mHandler = new Handler(){
+            @Override
+            public void handleMessage(Message msg) {
+                super.handleMessage(msg);
+                switch (msg.what) {
+                    case UPDATE_SEEKBAR:
+                        setVideoProgress(0);
+                        break;
+                    case HIDDEN_SEEKBAR:
+                        mPlayerPanelShow = false;
+                        mPlayerPanel.setVisibility(View.GONE);
+                        toppanel.setVisibility(View.GONE);
+                        break;
+                    case UPDATE_QOSMESS:
+                        if(msg.obj instanceof QosObject) {
+                            updateQosInfo((QosObject)msg.obj);
+                        }
+                        break;
+                    case UPADTE_QOSVIEW:
+                        updateQosView();
+                        break;
+                }
+            }
+        };
+
+        if(timerTask ==null){
+            timerTask = new TimerTask() {
+                @Override
+                public void run() {
+                    try{
+                        Message message = new Message();
+                        message.what = SurfaceActivity.UPADTE_QOSVIEW;
+                        if(mHandler != null && message!=null){
+                            mHandler.sendMessage(message);
+                        }
+                    }catch(NullPointerException e){
+                        e.printStackTrace();
+                    }
+                }
+            };
+        }
+
+        if(timer == null){
+            timer = new Timer(true);
+        }
+
+        timer.schedule(timerTask,2000,5000);
+
+        mQosThread = new QosThread(mContext, mHandler);
+
+        mDataSource = getIntent().getStringExtra("path");
+
+        ksyMediaPlayer = new KSYMediaPlayer.Builder(mContext).build();
+        ksyMediaPlayer.setOnBufferingUpdateListener(mOnBufferingUpdateListener);
+        ksyMediaPlayer.setOnCompletionListener(mOnCompletionListener);
+        ksyMediaPlayer.setOnPreparedListener(mOnPreparedListener);
+        ksyMediaPlayer.setOnInfoListener(mOnInfoListener);
+        ksyMediaPlayer.setOnVideoSizeChangedListener(mOnVideoSizeChangeListener);
+        ksyMediaPlayer.setOnErrorListener(mOnErrorListener);
+        ksyMediaPlayer.setOnSeekCompleteListener(mOnSeekCompletedListener);
+        ksyMediaPlayer.setOnLogEventListener(mOnLogEventListener);
+        ksyMediaPlayer.setScreenOnWhilePlaying(true);
+        ksyMediaPlayer.setBufferTimeMax(3);
+        ksyMediaPlayer.setTimeout(5, 30);
+        ksyMediaPlayer.native_setLogLevel(KSYMediaPlayer.KSY_LOG_INFO);
+
+        settings = getSharedPreferences("SETTINGS",Context.MODE_PRIVATE);
+        choosedecode = settings.getString("choose_decode","undefind");
+
+
+        if(choosedecode.equals(Settings.USEHARD)){
+            useHwCodec = true;
+        }else{
+            useHwCodec = false;
+        }
+
+        if (useHwCodec) {
+            //硬解264&265
+            Log.e(TAG, "Hardware !!!!!!!!");
+            ksyMediaPlayer.setDecodeMode(KSYMediaPlayer.KSYDecodeMode.KSY_DECODE_MODE_AUTO);
+        }
+
+        try {
+            ksyMediaPlayer.setDataSource(mDataSource);
+            ksyMediaPlayer.prepareAsync();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        timer.cancel();
+        mVideoTextureView = null;
+        mSurfaceTexture = null;
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+
+        if(ksyMediaPlayer != null)
+        {
+            ksyMediaPlayer.pause();
+            mPause = true;
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        if(ksyMediaPlayer != null)
+        {
+            ksyMediaPlayer.start();
+            mPause = false;
+        }
+    }
+
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if(keyCode == KeyEvent.KEYCODE_BACK) {
+            videoPlayEnd();
+        }
+
+        return super.onKeyDown(keyCode, event);
+    }
+
+    @Override
+    public int getChangingConfigurations() {
+        return super.getChangingConfigurations();
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+    }
+
+    private void scaleVideoView()
+    {
+        if(ksyMediaPlayer == null || ksyMediaPlayer.getVideoHeight() <= 0 || mVideoSurfaceView == null)
+            return;
+
+        WindowManager wm = this.getWindowManager();
+        int sw = wm.getDefaultDisplay().getWidth();
+        int sh = wm.getDefaultDisplay().getHeight();
+        int videoWidth = mVideoWidth;
+        int videoHeight = mVideoHeight;
+        int visibleWidth = 0;
+        int visibleHeight = 0;
+
+        if(getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT)
+        {
+            visibleWidth = sw > sh ? sh : sw;
+            visibleHeight = (int) Math.ceil(visibleWidth * videoHeight / videoWidth);
+        }
+        else if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
+
+            if(videoHeight*sw > videoWidth*sh)
+            {
+                visibleHeight = sh;
+                visibleWidth = (int) Math.ceil(videoWidth * visibleHeight / videoHeight);
+            }
+            else
+            {
+                visibleWidth = sw;
+                visibleHeight = (int) Math.ceil(visibleWidth * videoHeight / videoWidth);
+            }
+        }
+
+        ViewGroup.LayoutParams lp = mVideoSurfaceView.getLayoutParams();
+        lp.width = visibleWidth;
+        lp.height = visibleHeight;
+        mVideoSurfaceView.setLayoutParams(lp);
+
+        mVideoSurfaceView.invalidate();
+    }
+
+    // Maybe we could support gesture detect
+    private void dealTouchEvent(View view, MotionEvent event) {
+        mPlayerPanelShow = !mPlayerPanelShow;
+
+        if(mPlayerPanelShow) {
+            mPlayerPanel.setVisibility(View.VISIBLE);
+            toppanel.setVisibility(View.VISIBLE);
+
+            Message msg = new Message();
+            msg.what = HIDDEN_SEEKBAR;
+            mHandler.sendMessageDelayed(msg, 3000);
+        }else{
+            mPlayerPanel.setVisibility(View.GONE);
+            toppanel.setVisibility(View.GONE);
+            mHandler.removeMessages(HIDDEN_SEEKBAR);
+        }
+    }
+
+    public int setVideoProgress(int currentProgress) {
+
+        if(ksyMediaPlayer == null)
+            return -1;
+
+        long time = currentProgress > 0 ? currentProgress : ksyMediaPlayer.getCurrentPosition();
+        long length = ksyMediaPlayer.getDuration();
+
+        // Update all view elements
+        mPlayerSeekbar.setMax((int)length);
+        mPlayerSeekbar.setProgress((int)time);
+
+        if(time >= 0)
+        {
+            String progress = Strings.millisToString(time) + "/" + Strings.millisToString(length);
+            mPlayerPosition.setText(progress);
+        }
+
+        Message msg = new Message();
+        msg.what = UPDATE_SEEKBAR;
+
+        if(mHandler != null)
+            mHandler.sendMessageDelayed(msg, 1000);
+        return (int)time;
+    }
+
+    private void updateQosInfo(QosObject obj) {
+        cpuUsage = obj.cpuUsage;
+        pss = obj.pss;
+
+
+        if(ksyMediaPlayer != null)
+        {
+            bits = ksyMediaPlayer.getDecodedDataSize() * 8 / (mPause ? mPauseStartTime - mPausedTime - mStartTime : System.currentTimeMillis() - mPausedTime - mStartTime);
+
+            info = ksyMediaPlayer.getStreamQosInfo();
+        }
+    }
+
+    private void updateQosView(){
+        mCpu.setText("Cpu usage:"+cpuUsage);
+        mMemInfo.setText("Memory:" + pss + " KB");
+
+        if(ksyMediaPlayer != null) {
+            mVideoBitrate.setText("Bitrate: " + bits + " kb/s");
+            mFrameRate.setText("VideoOutputFrameRate:" + ksyMediaPlayer.getVideoOutputFramesPerSecond());
+
+            if(info != null) {
+                mVideoBufferTime.setText("VideoBufferTime:" + info.videoBufferTimeLength + "(ms)");
+                mAudioBufferTime.setText("AudioBufferTime:" + info.audioBufferTimeLength + "(ms)");
+            }
+        }
+    }
+
+    private String md5(String string)
+    {
+        byte[] hash;
+        try {
+            hash = MessageDigest.getInstance("MD5").digest(string.getBytes());
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException("Huh, MD5 should be supported?", e);
+        }
+
+        StringBuilder hex = new StringBuilder(hash.length * 2);
+        for (byte b : hash) {
+            if ((b & 0xFF) < 0x10) hex.append("0");
+            hex.append(Integer.toHexString(b & 0xFF));
+        }
+
+        return hex.toString();
+    }
+
+    private void videoPlayEnd() {
+        if(ksyMediaPlayer != null)
+        {
+            ksyMediaPlayer.release();
+            ksyMediaPlayer = null;
+        }
+
+        if(mQosThread != null) {
+            mQosThread.stopThread();
+            mQosThread = null;
+        }
+
+        mHandler = null;
+
+        finish();
+    }
+
+    private View.OnClickListener mStartBtnListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            mPause = !mPause;
+            mHandler.removeMessages(HIDDEN_SEEKBAR);
+            Message msg = new Message();
+            msg.what = HIDDEN_SEEKBAR;
+            mHandler.sendMessageDelayed(msg,3000);
+            if(mPause) {
+                mPlayerStartBtn.setBackgroundResource(R.drawable.qyvideo_pause_btn);
+                ksyMediaPlayer.pause();
+                mPauseStartTime = System.currentTimeMillis();
+            }else {
+                mPlayerStartBtn.setBackgroundResource(R.drawable.qyvideo_start_btn);
+                ksyMediaPlayer.start();
+                mPausedTime += System.currentTimeMillis() - mPauseStartTime;
+                mPauseStartTime = 0;
+            }
+        }
+    };
+
+    private int mVideoProgress = 0;
+    private SeekBar.OnSeekBarChangeListener mSeekBarListener = new SeekBar.OnSeekBarChangeListener() {
+        @Override
+        public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+            if(fromUser) {
+                mVideoProgress = progress;
+                mHandler.removeMessages(HIDDEN_SEEKBAR);
+                Message msg = new Message();
+                msg.what = HIDDEN_SEEKBAR;
+                mHandler.sendMessageDelayed(msg,3000);
+            }
+        }
+
+        @Override
+        public void onStartTrackingTouch(SeekBar seekBar) {
+
+        }
+
+        @Override
+        public void onStopTrackingTouch(SeekBar seekBar) {
+            ksyMediaPlayer.seekTo(mVideoProgress);
+            setVideoProgress(mVideoProgress);
+        }
+    };
+
+    private View.OnTouchListener mTouchListener = new View.OnTouchListener() {
+        @Override
+        public boolean onTouch(View v, MotionEvent event) {
+            dealTouchEvent(v, event);
+            return false;
+        }
+    };
+
+    private final SurfaceHolder.Callback mSurfaceCallback = new SurfaceHolder.Callback() {
+        @Override
+        public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
+            if(ksyMediaPlayer != null && ksyMediaPlayer.isPlaying())
+                ksyMediaPlayer.setVideoScalingMode(KSYMediaPlayer.VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING);
+        }
+
+        @Override
+        public void surfaceCreated(SurfaceHolder holder) {
+            if(ksyMediaPlayer != null)
+                ksyMediaPlayer.setDisplay(holder);
+        }
+
+        @Override
+        public void surfaceDestroyed(SurfaceHolder holder) {
+            Log.d(TAG, "surfaceDestroyed");
+            if(ksyMediaPlayer != null) {
+                ksyMediaPlayer.setDisplay(null);
+            }
+        }
+    };
+
+
+    @Override
+    public void onClick(View view) {
+        mHandler.removeMessages(HIDDEN_SEEKBAR);
+        Message msg = new Message();
+        msg.what = HIDDEN_SEEKBAR;
+        mHandler.sendMessageDelayed(msg,3000);
+        switch (view.getId()){
+            case R.id.player_reload:
+                String mVideoUrl2 = "rtmp://live.hkstv.hk.lxdns.com/live/hks";
+                // 播放新的视频
+                ksyMediaPlayer.reload(mVideoUrl2, true);
+
+                break;
+            case R.id.btn_rotate_player:
+                if (useHwCodec){
+                    Toast.makeText(SurfaceActivity.this, "旋屏请设置软解", Toast.LENGTH_SHORT).show();
+                }else{
+                    ksyMediaPlayer.setRotateDegree((rotatenum+90)%360);
+                    rotatenum += 90;
+                }
+                break;
+            case R.id.btn_screen_player:
+                if (useHwCodec){
+                    Toast.makeText(SurfaceActivity.this, "截图请设置软解", Toast.LENGTH_SHORT).show();
+                }else{
+                    Bitmap bitmap = ksyMediaPlayer.getScreenShot();
+                    savebitmap(bitmap);
+                    if(bitmap!=null){
+                        Toast.makeText(SurfaceActivity.this, "截图成功", Toast.LENGTH_SHORT).show();
+                    }
+                }
+                break;
+            case R.id.btn_mute_player:
+                if(ksyMediaPlayer!=null){
+                    if(mmute == false){
+                        ksyMediaPlayer.setPlayerMute(1);
+                        mmute = true;
+                    }else{
+                        ksyMediaPlayer.setPlayerMute(0);
+                        mmute = false;
+                    }
+                }
+            default:
+                break;
+        }
+    }
+
+    public void savebitmap(Bitmap bitmap){
+        File appDir = new File(Environment.getExternalStorageDirectory(),"com.ksy.recordlib.demo.demo");
+        if (!appDir.exists()) {
+            appDir.mkdir();
+        }
+        String fileName = System.currentTimeMillis() + ".jpg";
+        File file = new File(appDir, fileName);
+        try {
+            FileOutputStream fos = new FileOutputStream(file);
+            bitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos);
+            fos.flush();
+            fos.close();
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/TextureSurfaceRenderer.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/TextureSurfaceRenderer.java
new file mode 100755
index 0000000..e7c1886
--- /dev/null
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/TextureSurfaceRenderer.java
@@ -0,0 +1,172 @@
+package com.ksyun.live.demo.player.activity;
+
+import android.graphics.SurfaceTexture;
+import android.opengl.EGL14;
+import android.opengl.GLUtils;
+import android.util.Log;
+
+import javax.microedition.khronos.egl.EGL10;
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.egl.EGLContext;
+import javax.microedition.khronos.egl.EGLDisplay;
+import javax.microedition.khronos.egl.EGLSurface;
+
+
+public abstract class TextureSurfaceRenderer implements Runnable {
+    public static String LOG_TAG = TextureSurfaceRenderer.class.getSimpleName();
+
+    protected final SurfaceTexture surfaceTexture;
+    protected int width;
+    protected int height;
+
+    private EGL10 egl;
+    private EGLContext eglContext;
+    private EGLDisplay eglDisplay;
+    private EGLSurface eglSurface;
+
+
+    /***
+     * 是否正在绘制(draw)
+     */
+    private boolean running = false;
+
+    public TextureSurfaceRenderer(SurfaceTexture surfaceTexture, int width, int height) {
+        this.surfaceTexture = surfaceTexture;
+        Log.e("TAG", "surfaceTexture obj="+ surfaceTexture.toString());
+        this.width = width;
+        this.height = height;
+        this.running = true;
+        Thread thread = new Thread(this);
+        thread.start();
+    }
+
+    @Override
+    public void run() {
+        initEGL();
+        initGLComponents();
+        Log.d(LOG_TAG, "OpenGL init OK. start draw...");
+
+        while (running) {
+            if (draw()) {
+                egl.eglSwapBuffers(eglDisplay, eglSurface);
+            }
+        }
+
+        deinitGLComponents();
+        deinitEGL();
+    }
+
+    private void initEGL() {
+        Log.d(LOG_TAG, "OpenGL initEGL 1111.");
+        egl = (EGL10) EGLContext.getEGL();
+        //获取显示设备
+        eglDisplay = egl.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY);
+        //version中存放EGL 版本号，int[0]为主版本号，int[1]为子版本号
+        int version[] = new int[2];
+        egl.eglInitialize(eglDisplay, version);
+
+        EGLConfig eglConfig = chooseEglConfig();
+        //创建EGL 的window surface 并且返回它的handles(eslSurface)
+        eglSurface = egl.eglCreateWindowSurface(eglDisplay, eglConfig, surfaceTexture, null);
+
+        eglContext = createContext(egl, eglDisplay, eglConfig);
+
+        //设置当前的渲染环境
+        try {
+            if (eglSurface == null || eglSurface == EGL10.EGL_NO_SURFACE) {
+                throw new RuntimeException("GL error:" + GLUtils.getEGLErrorString(egl.eglGetError()));
+            }
+            if (!egl.eglMakeCurrent(eglDisplay, eglSurface, eglSurface, eglContext)) {
+                throw new RuntimeException("GL Make current Error"+ GLUtils.getEGLErrorString(egl.eglGetError()));
+            }
+        }catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void deinitEGL() {
+        egl.eglMakeCurrent(eglDisplay, EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_CONTEXT);
+        egl.eglDestroySurface(eglDisplay, eglSurface);
+        egl.eglDestroyContext(eglDisplay, eglContext);
+        egl.eglTerminate(eglDisplay);
+        Log.d(LOG_TAG, "OpenGL deinit OK.");
+    }
+
+    /**
+     * 主要的绘制函数， 需在子类中去实现绘制
+     */
+    protected abstract boolean draw();
+
+    /***
+     * 初始化opengl的一些组件比如vertextBuffer,sharders,textures等，
+     * 通常在Opengl context 初始化以后被调用，需要子类去实现
+     */
+    protected abstract void initGLComponents();
+    protected abstract void deinitGLComponents();
+
+    public abstract SurfaceTexture getVideoTexture();
+    public abstract void resize(int w,int h);
+
+    /**
+     * 为当前渲染的API创建一个渲染上下文
+     * @return a handle to the context
+     */
+    private EGLContext createContext(EGL10 egl, EGLDisplay eglDisplay, EGLConfig eglConfig) {
+        int[] attrs = {
+                EGL14.EGL_CONTEXT_CLIENT_VERSION, 2,
+                EGL10.EGL_NONE
+        };
+        return egl.eglCreateContext(eglDisplay, eglConfig, EGL10.EGL_NO_CONTEXT, attrs);
+    }
+
+    /***
+     *  refer to https://www.khronos.org/registry/egl/sdk/docs/man/
+     * @return a EGL frame buffer configurations that match specified attributes
+     */
+    private EGLConfig chooseEglConfig() {
+        int[] configsCount = new int[1];
+        EGLConfig[] configs = new EGLConfig[1];
+        int[] attributes = getAttributes();
+        int confSize = 1;
+
+        if (!egl.eglChooseConfig(eglDisplay, attributes, configs, confSize, configsCount)) {    //获取满足attributes的config个数
+            throw new IllegalArgumentException("Failed to choose config:"+ GLUtils.getEGLErrorString(egl.eglGetError()));
+        }
+        else if (configsCount[0] > 0) {
+            return configs[0];
+        }
+
+        return null;
+    }
+
+    /**
+     * 构造绘制需要的特性列表,ARGB,DEPTH...
+     */
+    private int[] getAttributes()
+    {
+        return new int[] {
+                EGL10.EGL_RENDERABLE_TYPE, EGL14.EGL_OPENGL_ES2_BIT,  //指定渲染api类别
+                EGL10.EGL_RED_SIZE, 8,
+                EGL10.EGL_GREEN_SIZE, 8,
+                EGL10.EGL_BLUE_SIZE, 8,
+                EGL10.EGL_ALPHA_SIZE, 8,
+                EGL10.EGL_DEPTH_SIZE, 0,
+                EGL10.EGL_STENCIL_SIZE, 0,
+                EGL10.EGL_NONE      //总是以EGL10.EGL_NONE结尾
+        };
+    }
+
+    /**
+     * Call when activity pauses. This stops the rendering thread and deinitializes OpenGL.
+     */
+    public void onPause()
+    {
+        running = false;
+    }
+    
+    @Override
+    protected  void finalize() throws Throwable {
+        super.finalize();
+        running = false;
+    }
+}
diff --git a/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/TextureVideoActivity.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/TextureVideoActivity.java
new file mode 100644
index 0000000..074db6b
--- /dev/null
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/TextureVideoActivity.java
@@ -0,0 +1,602 @@
+package com.ksyun.live.demo.player.activity;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.graphics.Bitmap;
+import android.media.AudioManager;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.SeekBar;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.ksyun.media.player.IMediaPlayer;
+import com.ksyun.media.player.KSYMediaMeta;
+import com.ksyun.media.player.KSYMediaPlayer;
+import com.ksyun.media.player.KSYTextureView;
+import com.ksyun.media.player.misc.KSYQosInfo;
+import com.ksyun.live.demo.R;
+import com.ksyun.live.demo.player.model.Strings;
+import com.ksyun.live.demo.player.util.QosObject;
+import com.ksyun.live.demo.player.util.QosThread;
+import com.ksyun.live.demo.player.util.Settings;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Timer;
+import java.util.TimerTask;
+
+
+
+public class TextureVideoActivity extends Activity implements View.OnClickListener{
+
+    private static final String TAG = "TextureVideoActivity";
+
+    public static final int UPDATE_QOSMESS = 2;
+    public static final int UPADTE_QOSVIEW = 3;
+
+    private SharedPreferences settings;
+    private String choosedecode;
+    private String choosedebug;
+    private Context mContext;
+    private QosThread mQosThread;
+
+    KSYTextureView mVideoView = null;
+    private Handler mHandler;
+
+    private TextView mCpu;
+    private TextView mMemInfo;
+    private TextView mVideoResolution;
+    private TextView mVideoBitrate;
+    private TextView mFrameRate;
+    private TextView mVideoBufferTime;
+    private TextView mAudioBufferTime;
+    private TextView mServerIp;
+    private TextView mSdkVersion;
+    private TextView mDNSTime;
+    private TextView mHttpConnectionTime;
+
+    private RelativeLayout toppanel;
+    private Button reload;
+    private Button screen;
+    private Button rotate;
+    private Button mute;
+    private Button mReplay;
+    private Button mPlayerScaleVideo;
+
+    private boolean mPlayerPanelShow = false;
+    private boolean mPause = false;
+    private boolean mmute = false;
+
+    private long mStartTime = 0;
+    private long mPauseStartTime = 0;
+    private long mPausedTime = 0;
+
+    private int mVideoWidth = 0;
+    private int mVideoHeight = 0;
+
+    private int mVideoScaleIndex = 0;
+    boolean useHwCodec = false;
+
+    private Timer timer = null;
+    private TimerTask timerTask = null;
+    private long bits;
+    private KSYQosInfo info;
+    private String cpuUsage;
+    private int pss;
+    private int rotatenum = 0;
+    private String mDataSource;
+
+    private IMediaPlayer.OnPreparedListener mOnPreparedListener = new IMediaPlayer.OnPreparedListener() {
+        @Override
+        public void onPrepared(IMediaPlayer mp) {
+        Log.d(TAG, "OnPrepared");
+        mVideoWidth = mVideoView.getVideoWidth();
+        mVideoHeight = mVideoView.getVideoHeight();
+
+        // Set Video Scaling Mode
+        mVideoView.setVideoScalingMode(KSYMediaPlayer.VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING);
+
+        if (mQosThread != null && !mQosThread.isAlive())
+            mQosThread.start();
+
+
+        if (mVideoView.getServerAddress() != null)
+            mServerIp.setText("ServerIP: " + mVideoView.getServerAddress());
+
+        //  get meta data
+        Bundle bundle = mVideoView.getMediaMeta();
+        KSYMediaMeta meta = KSYMediaMeta.parse(bundle);
+        if (meta != null) {
+            if (meta.mHttpConnectTime > 0) {
+                double http_connection_time = Double.valueOf(meta.mHttpConnectTime);
+                mHttpConnectionTime.setText("HTTP Connection Time: " + (int) http_connection_time);
+            }
+
+            int dns_time = meta.mAnalyzeDnsTime;
+            if (dns_time > 0) {
+                mDNSTime.setText("DNS time: " + dns_time);
+            }
+        }
+
+        mSdkVersion.setText("SDK version: " + mVideoView.getVersion());
+
+        mVideoResolution.setText("Resolution:" + mVideoView.getVideoWidth() + "x" + mVideoView.getVideoHeight());
+
+        mStartTime = System.currentTimeMillis();
+        choosedebug = settings.getString("choose_debug", "信息为空");
+        if (choosedebug.isEmpty() || choosedebug.equals(Settings.DEBUGOFF)) {
+            Log.e("VideoPlayer", "关闭");
+            mSdkVersion.setVisibility(View.GONE);
+            mVideoResolution.setVisibility(View.GONE);
+            mFrameRate.setVisibility(View.GONE);
+            mVideoBitrate.setVisibility(View.GONE);
+            mCpu.setVisibility(View.GONE);
+            mMemInfo.setVisibility(View.GONE);
+            mVideoBufferTime.setVisibility(View.GONE);
+            mAudioBufferTime.setVisibility(View.GONE);
+            mServerIp.setVisibility(View.GONE);
+            mDNSTime.setVisibility(View.GONE);
+            mHttpConnectionTime.setVisibility(View.GONE);
+
+        } else {
+            Log.e("VideoPlayer", "开启");
+
+            mSdkVersion.setVisibility(View.VISIBLE);
+            mVideoResolution.setVisibility(View.VISIBLE);
+            mFrameRate.setVisibility(View.VISIBLE);
+            mVideoBitrate.setVisibility(View.VISIBLE);
+            mCpu.setVisibility(View.VISIBLE);
+            mMemInfo.setVisibility(View.VISIBLE);
+            mVideoBufferTime.setVisibility(View.VISIBLE);
+            mAudioBufferTime.setVisibility(View.VISIBLE);
+            mServerIp.setVisibility(View.VISIBLE);
+            mDNSTime.setVisibility(View.VISIBLE);
+            mHttpConnectionTime.setVisibility(View.VISIBLE);
+        }
+        }
+    };
+
+    private IMediaPlayer.OnBufferingUpdateListener mOnBufferingUpdateListener = new IMediaPlayer.OnBufferingUpdateListener() {
+        @Override
+        public void onBufferingUpdate(IMediaPlayer mp, int percent) {
+
+        }
+    };
+
+    private IMediaPlayer.OnVideoSizeChangedListener mOnVideoSizeChangeListener = new IMediaPlayer.OnVideoSizeChangedListener() {
+        @Override
+        public void onVideoSizeChanged(IMediaPlayer mp, int width, int height, int sarNum, int sarDen) {
+            if (mVideoWidth > 0 && mVideoHeight > 0) {
+                if (width != mVideoWidth || height != mVideoHeight) {
+                    mVideoWidth = mp.getVideoWidth();
+                    mVideoHeight = mp.getVideoHeight();
+
+                    if (mVideoView != null) {
+                        int mode = mVideoScaleIndex % 2;
+                        mVideoScaleIndex++;
+                        if (mVideoView != null) {
+                            if (mode == 1)
+                                mVideoView.setVideoScalingMode(KSYMediaPlayer.VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING);
+                            else
+                                mVideoView.setVideoScalingMode(KSYMediaPlayer.VIDEO_SCALING_MODE_SCALE_TO_FIT);
+                        }
+                    }
+                }
+            }
+        }
+    };
+
+    private IMediaPlayer.OnSeekCompleteListener mOnSeekCompletedListener = new IMediaPlayer.OnSeekCompleteListener() {
+        @Override
+        public void onSeekComplete(IMediaPlayer mp) {
+            Log.e(TAG, "onSeekComplete...............");
+        }
+    };
+
+    private  IMediaPlayer.OnLogEventListener mOnLogEventListener = new IMediaPlayer.OnLogEventListener() {
+        @Override
+        public void onLogEvent(IMediaPlayer iMediaPlayer, String s) {
+            Log.e(TAG, "onLogEvent : "+ s);
+        }
+    };
+    private IMediaPlayer.OnCompletionListener mOnCompletionListener = new IMediaPlayer.OnCompletionListener() {
+        @Override
+        public void onCompletion(IMediaPlayer mp) {
+            Toast.makeText(mContext, "OnCompletionListener, play complete.", Toast.LENGTH_LONG).show();
+            videoPlayEnd();
+        }
+    };
+
+    private IMediaPlayer.OnErrorListener mOnErrorListener = new IMediaPlayer.OnErrorListener() {
+        @Override
+        public boolean onError(IMediaPlayer mp, int what, int extra) {
+            switch (what) {
+                default:
+                    Log.e(TAG, "OnErrorListener, Error:" + what + ",extra:" + extra);
+            }
+
+            videoPlayEnd();
+            return false;
+        }
+    };
+
+    public IMediaPlayer.OnInfoListener mOnInfoListener = new IMediaPlayer.OnInfoListener() {
+        @Override
+        public boolean onInfo(IMediaPlayer iMediaPlayer, int i, int i1) {
+            switch (i) {
+                case KSYMediaPlayer.MEDIA_INFO_BUFFERING_START:
+                    Log.d(TAG, "Buffering Start.");
+                    break;
+                case KSYMediaPlayer.MEDIA_INFO_BUFFERING_END:
+                    Log.d(TAG, "Buffering End.");
+                    break;
+                case KSYMediaPlayer.MEDIA_INFO_AUDIO_RENDERING_START:
+                    Toast.makeText(mContext, "Audio Rendering Start", Toast.LENGTH_SHORT).show();
+                    break;
+                case KSYMediaPlayer.MEDIA_INFO_VIDEO_RENDERING_START:
+                    Toast.makeText(mContext, "Video Rendering Start", Toast.LENGTH_SHORT).show();
+                    break;
+                case KSYMediaPlayer.MEDIA_INFO_RELOADED:
+                    Toast.makeText(mContext, "Succeed to reload video.", Toast.LENGTH_SHORT).show();
+                    Log.d(TAG, "Succeed to reload video.");
+                    return false;
+            }
+            return false;
+        }
+    };
+
+    private View.OnClickListener mVideoScaleButton = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            int mode = mVideoScaleIndex % 2;
+            mVideoScaleIndex++;
+            if (mVideoView != null) {
+                if (mode == 1)
+                    mVideoView.setVideoScalingMode(KSYMediaPlayer.VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING);
+                else
+                    mVideoView.setVideoScalingMode(KSYMediaPlayer.VIDEO_SCALING_MODE_SCALE_TO_FIT);
+            }
+        }
+    };
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.texture_player);
+
+        mContext = this.getApplicationContext();
+        useHwCodec = getIntent().getBooleanExtra("HWCodec", false);
+
+        mCpu = (TextView) findViewById(R.id.player_cpu);
+        mMemInfo = (TextView) findViewById(R.id.player_mem);
+        mVideoResolution = (TextView) findViewById(R.id.player_re);
+        mVideoBitrate = (TextView) findViewById(R.id.player_br);
+        mFrameRate = (TextView) findViewById(R.id.player_fr);
+        mVideoBufferTime = (TextView) findViewById(R.id.player_video_time);
+        mAudioBufferTime = (TextView) findViewById(R.id.player_audio_time);
+        mServerIp = (TextView) findViewById(R.id.player_ip);
+        mSdkVersion = (TextView) findViewById(R.id.player_sdk_version);
+        mDNSTime = (TextView) findViewById(R.id.player_dns_time);
+        mHttpConnectionTime = (TextView) findViewById(R.id.player_http_connection_time);
+
+        toppanel = (RelativeLayout) findViewById(R.id.topPanel_player);
+        reload = (Button) findViewById(R.id.player_reload);
+        rotate = (Button) findViewById(R.id.btn_rotate_player);
+        screen = (Button) findViewById(R.id.btn_screen_player);
+        mute = (Button) findViewById(R.id.btn_mute_player);
+        mReplay = (Button) findViewById(R.id.btn_replay);
+
+        reload.setOnClickListener(this);
+        rotate.setOnClickListener(this);
+        screen.setOnClickListener(this);
+        mute.setOnClickListener(this);
+        mReplay.setOnClickListener(this);
+
+        mPlayerScaleVideo = (Button) findViewById(R.id.player_scale);
+        mPlayerScaleVideo.setOnClickListener(mVideoScaleButton);
+
+        mVideoView = (KSYTextureView) findViewById(R.id.texture_view);
+        mVideoView.setOnTouchListener(mTouchListener);
+        mVideoView.setKeepScreenOn(true);
+        this.setVolumeControlStream(AudioManager.STREAM_MUSIC);
+
+        mHandler = new Handler() {
+            @Override
+            public void handleMessage(Message msg) {
+                super.handleMessage(msg);
+                switch (msg.what) {
+                    case UPDATE_QOSMESS:
+                        if (msg.obj instanceof QosObject) {
+                            updateQosInfo((QosObject) msg.obj);
+                        }
+                        break;
+                    case UPADTE_QOSVIEW:
+                        updateQosView();
+                        break;
+                }
+            }
+        };
+
+        if (timerTask == null) {
+            timerTask = new TimerTask() {
+                @Override
+                public void run() {
+                    try {
+                        Message message = new Message();
+                        message.what = TextureVideoActivity.UPADTE_QOSVIEW;
+                        if (mHandler != null && message != null) {
+                            mHandler.sendMessage(message);
+                        }
+                    } catch (NullPointerException e) {
+                        e.printStackTrace();
+                    }
+
+                }
+            };
+        }
+
+        if (timer == null) {
+            timer = new Timer(true);
+        }
+
+        timer.schedule(timerTask, 2000, 5000);
+
+        mQosThread = new QosThread(mContext, mHandler);
+
+        mDataSource = getIntent().getStringExtra("path");
+
+        mVideoView.setOnBufferingUpdateListener(mOnBufferingUpdateListener);
+        mVideoView.setOnCompletionListener(mOnCompletionListener);
+        mVideoView.setOnPreparedListener(mOnPreparedListener);
+        mVideoView.setOnInfoListener(mOnInfoListener);
+        mVideoView.setOnVideoSizeChangedListener(mOnVideoSizeChangeListener);
+        mVideoView.setOnErrorListener(mOnErrorListener);
+        mVideoView.setOnSeekCompleteListener(mOnSeekCompletedListener);
+        mVideoView.setOnLogEventListener(mOnLogEventListener);
+        mVideoView.setScreenOnWhilePlaying(true);
+        mVideoView.setBufferTimeMax(2.0f);
+        mVideoView.setTimeout(5, 30);
+
+        MediaController mctl = (MediaController) findViewById(R.id.media_control);
+        mVideoView.setMediaController(mctl);
+        //mVideoView.setMediaController(new MediaController(TextureVideoActivity.this));
+
+        settings = getSharedPreferences("SETTINGS", Context.MODE_PRIVATE);
+        choosedecode = settings.getString("choose_decode", "undefind");
+
+        if (choosedecode.equals(Settings.USEHARD)) {
+            useHwCodec = true;
+        } else {
+            useHwCodec = false;
+        }
+
+        if (useHwCodec) {
+            //硬解264&265
+            Log.e(TAG, "Hardware !!!!!!!!");
+            mVideoView.setDecodeMode(KSYMediaPlayer.KSYDecodeMode.KSY_DECODE_MODE_AUTO);
+        }
+        else {
+            Log.e(TAG, "Software !!!!!!!!");
+            mVideoView.setDecodeMode(KSYMediaPlayer.KSYDecodeMode.KSY_DECODE_MODE_SOFTWARE);
+        }
+
+        try {
+            mVideoView.setDataSource(mDataSource);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        mVideoView.prepareAsync();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        timer.cancel();
+        mVideoView = null;
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+
+        if (mVideoView != null) {
+            mVideoView.runInBackground(true);
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (mVideoView != null) {
+            mVideoView.runInForeground();
+        }
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_BACK) {
+            videoPlayEnd();
+        }
+
+        return super.onKeyDown(keyCode, event);
+    }
+
+    @Override
+    public int getChangingConfigurations() {
+        return super.getChangingConfigurations();
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+    }
+
+    // Maybe we could support gesture detect
+    private void dealTouchEvent(View view, MotionEvent event) {
+        mPlayerPanelShow = !mPlayerPanelShow;
+        toppanel.setVisibility(View.VISIBLE);
+    }
+
+    private void updateQosInfo(QosObject obj) {
+        cpuUsage = obj.cpuUsage;
+        pss = obj.pss;
+
+        if (mVideoView != null) {
+            bits = mVideoView.getDecodedDataSize() * 8 / (mPause ? mPauseStartTime - mPausedTime - mStartTime : System.currentTimeMillis() - mPausedTime - mStartTime);
+
+            info = mVideoView.getStreamQosInfo();
+
+        }
+    }
+
+    private void updateQosView() {
+        mCpu.setText("Cpu usage:" + cpuUsage);
+        mMemInfo.setText("Memory:" + pss + " KB");
+
+        if (mVideoView != null) {
+            mVideoBitrate.setText("Bitrate: " + bits + " kb/s");
+            mFrameRate.setText("VideoOutputFrameRate:" + mVideoView.getVideoOutputFramesPerSecond());
+
+            if (info != null) {
+                mVideoBufferTime.setText("VideoBufferTime:" + info.videoBufferTimeLength + "(ms)");
+                mAudioBufferTime.setText("AudioBufferTime:" + info.audioBufferTimeLength + "(ms)");
+            }
+        }
+    }
+
+    private String md5(String string) {
+        byte[] hash;
+        try {
+            hash = MessageDigest.getInstance("MD5").digest(string.getBytes());
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException("Huh, MD5 should be supported?", e);
+        }
+
+        StringBuilder hex = new StringBuilder(hash.length * 2);
+        for (byte b : hash) {
+            if ((b & 0xFF) < 0x10) hex.append("0");
+            hex.append(Integer.toHexString(b & 0xFF));
+        }
+
+        return hex.toString();
+    }
+
+    private void videoPlayEnd() {
+        if (mVideoView != null) {
+            mVideoView.release();
+            mVideoView = null;
+        }
+
+        if (mQosThread != null) {
+            mQosThread.stopThread();
+            mQosThread = null;
+        }
+
+        mHandler = null;
+
+        finish();
+    }
+
+    private View.OnTouchListener mTouchListener = new View.OnTouchListener() {
+        @Override
+        public boolean onTouch(View v, MotionEvent event) {
+            dealTouchEvent(v, event);
+            return false;
+        }
+    };
+
+
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.player_reload:
+                String mVideoUrl2 = "rtmp://live.hkstv.hk.lxdns.com/live/hks";
+                // 播放新的视频
+                mVideoView.reload(mVideoUrl2, true);
+
+                break;
+            case R.id.btn_rotate_player:
+            {
+                mVideoView.setRotateDegree((rotatenum + 90) % 360);
+                rotatenum += 90;
+            }
+            break;
+            case R.id.btn_screen_player:
+            {
+                Bitmap bitmap = mVideoView.getScreenShot();
+                savebitmap(bitmap);
+                if (bitmap != null) {
+                    Toast.makeText(TextureVideoActivity.this, "截图成功", Toast.LENGTH_SHORT).show();
+                }
+            }
+            break;
+            case R.id.btn_mute_player:
+                if (mVideoView != null) {
+                    if (mmute == false) {
+                        mVideoView.setPlayerMute(1);
+                        mmute = true;
+                    } else {
+                        mVideoView.setPlayerMute(0);
+                        mmute = false;
+                    }
+                }
+                break;
+            case R.id.btn_replay:
+                if (mVideoView != null){
+                    mVideoView.stop();
+                    //mVideoView.reset();
+                    mVideoView.softReset();
+                    if (useHwCodec) {
+                        mVideoView.setDecodeMode(KSYMediaPlayer.KSYDecodeMode.KSY_DECODE_MODE_AUTO);
+                    }
+                    //other settings.....
+                    try {
+                        mVideoView.setDataSource("http://cxy.kss.ksyun.com/S09E14.mp4");
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                    mVideoView.prepareAsync();
+                }
+                break;
+            default:
+                break;
+        }
+    }
+
+    public void savebitmap(Bitmap bitmap) {
+        File appDir = new File(Environment.getExternalStorageDirectory(), "com.ksy.recordlib.demo.demo");
+        if (!appDir.exists()) {
+            appDir.mkdir();
+        }
+        String fileName = System.currentTimeMillis() + ".jpg";
+        File file = new File(appDir, fileName);
+        try {
+            FileOutputStream fos = new FileOutputStream(file);
+            bitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos);
+            fos.flush();
+            fos.close();
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/TextureViewMediaActivity.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/TextureViewMediaActivity.java
new file mode 100755
index 0000000..9ed6af1
--- /dev/null
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/TextureViewMediaActivity.java
@@ -0,0 +1,170 @@
+package com.ksyun.live.demo.player.activity;
+
+import android.app.Activity;
+import android.graphics.SurfaceTexture;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.Surface;
+import android.view.TextureView;
+
+import com.ksyun.live.demo.R;
+import com.ksyun.media.player.IMediaPlayer;
+import com.ksyun.media.player.KSYMediaPlayer;
+
+import java.io.IOException;
+
+public class TextureViewMediaActivity extends Activity implements TextureView.SurfaceTextureListener,
+        IMediaPlayer.OnPreparedListener{
+    private static final String TAG = "GLRender";
+    private  String videoPath= "rtmp://live.hkstv.hk.lxdns.com/live/hks";
+    private TextureView textureView;
+    private KSYMediaPlayer mediaPlayer;
+
+    private TextureSurfaceRenderer videoRenderer;
+    private SurfaceTexture mSurfaceTexture;
+    private int surfaceWidth;
+    private int surfaceHeight;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.glrender_view_layout);
+
+        videoPath = getIntent().getStringExtra("path");
+
+        textureView = (TextureView) findViewById(R.id.id_textureview);
+        textureView.setSurfaceTextureListener(this);
+
+    }
+
+    private void playVideo(SurfaceTexture surfaceTexture) {
+        videoRenderer = new VideoTextureSurfaceRenderer(this, surfaceTexture, surfaceWidth, surfaceHeight);
+        initMediaPlayer( surfaceTexture);
+    }
+
+    private void initMediaPlayer(SurfaceTexture surfaceTexture) {
+        try {
+            this.mediaPlayer = new KSYMediaPlayer.Builder(getApplicationContext()).build();
+
+            while (videoRenderer.getVideoTexture() == null) {
+                try {
+                    Thread.sleep(100);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            }
+
+            Surface surface = new Surface(videoRenderer.getVideoTexture());
+            mediaPlayer.setDataSource(videoPath);
+            mediaPlayer.setSurface(surface);
+            mediaPlayer.setScreenOnWhilePlaying(true);
+
+            mediaPlayer.setDecodeMode(KSYMediaPlayer.KSYDecodeMode.KSY_DECODE_MODE_SOFTWARE);
+
+            mediaPlayer.prepareAsync();
+            mediaPlayer.setOnPreparedListener(this);
+            mediaPlayer.setLooping(true);
+        } catch (IllegalArgumentException e1) {
+            // TODO Auto-generated catch block
+            e1.printStackTrace();
+        } catch (SecurityException e1) {
+            // TODO Auto-generated catch block
+            e1.printStackTrace();
+        } catch (IllegalStateException e1) {
+            // TODO Auto-generated catch block
+            e1.printStackTrace();
+        } catch (IOException e1) {
+            // TODO Auto-generated catch block
+            e1.printStackTrace();
+        }
+    }
+    @Override
+    public void onPrepared(IMediaPlayer mp) {
+        try {
+            if (mediaPlayer != null) {
+                mediaPlayer.setVideoScalingMode(KSYMediaPlayer.VIDEO_SCALING_MODE_SCALE_TO_FIT);
+                mediaPlayer.start();
+            }
+        } catch (IllegalStateException e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    @Override
+    protected void onResume() {
+        Log.e(TAG, "GLViewMediaActivity::onResume()");
+        super.onResume();
+        if (mediaPlayer != null) {
+            mediaPlayer.start();
+            if(videoRenderer == null)
+            {
+                playVideo(mSurfaceTexture);
+            }
+        }
+    }
+
+
+    @Override
+    protected void onStart()
+    {
+        super.onStart();
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        if (videoRenderer != null) {
+            videoRenderer.onPause();
+            videoRenderer = null;
+        }
+        if (mediaPlayer != null) {
+            mediaPlayer.pause();
+        }
+    }
+
+    @Override
+    protected void onStop()
+    {
+        super.onStop();
+    }
+
+    @Override
+    protected void onDestroy()
+    {
+        super.onDestroy();
+        if (mediaPlayer != null) {
+            mediaPlayer.release();
+            mediaPlayer =null;
+        }
+    }
+
+
+    @Override
+    public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
+        ///Log.e( TAG, "GLViewMediaActivity::onSurfaceTextureAvailable()"+ " tName:" + Thread.currentThread().getName() + "  tid:");
+        surfaceWidth = width;
+        surfaceHeight = height;
+        playVideo(surface);
+        mSurfaceTexture = surface;
+    }
+
+    @Override
+    public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) {
+        //videoRenderer.getVideoTexture().setDefaultBufferSize(width,height);
+        videoRenderer.resize(width,height);
+    }
+
+    @Override
+    public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
+        return false;
+    }
+
+    @Override
+    public void onSurfaceTextureUpdated(SurfaceTexture surface) {
+
+    }
+
+
+}
diff --git a/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/VideoTextureSurfaceRenderer.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/VideoTextureSurfaceRenderer.java
new file mode 100755
index 0000000..f575914
--- /dev/null
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/activity/VideoTextureSurfaceRenderer.java
@@ -0,0 +1,221 @@
+package com.ksyun.live.demo.player.activity;
+
+
+import android.content.Context;
+import android.graphics.SurfaceTexture;
+import android.opengl.GLES11Ext;
+import android.opengl.GLES20;
+import android.opengl.GLUtils;
+import android.util.Log;
+
+
+import com.ksyun.live.demo.R;
+import com.ksyun.live.demo.player.util.RawResourceReader;
+import com.ksyun.live.demo.player.util.ShaderHelper;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.FloatBuffer;
+import java.nio.ShortBuffer;
+
+public class VideoTextureSurfaceRenderer extends TextureSurfaceRenderer implements
+        SurfaceTexture.OnFrameAvailableListener
+{
+
+    public static final String TAG = VideoTextureSurfaceRenderer.class.getSimpleName();
+
+    /**
+     *
+     */
+    private static float squareSize = 1.0f;
+    private static float squareCoords[] = {
+            -squareSize,  squareSize,   // top left
+            -squareSize, -squareSize,   // bottom left
+            squareSize, -squareSize,    // bottom right
+            squareSize,  squareSize }; // top right
+
+    private static short drawOrder[] = { 0, 1, 2, 0, 2, 3};
+
+    private Context context;
+
+    // Texture to be shown in backgrund
+    private FloatBuffer textureBuffer;
+    private float textureCoords[] = {
+            0.0f, 1.0f, 0.0f, 1.0f,
+            0.0f, 0.0f, 0.0f, 1.0f,
+            1.0f, 0.0f, 0.0f, 1.0f,
+            1.0f, 1.0f, 0.0f, 1.0f };
+    private int[] textures = new int[1];
+
+    private int shaderProgram;
+    private FloatBuffer vertexBuffer;
+    private ShortBuffer drawListBuffer;
+
+    private SurfaceTexture videoTexture;
+    private float[] videoTextureTransform;
+    private boolean frameAvailable = false;
+
+    int textureParamHandle;
+    int textureCoordinateHandle;
+    int positionHandle;
+    int textureTranformHandle;
+
+
+    public VideoTextureSurfaceRenderer(Context context, SurfaceTexture texture, int width, int height)
+    {
+        super(texture, width, height);
+        this.context = context;
+        videoTextureTransform = new float[16];
+    }
+
+    private void setupGraphics()
+    {
+        final String vertexShader = RawResourceReader.readTextFileFromRawResource(context, R.raw.vetext_sharder);
+        final String fragmentShader = RawResourceReader.readTextFileFromRawResource(context, R.raw.fragment_sharder);
+
+        final int vertexShaderHandle = ShaderHelper.compileShader(GLES20.GL_VERTEX_SHADER, vertexShader);
+        final int fragmentShaderHandle = ShaderHelper.compileShader(GLES20.GL_FRAGMENT_SHADER, fragmentShader);
+        shaderProgram = ShaderHelper.createAndLinkProgram(vertexShaderHandle, fragmentShaderHandle,
+                new String[]{"texture","vPosition","vTexCoordinate","textureTransform"});
+
+        GLES20.glUseProgram(shaderProgram);
+        textureParamHandle = GLES20.glGetUniformLocation(shaderProgram, "texture");
+        textureCoordinateHandle = GLES20.glGetAttribLocation(shaderProgram, "vTexCoordinate");
+        positionHandle = GLES20.glGetAttribLocation(shaderProgram, "vPosition");
+        textureTranformHandle = GLES20.glGetUniformLocation(shaderProgram, "textureTransform");
+    }
+
+    private void setupVertexBuffer()
+    {
+        // Draw list buffer
+        ByteBuffer dlb = ByteBuffer.allocateDirect(drawOrder. length * 2);
+        dlb.order(ByteOrder.nativeOrder());
+        drawListBuffer = dlb.asShortBuffer();
+        drawListBuffer.put(drawOrder);
+        drawListBuffer.position(0);
+
+        // Initialize the texture holder
+        ByteBuffer bb = ByteBuffer.allocateDirect(squareCoords.length * 4);
+        bb.order(ByteOrder.nativeOrder());
+
+        vertexBuffer = bb.asFloatBuffer();
+        vertexBuffer.put(squareCoords);
+        vertexBuffer.position(0);
+    }
+
+    private void setupTexture()
+    {
+        ByteBuffer texturebb = ByteBuffer.allocateDirect(textureCoords.length * 4);
+        texturebb.order(ByteOrder.nativeOrder());
+
+        textureBuffer = texturebb.asFloatBuffer();
+        textureBuffer.put(textureCoords);
+        textureBuffer.position(0);
+
+        // Generate the actual texture
+        GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
+        GLES20.glGenTextures(1, textures, 0);
+        checkGlError("Texture generate");
+
+        GLES20.glBindTexture(GLES11Ext.GL_TEXTURE_EXTERNAL_OES, textures[0]);
+        checkGlError("Texture bind");
+        Log.d(TAG,"new SurfaceTexture");
+        videoTexture = new SurfaceTexture(textures[0]);
+        videoTexture.setOnFrameAvailableListener(this);
+    }
+
+    @Override
+    protected boolean draw()
+    {
+        synchronized (this)
+        {
+            //Log.e(TAG,"VideoTextureSurfaceRenderer draw");
+            if (frameAvailable)
+            {
+                videoTexture.updateTexImage();
+                videoTexture.getTransformMatrix(videoTextureTransform);
+                frameAvailable = false;
+            }
+            else
+            {
+                return false;
+            }
+
+        }
+        GLES20.glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+        GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT);
+
+        GLES20.glViewport(0, 0, width, height);
+        this.drawTexture();
+
+        return true;
+    }
+
+    private void drawTexture() {
+        // Draw texture
+
+        GLES20.glEnableVertexAttribArray(positionHandle);
+        GLES20.glVertexAttribPointer(positionHandle, 2, GLES20.GL_FLOAT, false, 0, vertexBuffer);
+
+        GLES20.glBindTexture(GLES11Ext.GL_TEXTURE_EXTERNAL_OES, textures[0]);
+        GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
+        GLES20.glUniform1i(textureParamHandle, 0);
+
+        GLES20.glEnableVertexAttribArray(textureCoordinateHandle);
+        GLES20.glVertexAttribPointer(textureCoordinateHandle, 4, GLES20.GL_FLOAT, false, 0, textureBuffer);
+
+        GLES20.glUniformMatrix4fv(textureTranformHandle, 1, false, videoTextureTransform, 0);
+
+        GLES20.glDrawElements(GLES20.GL_TRIANGLE_STRIP, drawOrder.length, GLES20.GL_UNSIGNED_SHORT, drawListBuffer);
+        GLES20.glDisableVertexAttribArray(positionHandle);
+        GLES20.glDisableVertexAttribArray(textureCoordinateHandle);
+    }
+
+
+    @Override
+    protected void initGLComponents()
+    {
+        Log.d(LOG_TAG, "OpenGL initGLComponents11.");
+        setupVertexBuffer();
+        setupTexture();
+        setupGraphics();
+    }
+
+    @Override
+    protected void deinitGLComponents()
+    {
+        GLES20.glDeleteTextures(1, textures, 0);
+        GLES20.glDeleteProgram(shaderProgram);
+        videoTexture.release();
+        videoTexture.setOnFrameAvailableListener(null);
+    }
+
+
+    public void checkGlError(String op)
+    {
+        int error;
+        while ((error = GLES20.glGetError()) != GLES20.GL_NO_ERROR) {
+            Log.e("SurfaceTest", op + ": glError " + GLUtils.getEGLErrorString(error));
+        }
+    }
+
+    public void resize(int width, int height) {
+        this.width = width;
+        this.height = height;
+    }
+
+    @Override
+    public SurfaceTexture getVideoTexture()
+    {
+        return videoTexture;
+    }
+
+    @Override
+    public void onFrameAvailable(SurfaceTexture surfaceTexture)
+    {
+        synchronized (this)
+        {
+            frameAvailable = true;
+        }
+    }
+}
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/model/GetList.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/model/GetList.java
similarity index 96%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/model/GetList.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/model/GetList.java
index 6997fdd..9d5d1cf 100644
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/model/GetList.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/model/GetList.java
@@ -1,9 +1,9 @@
-package com.ksyun.live.demo.model;
+package com.ksyun.live.demo.player.model;
 
 import android.util.Log;
 
-import com.ksyun.live.demo.activity.LocalFragment;
-import com.ksyun.live.demo.util.Video;
+import com.ksyun.live.demo.player.activity.LocalFragment;
+import com.ksyun.live.demo.player.util.Video;
 
 import java.io.File;
 import java.io.FileFilter;
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/model/MyVideoThumbLoader.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/model/MyVideoThumbLoader.java
similarity index 79%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/model/MyVideoThumbLoader.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/model/MyVideoThumbLoader.java
index 2a15fce..c39fa1a 100644
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/model/MyVideoThumbLoader.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/model/MyVideoThumbLoader.java
@@ -1,4 +1,4 @@
-package com.ksyun.live.demo.model;
+package com.ksyun.live.demo.player.model;
 
 import android.annotation.SuppressLint;
 import android.graphics.Bitmap;
@@ -7,6 +7,8 @@
 import android.support.v4.util.LruCache;
 import android.widget.ImageView;
 
+import com.ksyun.media.player.misc.KSYProbeMediaInfo;
+
 /**
  * Created by liubohua on 16/7/15.
  */
@@ -39,22 +41,22 @@ public Bitmap getVideoThumbToCache(String path){
         return lruCache.get(path);
 
     }
-    public void showThumbByAsynctack(String path,ImageView imgview){
+    public void showThumbByAsyncTask(String path, ImageView imgview){
 
         if(getVideoThumbToCache(path) == null){
             //异步加载
-            new MyBobAsynctack(imgview, path).execute(path);
+            new MyBobAsyncTask(imgview, path).execute(path);
         }else{
             imgview.setImageBitmap(getVideoThumbToCache(path));
         }
 
     }
 
-    class MyBobAsynctack extends AsyncTask<String, Void, Bitmap> {
+    class MyBobAsyncTask extends AsyncTask<String, Void, Bitmap> {
         private ImageView imgView;
         private String path;
 
-        public MyBobAsynctack(ImageView imageView,String path) {
+        public MyBobAsyncTask(ImageView imageView, String path) {
             this.imgView = imageView;
             this.path = path;
         }
@@ -62,7 +64,7 @@ public MyBobAsynctack(ImageView imageView,String path) {
 
         @Override
         protected Bitmap doInBackground(String... strings) {
-            Bitmap bitmap = getVideoThumbnail(strings[0]);
+            Bitmap bitmap = getKSYVideoThumbnail(strings[0]);
             return bitmap;
         }
 
@@ -98,4 +100,13 @@ public Bitmap getVideoThumbnail(String filePath) {
         return bitmap;
     }
 
+    public Bitmap getKSYVideoThumbnail(String filePath)
+    {
+        Bitmap bitmap = null;
+        KSYProbeMediaInfo mediaInfo = new KSYProbeMediaInfo();
+        bitmap = mediaInfo.getVideoThumbnailAtTime(filePath, 5*1000, 352, 0);
+
+        return bitmap;
+    }
+
 }
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/model/NetDbAdapter.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/model/NetDbAdapter.java
similarity index 96%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/model/NetDbAdapter.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/model/NetDbAdapter.java
index 400b96c..ca4f820 100644
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/model/NetDbAdapter.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/model/NetDbAdapter.java
@@ -1,10 +1,13 @@
-package com.ksyun.live.demo.model;
+package com.ksyun.live.demo.player.model;
 
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;
+import android.graphics.Path;
+
+import com.ksyun.live.demo.player.model.NetbaseHelper;
 
 import java.util.Calendar;
 
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/model/NetbaseHelper.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/model/NetbaseHelper.java
similarity index 96%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/model/NetbaseHelper.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/model/NetbaseHelper.java
index 185d03b..51a31c8 100644
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/model/NetbaseHelper.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/model/NetbaseHelper.java
@@ -1,4 +1,4 @@
-package com.ksyun.live.demo.model;
+package com.ksyun.live.demo.player.model;
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/model/Strings.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/model/Strings.java
similarity index 99%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/model/Strings.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/model/Strings.java
index dcddcfe..b0cff81 100755
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/model/Strings.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/model/Strings.java
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-package com.ksyun.live.demo.model;
+package com.ksyun.live.demo.player.model;
 
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/util/Application.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/Application.java
similarity index 84%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/util/Application.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/Application.java
index e1a7bcc..bdfcf05 100755
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/util/Application.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/Application.java
@@ -1,4 +1,4 @@
-package com.ksyun.live.demo.util;
+package com.ksyun.live.demo.player.util;
 
 public class Application extends android.app.Application {
     @Override
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/util/AsyncCallback.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/AsyncCallback.java
similarity index 76%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/util/AsyncCallback.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/AsyncCallback.java
index fab1202..5db3fe8 100755
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/util/AsyncCallback.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/AsyncCallback.java
@@ -1,4 +1,4 @@
-package com.ksyun.live.demo.util;
+package com.ksyun.live.demo.player.util;
 
 /**
  * Created by QianYi-Xin on 2015/6/2.
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/util/Cpu.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/Cpu.java
similarity index 95%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/util/Cpu.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/Cpu.java
index bcb6f0a..cd280ce 100755
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/util/Cpu.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/Cpu.java
@@ -1,4 +1,4 @@
-package com.ksyun.live.demo.util;
+package com.ksyun.live.demo.player.util;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/util/Extensions.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/Extensions.java
similarity index 97%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/util/Extensions.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/Extensions.java
index 8c9fd36..bccfd8f 100755
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/util/Extensions.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/Extensions.java
@@ -1,4 +1,4 @@
-package com.ksyun.live.demo.util;
+package com.ksyun.live.demo.player.util;
 
 import java.util.HashSet;
 
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/util/LoadedImage.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/LoadedImage.java
similarity index 86%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/util/LoadedImage.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/LoadedImage.java
index 0f1e50f..2d75401 100644
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/util/LoadedImage.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/LoadedImage.java
@@ -1,4 +1,4 @@
-package com.ksyun.live.demo.util;
+package com.ksyun.live.demo.player.util;
 
 import android.graphics.Bitmap;
 
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/util/PlayerPopupWindow.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/PlayerPopupWindow.java
similarity index 93%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/util/PlayerPopupWindow.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/PlayerPopupWindow.java
index e1c59e5..ee1bf17 100755
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/util/PlayerPopupWindow.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/PlayerPopupWindow.java
@@ -1,4 +1,4 @@
-package com.ksyun.live.demo.util;
+package com.ksyun.live.demo.player.util;
 
 import android.app.Activity;
 import android.graphics.Bitmap;
@@ -12,7 +12,7 @@
 import android.widget.TextView;
 
 import com.ksyun.live.demo.R;
-import com.ksyun.live.demo.activity.SettingActivity;
+import com.ksyun.live.demo.player.activity.SettingActivity;
 
 
 /**
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/util/QosObject.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/QosObject.java
similarity index 76%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/util/QosObject.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/QosObject.java
index 4214243..5a83a9b 100755
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/util/QosObject.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/QosObject.java
@@ -1,4 +1,4 @@
-package com.ksyun.live.demo.util;
+package com.ksyun.live.demo.player.util;
 
 /**
  * Created by QianYi-Xin on 2015/6/1.
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/util/QosThread.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/QosThread.java
similarity index 62%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/util/QosThread.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/QosThread.java
index 39d72a3..836b3ad 100755
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/util/QosThread.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/QosThread.java
@@ -1,43 +1,41 @@
-package com.ksyun.live.demo.util;
+package com.ksyun.live.demo.player.util;
 
-import android.app.ActivityManager;
 import android.content.Context;
 import android.os.Debug;
 import android.os.Handler;
 
-import com.ksyun.live.demo.activity.VideoPlayerActivity;
+import com.ksyun.live.demo.player.activity.TextureVideoActivity;
 
 
 /**
- * Created by QianYi-Xin on 2015/6/1.
+ * @author xinbaicheng@kingsoft.com
+ * 2016/7/27.
  */
 public class QosThread extends Thread {
 
     private Context mContext;
     private Handler mHandler;
     private Cpu mCpuStats;
-    private ActivityManager mActivityManager;
     private Debug.MemoryInfo mi;
     private QosObject mQosObject;
+    private String mPackageName;
 
     private boolean mRunning;
 
-    public QosThread(ActivityManager manager, Handler handler,Context mContext) {
+    public QosThread(Context context, Handler handler) {
         mHandler = handler;
         mCpuStats = new Cpu();
-        mActivityManager = manager;
         mi = new Debug.MemoryInfo();
         mRunning = true;
         mQosObject = new QosObject();
-        if(mContext!=null){
-            this.mContext = mContext;
-        }
+        if(context != null)
+            mPackageName = context.getPackageName();
     }
 
     @Override
     public void run() {
         while(mRunning) {
-            mCpuStats.parseTopResults(mContext.getPackageName());
+            mCpuStats.parseTopResults(mPackageName);
 
             Debug.getMemoryInfo(mi);
 
@@ -45,7 +43,7 @@ public void run() {
                 mQosObject.cpuUsage = mCpuStats.getProcessCpuUsage();
                 mQosObject.pss = mi.getTotalPss();
                 mQosObject.vss = mi.getTotalPrivateDirty();
-                mHandler.obtainMessage(VideoPlayerActivity.UPDATE_QOSMESS, mQosObject).sendToTarget();
+                mHandler.obtainMessage(TextureVideoActivity.UPDATE_QOSMESS, mQosObject).sendToTarget();
             }
             try {
                 sleep(3);
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/util/QyDataBase.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/QyDataBase.java
similarity index 94%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/util/QyDataBase.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/QyDataBase.java
index 847a366..5158cfe 100755
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/util/QyDataBase.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/QyDataBase.java
@@ -1,4 +1,4 @@
-package com.ksyun.live.demo.util;
+package com.ksyun.live.demo.player.util;
 
 import android.content.Context;
 
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/util/QyDataBaseHelper.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/QyDataBaseHelper.java
similarity index 98%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/util/QyDataBaseHelper.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/QyDataBaseHelper.java
index da53000..0ddab47 100755
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/util/QyDataBaseHelper.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/QyDataBaseHelper.java
@@ -1,4 +1,4 @@
-package com.ksyun.live.demo.util;
+package com.ksyun.live.demo.player.util;
 
 import android.content.ContentValues;
 import android.content.Context;
diff --git a/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/RawResourceReader.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/RawResourceReader.java
new file mode 100755
index 0000000..f636e04
--- /dev/null
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/RawResourceReader.java
@@ -0,0 +1,40 @@
+package com.ksyun.live.demo.player.util;
+
+import android.content.Context;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+
+public class RawResourceReader
+{
+	public static String readTextFileFromRawResource(final Context context,
+													 final int resourceId)
+	{
+		final InputStream inputStream = context.getResources().openRawResource(
+				resourceId);
+		final InputStreamReader inputStreamReader = new InputStreamReader(
+				inputStream);
+		final BufferedReader bufferedReader = new BufferedReader(
+				inputStreamReader);
+
+		String nextLine;
+		final StringBuilder body = new StringBuilder();
+
+		try
+		{
+			while ((nextLine = bufferedReader.readLine()) != null)
+			{
+				body.append(nextLine);
+				body.append('\n');
+			}
+		}
+		catch (IOException e)
+		{
+			return null;
+		}
+
+		return body.toString();
+	}
+}
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/util/Settings.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/Settings.java
similarity index 64%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/util/Settings.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/Settings.java
index 834b67b..a0bf5dc 100644
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/util/Settings.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/Settings.java
@@ -1,16 +1,14 @@
-package com.ksyun.live.demo.util;
+package com.ksyun.live.demo.player.util;
 
 /**
  * Created by liubohua on 16/7/18.
  */
-
 public class Settings {
     public static final String USESUFACE="usesufaceview";
-    public static final String USETEXTURE="usetextureview";
+    public static final String USEKSYTEXTURE="useksytextureview";
+    public static final String USEKGLRENDER="useglrender";
     public static final String USEHARD="useharddecode";
     public static final String USESOFT="usesoftdecode";
     public static final String DEBUGON="debugon";
     public static final String DEBUGOFF="debugoff";
-    public static final String VROFF = "vroff";
-    public static final String VRON = "vron";
 }
diff --git a/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/ShaderHelper.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/ShaderHelper.java
new file mode 100755
index 0000000..235130e
--- /dev/null
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/ShaderHelper.java
@@ -0,0 +1,103 @@
+package com.ksyun.live.demo.player.util;
+
+import android.opengl.GLES20;
+import android.util.Log;
+
+public class ShaderHelper
+{
+	private static final String TAG = "ShaderHelper";
+	
+	/** 
+	 * Helper function to compile a shader.
+	 * 
+	 * @param shaderType The shader type.
+	 * @param shaderSource The shader source code.
+	 * @return An OpenGL handle to the shader.
+	 */
+	public static int compileShader(final int shaderType, final String shaderSource)
+	{
+		int shaderHandle = GLES20.glCreateShader(shaderType);
+
+		if (shaderHandle != 0) 
+		{
+			// Pass in the shader source.
+			GLES20.glShaderSource(shaderHandle, shaderSource);
+
+			// Compile the shader.
+			GLES20.glCompileShader(shaderHandle);
+
+			// Get the compilation status.
+			final int[] compileStatus = new int[1];
+			GLES20.glGetShaderiv(shaderHandle, GLES20.GL_COMPILE_STATUS, compileStatus, 0);
+
+			// If the compilation failed, delete the shader.
+			if (compileStatus[0] == 0) 
+			{
+				Log.e(TAG, "Error compiling shader: " + GLES20.glGetShaderInfoLog(shaderHandle));
+				GLES20.glDeleteShader(shaderHandle);
+				shaderHandle = 0;
+			}
+		}
+
+		if (shaderHandle == 0)
+		{			
+			throw new RuntimeException("Error creating shader.");
+		}
+		
+		return shaderHandle;
+	}
+	
+	/**
+	 * Helper function to compile and link a program.
+	 * 
+	 * @param vertexShaderHandle An OpenGL handle to an already-compiled vertex shader.
+	 * @param fragmentShaderHandle An OpenGL handle to an already-compiled fragment shader.
+	 * @param attributes Attributes that need to be bound to the program.
+	 * @return An OpenGL handle to the program.
+	 */
+	public static int createAndLinkProgram(final int vertexShaderHandle, final int fragmentShaderHandle, final String[] attributes)
+	{
+		int programHandle = GLES20.glCreateProgram();
+		
+		if (programHandle != 0) 
+		{
+			// Bind the vertex shader to the program.
+			GLES20.glAttachShader(programHandle, vertexShaderHandle);
+
+			// Bind the fragment shader to the program.
+			GLES20.glAttachShader(programHandle, fragmentShaderHandle);
+			
+			// Bind attributes
+			if (attributes != null)
+			{
+				final int size = attributes.length;
+				for (int i = 0; i < size; i++)
+				{
+					GLES20.glBindAttribLocation(programHandle, i, attributes[i]);
+				}						
+			}
+			
+			// Link the two shaders together into a program.
+			GLES20.glLinkProgram(programHandle);
+
+			// Get the link status.
+			final int[] linkStatus = new int[1];
+			GLES20.glGetProgramiv(programHandle, GLES20.GL_LINK_STATUS, linkStatus, 0);
+
+			// If the link failed, delete the program.
+			if (linkStatus[0] == 0) 
+			{				
+				Log.e(TAG, "Error compiling program: " + GLES20.glGetProgramInfoLog(programHandle));
+				GLES20.glDeleteProgram(programHandle);
+				programHandle = 0;
+			}
+		}
+		
+		if (programHandle == 0)
+		{
+			throw new RuntimeException("Error creating program.");
+		}
+		
+		return programHandle;
+	}
+}
diff --git a/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/TextureHelper.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/TextureHelper.java
new file mode 100755
index 0000000..d8a4cb4
--- /dev/null
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/TextureHelper.java
@@ -0,0 +1,45 @@
+package com.ksyun.live.demo.player.util;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.opengl.GLES20;
+import android.opengl.GLUtils;
+
+public class TextureHelper {
+	public static int loadTexture(final Context context, final int resourceId) {
+		final int[] textureHandle = new int[1];
+
+		GLES20.glGenTextures(1, textureHandle, 0);
+
+		if (textureHandle[0] != 0) {
+			final BitmapFactory.Options options = new BitmapFactory.Options();
+			options.inScaled = false; // No pre-scaling
+
+			// Read in the resource
+			final Bitmap bitmap = BitmapFactory.decodeResource(
+					context.getResources(), resourceId, options);
+
+			// Bind to the texture in OpenGL
+			GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, textureHandle[0]);
+
+			// Set filtering
+			GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D,
+					GLES20.GL_TEXTURE_MIN_FILTER, GLES20.GL_NEAREST);
+			GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D,
+					GLES20.GL_TEXTURE_MAG_FILTER, GLES20.GL_NEAREST);
+
+			// Load the bitmap into the bound texture.
+			GLUtils.texImage2D(GLES20.GL_TEXTURE_2D, 0, bitmap, 0);
+
+			// Recycle the bitmap, since its data has been loaded into OpenGL.
+			bitmap.recycle();
+		}
+
+		if (textureHandle[0] == 0) {
+			throw new RuntimeException("Error loading texture.");
+		}
+
+		return textureHandle[0];
+	}
+}
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/util/Video.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/Video.java
similarity index 96%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/util/Video.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/Video.java
index b668f13..97d31f5 100644
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/util/Video.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/util/Video.java
@@ -1,4 +1,6 @@
-package com.ksyun.live.demo.util;
+package com.ksyun.live.demo.player.util;
+
+import com.ksyun.live.demo.player.util.LoadedImage;
 
 import java.io.Serializable;
 
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/camera/AutoFocusCallback.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/camera/AutoFocusCallback.java
similarity index 96%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/camera/AutoFocusCallback.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/camera/AutoFocusCallback.java
index ee6ae19..833ecba 100644
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/camera/AutoFocusCallback.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/camera/AutoFocusCallback.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ksyun.live.demo.zxing.camera;
+package com.ksyun.live.demo.player.zxing.camera;
 
 import android.hardware.Camera;
 import android.os.Handler;
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/camera/CameraConfigurationManager.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/camera/CameraConfigurationManager.java
similarity index 99%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/camera/CameraConfigurationManager.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/camera/CameraConfigurationManager.java
index 24aa015..7a7061f 100644
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/camera/CameraConfigurationManager.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/camera/CameraConfigurationManager.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ksyun.live.demo.zxing.camera;
+package com.ksyun.live.demo.player.zxing.camera;
 
 import android.content.Context;
 import android.graphics.Point;
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/camera/CameraManager.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/camera/CameraManager.java
similarity index 99%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/camera/CameraManager.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/camera/CameraManager.java
index 970ef34..94b64df 100644
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/camera/CameraManager.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/camera/CameraManager.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ksyun.live.demo.zxing.camera;
+package com.ksyun.live.demo.player.zxing.camera;
 
 import android.content.Context;
 import android.graphics.PixelFormat;
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/camera/FlashlightManager.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/camera/FlashlightManager.java
similarity index 98%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/camera/FlashlightManager.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/camera/FlashlightManager.java
index d3b1f3e..da097c2 100644
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/camera/FlashlightManager.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/camera/FlashlightManager.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ksyun.live.demo.zxing.camera;
+package com.ksyun.live.demo.player.zxing.camera;
 
 import android.os.IBinder;
 import android.util.Log;
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/camera/PlanarYUVLuminanceSource.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/camera/PlanarYUVLuminanceSource.java
similarity index 98%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/camera/PlanarYUVLuminanceSource.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/camera/PlanarYUVLuminanceSource.java
index ffcc470..39c50b4 100644
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/camera/PlanarYUVLuminanceSource.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/camera/PlanarYUVLuminanceSource.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ksyun.live.demo.zxing.camera;
+package com.ksyun.live.demo.player.zxing.camera;
 
 import android.graphics.Bitmap;
 
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/camera/PreviewCallback.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/camera/PreviewCallback.java
similarity index 97%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/camera/PreviewCallback.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/camera/PreviewCallback.java
index 7128f1a..9f01471 100644
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/camera/PreviewCallback.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/camera/PreviewCallback.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ksyun.live.demo.zxing.camera;
+package com.ksyun.live.demo.player.zxing.camera;
 
 import android.graphics.Point;
 import android.hardware.Camera;
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/decoding/CaptureActivityHandler.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/decoding/CaptureActivityHandler.java
similarity index 94%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/decoding/CaptureActivityHandler.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/decoding/CaptureActivityHandler.java
index 31adf5b..0faef0b 100644
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/decoding/CaptureActivityHandler.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/decoding/CaptureActivityHandler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ksyun.live.demo.zxing.decoding;
+package com.ksyun.live.demo.player.zxing.decoding;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -28,9 +28,9 @@
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.Result;
 import com.ksyun.live.demo.R;
-import com.ksyun.live.demo.activity.CaptureActivity;
-import com.ksyun.live.demo.zxing.camera.CameraManager;
-import com.ksyun.live.demo.zxing.view.ViewfinderResultPointCallback;
+import com.ksyun.live.demo.player.activity.CaptureActivity;
+import com.ksyun.live.demo.player.zxing.camera.CameraManager;
+import com.ksyun.live.demo.player.zxing.view.ViewfinderResultPointCallback;
 
 import java.util.Vector;
 
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/decoding/DecodeFormatManager.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/decoding/DecodeFormatManager.java
similarity index 98%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/decoding/DecodeFormatManager.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/decoding/DecodeFormatManager.java
index 8ab7eee..9042b7f 100644
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/decoding/DecodeFormatManager.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/decoding/DecodeFormatManager.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ksyun.live.demo.zxing.decoding;
+package com.ksyun.live.demo.player.zxing.decoding;
 
 import android.content.Intent;
 import android.net.Uri;
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/decoding/DecodeHandler.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/decoding/DecodeHandler.java
similarity index 93%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/decoding/DecodeHandler.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/decoding/DecodeHandler.java
index 671b883..27ff197 100644
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/decoding/DecodeHandler.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/decoding/DecodeHandler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ksyun.live.demo.zxing.decoding;
+package com.ksyun.live.demo.player.zxing.decoding;
 
 import android.os.Bundle;
 import android.os.Handler;
@@ -29,13 +29,14 @@
 import com.google.zxing.Result;
 import com.google.zxing.common.HybridBinarizer;
 import com.ksyun.live.demo.R;
-import com.ksyun.live.demo.activity.CaptureActivity;
-import com.ksyun.live.demo.zxing.camera.CameraManager;
-import com.ksyun.live.demo.zxing.camera.PlanarYUVLuminanceSource;
+import com.ksyun.live.demo.player.activity.CaptureActivity;
+import com.ksyun.live.demo.player.zxing.camera.CameraManager;
+import com.ksyun.live.demo.player.zxing.camera.PlanarYUVLuminanceSource;
 
 import java.util.Hashtable;
 
 
+
 final class DecodeHandler extends Handler {
 
 	private static final String TAG = DecodeHandler.class.getSimpleName();
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/decoding/DecodeThread.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/decoding/DecodeThread.java
similarity index 95%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/decoding/DecodeThread.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/decoding/DecodeThread.java
index e41abee..8921502 100644
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/decoding/DecodeThread.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/decoding/DecodeThread.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ksyun.live.demo.zxing.decoding;
+package com.ksyun.live.demo.player.zxing.decoding;
 
 import android.os.Handler;
 import android.os.Looper;
@@ -22,13 +22,14 @@
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.DecodeHintType;
 import com.google.zxing.ResultPointCallback;
-import com.ksyun.live.demo.activity.CaptureActivity;
+import com.ksyun.live.demo.player.activity.CaptureActivity;
 
 import java.util.Hashtable;
 import java.util.Vector;
 import java.util.concurrent.CountDownLatch;
 
 
+
 final class DecodeThread extends Thread {
 
   public static final String BARCODE_BITMAP = "barcode_bitmap";
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/decoding/FinishListener.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/decoding/FinishListener.java
similarity index 96%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/decoding/FinishListener.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/decoding/FinishListener.java
index 71bcdda..cd725ae 100644
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/decoding/FinishListener.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/decoding/FinishListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ksyun.live.demo.zxing.decoding;
+package com.ksyun.live.demo.player.zxing.decoding;
 
 import android.app.Activity;
 import android.content.DialogInterface;
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/decoding/InactivityTimer.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/decoding/InactivityTimer.java
similarity index 97%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/decoding/InactivityTimer.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/decoding/InactivityTimer.java
index 7235187..b030c31 100644
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/decoding/InactivityTimer.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/decoding/InactivityTimer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ksyun.live.demo.zxing.decoding;
+package com.ksyun.live.demo.player.zxing.decoding;
 
 import android.app.Activity;
 
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/decoding/Intents.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/decoding/Intents.java
similarity index 99%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/decoding/Intents.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/decoding/Intents.java
index 159977d..17c3de2 100644
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/decoding/Intents.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/decoding/Intents.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ksyun.live.demo.zxing.decoding;
+package com.ksyun.live.demo.player.zxing.decoding;
 
 /**
  * This class provides the constants to use when sending an Intent to Barcode Scanner.
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/encoding/EncodingHandler.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/encoding/EncodingHandler.java
similarity index 95%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/encoding/EncodingHandler.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/encoding/EncodingHandler.java
index 2353f88..85b4544 100644
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/encoding/EncodingHandler.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/encoding/EncodingHandler.java
@@ -1,4 +1,4 @@
-package com.ksyun.live.demo.zxing.encoding;
+package com.ksyun.live.demo.player.zxing.encoding;
 
 import android.graphics.Bitmap;
 
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/view/ViewfinderResultPointCallback.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/view/ViewfinderResultPointCallback.java
similarity index 95%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/view/ViewfinderResultPointCallback.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/view/ViewfinderResultPointCallback.java
index 68e446a..9a1d183 100644
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/view/ViewfinderResultPointCallback.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/view/ViewfinderResultPointCallback.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ksyun.live.demo.zxing.view;
+package com.ksyun.live.demo.player.zxing.view;
 
 
 import com.google.zxing.ResultPoint;
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/view/ViewfinderView.java b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/view/ViewfinderView.java
similarity index 98%
rename from LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/view/ViewfinderView.java
rename to KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/view/ViewfinderView.java
index c0ee606..48e7924 100644
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/zxing/view/ViewfinderView.java
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/live/demo/player/zxing/view/ViewfinderView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.ksyun.live.demo.zxing.view;
+package com.ksyun.live.demo.player.zxing.view;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -27,7 +27,7 @@
 
 import com.google.zxing.ResultPoint;
 import com.ksyun.live.demo.R;
-import com.ksyun.live.demo.zxing.camera.CameraManager;
+import com.ksyun.live.demo.player.zxing.camera.CameraManager;
 
 import java.util.Collection;
 import java.util.HashSet;
diff --git a/KSYLiveDemo/app/src/main/java/com/ksyun/media/streamer/demo/CameraActivity.java b/KSYLiveDemo/app/src/main/java/com/ksyun/media/streamer/demo/CameraActivity.java
new file mode 100644
index 0000000..4b89417
--- /dev/null
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/media/streamer/demo/CameraActivity.java
@@ -0,0 +1,822 @@
+package com.ksyun.media.streamer.demo;
+
+import com.ksyun.live.demo.R;
+import android.Manifest;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageManager;
+import android.graphics.Color;
+import android.hardware.Camera;
+import android.opengl.GLSurfaceView;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.SystemClock;
+import android.support.annotation.NonNull;
+import android.support.v4.app.ActivityCompat;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.CheckBox;
+import android.widget.Chronometer;
+import android.widget.CompoundButton;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.ksyun.media.streamer.capture.camera.CameraTouchHelper;
+import com.ksyun.media.streamer.filter.audio.AudioFilterBase;
+import com.ksyun.media.streamer.filter.audio.AudioReverbFilter;
+import com.ksyun.media.streamer.filter.imgtex.ImgTexFilter;
+import com.ksyun.media.streamer.filter.imgtex.ImgTexFilterBase;
+import com.ksyun.media.streamer.filter.imgtex.ImgTexFilterMgt;
+import com.ksyun.media.streamer.kit.KSYStreamer;
+import com.ksyun.media.streamer.kit.OnAudioRawDataListener;
+import com.ksyun.media.streamer.kit.OnPreviewFrameListener;
+import com.ksyun.media.streamer.kit.StreamerConstants;
+import com.ksyun.media.streamer.logstats.StatsLogReport;
+import com.ksyun.media.streamer.util.audio.KSYBgmPlayer;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Timer;
+import java.util.TimerTask;
+
+public class CameraActivity extends Activity implements
+        ActivityCompat.OnRequestPermissionsResultCallback {
+
+    private static final String TAG = "CameraActivity";
+
+    private GLSurfaceView mCameraPreviewView;
+    //private TextureView mCameraPreviewView;
+    private CameraHintView mCameraHintView;
+    private Chronometer mChronometer;
+    private View mDeleteView;
+    private View mSwitchCameraView;
+    private View mFlashView;
+    private TextView mShootingText;
+    private CheckBox mWaterMarkCheckBox;
+    private CheckBox mBeautyCheckBox;
+    private CheckBox mReverbCheckBox;
+    private CheckBox mAudioPreviewCheckBox;
+    private CheckBox mBgmCheckBox;
+    private CheckBox mMuteCheckBox;
+    private CheckBox mAudioOnlyCheckBox;
+    private CheckBox mFrontMirrorCheckBox;
+    private TextView mUrlTextView;
+    private TextView mDebugInfoTextView;
+
+    private ButtonObserver mObserverButton;
+    private CheckBoxObserver mCheckBoxObserver;
+
+    private KSYStreamer mStreamer;
+    private Handler mMainHandler;
+    private Timer mTimer;
+
+    private boolean mAutoStart;
+    private boolean mIsLandscape;
+    private boolean mPrintDebugInfo = false;
+    private boolean mRecording = false;
+    private boolean isFlashOpened = false;
+    private String mUrl;
+    private String mDebugInfo = "";
+    private String mBgmPath = "/sdcard/test.mp3";
+    private String mLogoPath = "file:///sdcard/test.png";
+
+    private boolean mHWEncoderUnsupported;
+    private boolean mSWEncoderUnsupported;
+
+    private final static int PERMISSION_REQUEST_CAMERA_AUDIOREC = 1;
+    private static final String START_STRING = "开始直播";
+    private static final String STOP_STRING = "停止直播";
+
+    public final static String URL = "url";
+    public final static String FRAME_RATE = "framerate";
+    public final static String VIDEO_BITRATE = "video_bitrate";
+    public final static String AUDIO_BITRATE = "audio_bitrate";
+    public final static String VIDEO_RESOLUTION = "video_resolution";
+    public final static String LANDSCAPE = "landscape";
+    public final static String ENCDODE_METHOD = "encode_method";
+    public final static String START_ATUO = "start_auto";
+    public static final String SHOW_DEBUGINFO = "show_debuginfo";
+
+    public static void startActivity(Context context, int fromType,
+                                     String rtmpUrl, int frameRate,
+                                     int videoBitrate, int audioBitrate,
+                                     int videoResolution, boolean isLandscape,
+                                     int encodeMethod, boolean startAuto,
+                                     boolean showDebugInfo) {
+        Intent intent = new Intent(context, CameraActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        intent.putExtra("type", fromType);
+        intent.putExtra(URL, rtmpUrl);
+        intent.putExtra(FRAME_RATE, frameRate);
+        intent.putExtra(VIDEO_BITRATE, videoBitrate);
+        intent.putExtra(AUDIO_BITRATE, audioBitrate);
+        intent.putExtra(VIDEO_RESOLUTION, videoResolution);
+        intent.putExtra(LANDSCAPE, isLandscape);
+        intent.putExtra(ENCDODE_METHOD, encodeMethod);
+        intent.putExtra(START_ATUO, startAuto);
+        intent.putExtra(SHOW_DEBUGINFO, showDebugInfo);
+        context.startActivity(intent);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        requestWindowFeature(Window.FEATURE_NO_TITLE);
+
+        setContentView(R.layout.camera_activity);
+        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
+                WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+
+        mCameraHintView = (CameraHintView) findViewById(R.id.camera_hint);
+        mCameraPreviewView = (GLSurfaceView) findViewById(R.id.camera_preview);
+        //mCameraPreviewView = (TextureView) findViewById(R.id.camera_preview);
+        mUrlTextView = (TextView) findViewById(R.id.url);
+        mChronometer = (Chronometer) findViewById(R.id.chronometer);
+        mDebugInfoTextView = (TextView) findViewById(R.id.debuginfo);
+
+        mObserverButton = new ButtonObserver();
+        mShootingText = (TextView) findViewById(R.id.click_to_shoot);
+        mShootingText.setOnClickListener(mObserverButton);
+        mDeleteView = findViewById(R.id.backoff);
+        mDeleteView.setOnClickListener(mObserverButton);
+        mSwitchCameraView = findViewById(R.id.switch_cam);
+        mSwitchCameraView.setOnClickListener(mObserverButton);
+        mFlashView = findViewById(R.id.flash);
+        mFlashView.setOnClickListener(mObserverButton);
+
+        mCheckBoxObserver = new CheckBoxObserver();
+        mBeautyCheckBox = (CheckBox) findViewById(R.id.click_to_switch_beauty);
+        mBeautyCheckBox.setOnCheckedChangeListener(mCheckBoxObserver);
+        mReverbCheckBox = (CheckBox) findViewById(R.id.click_to_select_audio_filter);
+        mReverbCheckBox.setOnCheckedChangeListener(mCheckBoxObserver);
+        mBgmCheckBox = (CheckBox) findViewById(R.id.bgm);
+        mBgmCheckBox.setOnCheckedChangeListener(mCheckBoxObserver);
+        mAudioPreviewCheckBox = (CheckBox) findViewById(R.id.ear_mirror);
+        mAudioPreviewCheckBox.setOnCheckedChangeListener(mCheckBoxObserver);
+        mMuteCheckBox = (CheckBox) findViewById(R.id.mute);
+        mMuteCheckBox.setOnCheckedChangeListener(mCheckBoxObserver);
+        mWaterMarkCheckBox = (CheckBox) findViewById(R.id.watermark);
+        mWaterMarkCheckBox.setOnCheckedChangeListener(mCheckBoxObserver);
+        mFrontMirrorCheckBox = (CheckBox) findViewById(R.id.front_camera_mirror);
+        mFrontMirrorCheckBox.setOnCheckedChangeListener(mCheckBoxObserver);
+        mAudioOnlyCheckBox = (CheckBox) findViewById(R.id.audio_only);
+        mAudioOnlyCheckBox.setOnCheckedChangeListener(mCheckBoxObserver);
+
+        mMainHandler = new Handler();
+        mStreamer = new KSYStreamer(this);
+        Bundle bundle = getIntent().getExtras();
+        if (bundle != null) {
+            String url = bundle.getString(URL);
+            if (!TextUtils.isEmpty(url)) {
+                mUrl = url;
+                mUrlTextView.setText(mUrl);
+                mStreamer.setUrl(url);
+            }
+
+            int frameRate = bundle.getInt(FRAME_RATE, 0);
+            if (frameRate > 0) {
+                mStreamer.setPreviewFps(frameRate);
+                mStreamer.setTargetFps(frameRate);
+            }
+
+            int videoBitrate = bundle.getInt(VIDEO_BITRATE, 0);
+            if (videoBitrate > 0) {
+                mStreamer.setVideoKBitrate(videoBitrate * 3 / 4, videoBitrate, videoBitrate / 4);
+            }
+
+            int audioBitrate = bundle.getInt(AUDIO_BITRATE, 0);
+            if (audioBitrate > 0) {
+                mStreamer.setAudioKBitrate(audioBitrate);
+            }
+
+            int videoResolution = bundle.getInt(VIDEO_RESOLUTION, 0);
+            mStreamer.setPreviewResolution(videoResolution);
+            mStreamer.setTargetResolution(videoResolution);
+
+            int encode_method = bundle.getInt(ENCDODE_METHOD);
+            mStreamer.setEncodeMethod(encode_method);
+
+            mIsLandscape = bundle.getBoolean(LANDSCAPE, false);
+            mStreamer.setRotateDegrees(mIsLandscape ? 90 : 0);
+            if (mIsLandscape) {
+                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+            } else {
+                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+            }
+
+            mAutoStart = bundle.getBoolean(START_ATUO, false);
+            mPrintDebugInfo = bundle.getBoolean(SHOW_DEBUGINFO, false);
+        }
+        mStreamer.setDisplayPreview(mCameraPreviewView);
+        mStreamer.setEnableStreamStatModule(true);
+        mStreamer.enableDebugLog(true);
+        mStreamer.setFrontCameraMirror(mFrontMirrorCheckBox.isChecked());
+        mStreamer.setMuteAudio(mMuteCheckBox.isChecked());
+        mStreamer.setEnableAudioPreview(mAudioPreviewCheckBox.isChecked());
+        mStreamer.setOnInfoListener(mOnInfoListener);
+        mStreamer.setOnErrorListener(mOnErrorListener);
+        mStreamer.setOnLogEventListener(mOnLogEventListener);
+        //mStreamer.setOnAudioRawDataListener(mOnAudioRawDataListener);
+        //mStreamer.setOnPreviewFrameListener(mOnPreviewFrameListener);
+        mStreamer.getImgTexFilterMgt().setFilter(mStreamer.getGLRender(),
+                ImgTexFilterMgt.KSY_FILTER_BEAUTY_DENOISE);
+        mStreamer.setEnableImgBufBeauty(true);
+        mStreamer.getImgTexFilterMgt().setOnErrorListener(new ImgTexFilterBase.OnErrorListener() {
+            @Override
+            public void onError(ImgTexFilterBase filter, int errno) {
+                Toast.makeText(CameraActivity.this, "当前机型不支持该滤镜",
+                        Toast.LENGTH_SHORT).show();
+                mStreamer.getImgTexFilterMgt().setFilter(mStreamer.getGLRender(),
+                        ImgTexFilterMgt.KSY_FILTER_BEAUTY_DISABLE);
+            }
+        });
+
+        // touch focus and zoom support
+        CameraTouchHelper cameraTouchHelper = new CameraTouchHelper();
+        cameraTouchHelper.setCameraCapture(mStreamer.getCameraCapture());
+        mCameraPreviewView.setOnTouchListener(cameraTouchHelper);
+        // set CameraHintView to show focus rect and zoom ratio
+        cameraTouchHelper.setCameraHintView(mCameraHintView);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        startCameraPreviewWithPermCheck();
+        mStreamer.onResume();
+        if (mStreamer.isRecording() && !mAudioOnlyCheckBox.isChecked()) {
+            mStreamer.setAudioOnly(false);
+        }
+        if (mWaterMarkCheckBox.isChecked()) {
+            showWaterMark();
+        }
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mStreamer.onPause();
+        mStreamer.stopCameraPreview();
+        if (mStreamer.isRecording() && !mAudioOnlyCheckBox.isChecked()) {
+            mStreamer.setAudioOnly(true);
+        }
+        hideWaterMark();
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if (mMainHandler != null) {
+            mMainHandler.removeCallbacksAndMessages(null);
+            mMainHandler = null;
+        }
+        if (mTimer != null) {
+            mTimer.cancel();
+        }
+        mStreamer.release();
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        switch (keyCode) {
+            case KeyEvent.KEYCODE_BACK:
+                onBackoffClick();
+                break;
+            default:
+                break;
+        }
+        return true;
+    }
+
+    private void startStream() {
+        mStreamer.startStream();
+        mShootingText.setText(STOP_STRING);
+        mShootingText.postInvalidate();
+        mRecording = true;
+    }
+
+    private void stopStream() {
+        mStreamer.stopStream();
+        mChronometer.stop();
+        mShootingText.setText(START_STRING);
+        mShootingText.postInvalidate();
+        mRecording = false;
+    }
+
+    private void beginInfoUploadTimer() {
+        if (mPrintDebugInfo && mTimer == null) {
+            mTimer = new Timer();
+            mTimer.schedule(new TimerTask() {
+                @Override
+                public void run() {
+                    updateDebugInfo();
+                    runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            mDebugInfoTextView.setText(mDebugInfo);
+                        }
+                    });
+                }
+            }, 100, 1000);
+        }
+    }
+
+    //update debug info
+    private void updateDebugInfo() {
+        if (mStreamer == null) return;
+        mDebugInfo = String.format(Locale.getDefault(),
+                "RtmpHostIP()=%s DroppedFrameCount()=%d \n " +
+                        "ConnectTime()=%d DnsParseTime()=%d \n " +
+                        "UploadedKB()=%d EncodedFrames()=%d \n" +
+                        "CurrentKBitrate=%d Version()=%s",
+                mStreamer.getRtmpHostIP(), mStreamer.getDroppedFrameCount(),
+                mStreamer.getConnectTime(), mStreamer.getDnsParseTime(),
+                mStreamer.getUploadedKBytes(), mStreamer.getEncodedFrames(),
+                mStreamer.getCurrentUploadKBitrate(), mStreamer.getVersion());
+    }
+
+    //show watermark in specific location
+    private void showWaterMark() {
+        if (!mIsLandscape) {
+            mStreamer.showWaterMarkLogo(mLogoPath, 0.08f, 0.04f, 0.20f, 0, 0.8f);
+            mStreamer.showWaterMarkTime(0.03f, 0.01f, 0.35f, Color.RED, 1.0f);
+        } else {
+            mStreamer.showWaterMarkLogo(mLogoPath, 0.05f, 0.09f, 0, 0.20f, 0.8f);
+            mStreamer.showWaterMarkTime(0.01f, 0.03f, 0.22f, Color.RED, 1.0f);
+        }
+    }
+
+    private void hideWaterMark() {
+        mStreamer.hideWaterMarkLogo();
+        mStreamer.hideWaterMarkTime();
+    }
+
+    // Example to handle camera related operation
+    private void setCameraAntiBanding50Hz() {
+        Camera.Parameters parameters = mStreamer.getCameraCapture().getCameraParameters();
+        if (parameters != null) {
+            parameters.setAntibanding(Camera.Parameters.ANTIBANDING_50HZ);
+            mStreamer.getCameraCapture().setCameraParameters(parameters);
+        }
+    }
+
+    private KSYStreamer.OnInfoListener mOnInfoListener = new KSYStreamer.OnInfoListener() {
+        @Override
+        public void onInfo(int what, int msg1, int msg2) {
+            switch (what) {
+                case StreamerConstants.KSY_STREAMER_CAMERA_INIT_DONE:
+                    Log.d(TAG, "KSY_STREAMER_CAMERA_INIT_DONE");
+                    setCameraAntiBanding50Hz();
+                    if (mAutoStart) {
+                        startStream();
+                    }
+                    break;
+                case StreamerConstants.KSY_STREAMER_OPEN_STREAM_SUCCESS:
+                    Log.d(TAG, "KSY_STREAMER_OPEN_STREAM_SUCCESS");
+                    mChronometer.setBase(SystemClock.elapsedRealtime());
+                    mChronometer.start();
+                    beginInfoUploadTimer();
+                    break;
+                case StreamerConstants.KSY_STREAMER_FRAME_SEND_SLOW:
+                    Log.d(TAG, "KSY_STREAMER_FRAME_SEND_SLOW " + msg1 + "ms");
+                    Toast.makeText(CameraActivity.this, "Network not good!",
+                            Toast.LENGTH_SHORT).show();
+                    break;
+                case StreamerConstants.KSY_STREAMER_EST_BW_RAISE:
+                    Log.d(TAG, "BW raise to " + msg1 / 1000 + "kbps");
+                    break;
+                case StreamerConstants.KSY_STREAMER_EST_BW_DROP:
+                    Log.d(TAG, "BW drop to " + msg1 / 1000 + "kpbs");
+                    break;
+                default:
+                    Log.d(TAG, "OnInfo: " + what + " msg1: " + msg1 + " msg2: " + msg2);
+                    break;
+            }
+        }
+    };
+
+    private void handleEncodeError() {
+        int encodeMethod = mStreamer.getVideoEncodeMethod();
+        if (encodeMethod == StreamerConstants.ENCODE_METHOD_HARDWARE) {
+            mHWEncoderUnsupported = true;
+            if (mSWEncoderUnsupported) {
+                mStreamer.setEncodeMethod(
+                        StreamerConstants.ENCODE_METHOD_SOFTWARE_COMPAT);
+                Log.e(TAG, "Got HW encoder error, switch to SOFTWARE_COMPAT mode");
+            } else {
+                mStreamer.setEncodeMethod(StreamerConstants.ENCODE_METHOD_SOFTWARE);
+                Log.e(TAG, "Got HW encoder error, switch to SOFTWARE mode");
+            }
+        } else if (encodeMethod == StreamerConstants.ENCODE_METHOD_SOFTWARE) {
+            mSWEncoderUnsupported = true;
+            if (mHWEncoderUnsupported) {
+                mStreamer.setEncodeMethod(
+                        StreamerConstants.ENCODE_METHOD_SOFTWARE_COMPAT);
+                Log.e(TAG, "Got SW encoder error, switch to SOFTWARE_COMPAT mode");
+            } else {
+                mStreamer.setEncodeMethod(StreamerConstants.ENCODE_METHOD_HARDWARE);
+                Log.e(TAG, "Got SW encoder error, switch to HARDWARE mode");
+            }
+        }
+    }
+
+    private KSYStreamer.OnErrorListener mOnErrorListener = new KSYStreamer.OnErrorListener() {
+        @Override
+        public void onError(int what, int msg1, int msg2) {
+            switch (what) {
+                case StreamerConstants.KSY_STREAMER_ERROR_DNS_PARSE_FAILED:
+                    Log.d(TAG, "KSY_STREAMER_ERROR_DNS_PARSE_FAILED");
+                    break;
+                case StreamerConstants.KSY_STREAMER_ERROR_CONNECT_FAILED:
+                    Log.d(TAG, "KSY_STREAMER_ERROR_CONNECT_FAILED");
+                    break;
+                case StreamerConstants.KSY_STREAMER_ERROR_PUBLISH_FAILED:
+                    Log.d(TAG, "KSY_STREAMER_ERROR_PUBLISH_FAILED");
+                    break;
+                case StreamerConstants.KSY_STREAMER_ERROR_CONNECT_BREAKED:
+                    Log.d(TAG, "KSY_STREAMER_ERROR_CONNECT_BREAKED");
+                    break;
+                case StreamerConstants.KSY_STREAMER_ERROR_AV_ASYNC:
+                    Log.d(TAG, "KSY_STREAMER_ERROR_AV_ASYNC " + msg1 + "ms");
+                    break;
+                case StreamerConstants.KSY_STREAMER_VIDEO_ENCODER_ERROR_UNSUPPORTED:
+                    Log.d(TAG, "KSY_STREAMER_VIDEO_ENCODER_ERROR_UNSUPPORTED");
+                    break;
+                case StreamerConstants.KSY_STREAMER_VIDEO_ENCODER_ERROR_UNKNOWN:
+                    Log.d(TAG, "KSY_STREAMER_VIDEO_ENCODER_ERROR_UNKNOWN");
+                    break;
+                case StreamerConstants.KSY_STREAMER_AUDIO_ENCODER_ERROR_UNSUPPORTED:
+                    Log.d(TAG, "KSY_STREAMER_AUDIO_ENCODER_ERROR_UNSUPPORTED");
+                    break;
+                case StreamerConstants.KSY_STREAMER_AUDIO_ENCODER_ERROR_UNKNOWN:
+                    Log.d(TAG, "KSY_STREAMER_AUDIO_ENCODER_ERROR_UNKNOWN");
+                    break;
+                case StreamerConstants.KSY_STREAMER_AUDIO_RECORDER_ERROR_START_FAILED:
+                    Log.d(TAG, "KSY_STREAMER_AUDIO_RECORDER_ERROR_START_FAILED");
+                    break;
+                case StreamerConstants.KSY_STREAMER_AUDIO_RECORDER_ERROR_UNKNOWN:
+                    Log.d(TAG, "KSY_STREAMER_AUDIO_RECORDER_ERROR_UNKNOWN");
+                    break;
+                case StreamerConstants.KSY_STREAMER_CAMERA_ERROR_UNKNOWN:
+                    Log.d(TAG, "KSY_STREAMER_CAMERA_ERROR_UNKNOWN");
+                    break;
+                case StreamerConstants.KSY_STREAMER_CAMERA_ERROR_START_FAILED:
+                    Log.d(TAG, "KSY_STREAMER_CAMERA_ERROR_START_FAILED");
+                    break;
+                case StreamerConstants.KSY_STREAMER_CAMERA_ERROR_SERVER_DIED:
+                    Log.d(TAG, "KSY_STREAMER_CAMERA_ERROR_SERVER_DIED");
+                    break;
+                default:
+                    Log.d(TAG, "what=" + what + " msg1=" + msg1 + " msg2=" + msg2);
+                    break;
+            }
+            switch (what) {
+                case StreamerConstants.KSY_STREAMER_CAMERA_ERROR_UNKNOWN:
+                case StreamerConstants.KSY_STREAMER_CAMERA_ERROR_START_FAILED:
+                case StreamerConstants.KSY_STREAMER_AUDIO_RECORDER_ERROR_START_FAILED:
+                case StreamerConstants.KSY_STREAMER_AUDIO_RECORDER_ERROR_UNKNOWN:
+                    break;
+                case StreamerConstants.KSY_STREAMER_CAMERA_ERROR_SERVER_DIED:
+                    mStreamer.stopCameraPreview();
+                    mMainHandler.postDelayed(new Runnable() {
+                        @Override
+                        public void run() {
+                            startCameraPreviewWithPermCheck();
+                        }
+                    }, 5000);
+                    break;
+                case StreamerConstants.KSY_STREAMER_VIDEO_ENCODER_ERROR_UNSUPPORTED:
+                case StreamerConstants.KSY_STREAMER_VIDEO_ENCODER_ERROR_UNKNOWN:
+                    handleEncodeError();
+                default:
+                    stopStream();
+                    mMainHandler.postDelayed(new Runnable() {
+                        @Override
+                        public void run() {
+                            startStream();
+                        }
+                    }, 3000);
+                    break;
+            }
+        }
+    };
+
+    private StatsLogReport.OnLogEventListener mOnLogEventListener =
+            new StatsLogReport.OnLogEventListener() {
+                @Override
+                public void onLogEvent(StringBuilder singleLogContent) {
+                    Log.i(TAG, "***onLogEvent : " + singleLogContent.toString());
+                }
+            };
+
+    private OnAudioRawDataListener mOnAudioRawDataListener = new OnAudioRawDataListener() {
+        @Override
+        public short[] OnAudioRawData(short[] data, int count) {
+            Log.d(TAG, "OnAudioRawData data.length=" + data.length + " count=" + count);
+            //audio pcm data
+            return data;
+        }
+    };
+
+    private OnPreviewFrameListener mOnPreviewFrameListener = new OnPreviewFrameListener() {
+        @Override
+        public void onPreviewFrame(byte[] data, int width, int height, boolean isRecording) {
+            Log.d(TAG, "onPreviewFrame data.length=" + data.length + " " +
+                    width + "x" + height + " isRecording=" + isRecording);
+        }
+    };
+
+    private void onSwitchCamera() {
+        mStreamer.switchCamera();
+        mCameraHintView.hideAll();
+    }
+
+    private void onFlashClick() {
+        if (isFlashOpened) {
+            mStreamer.toggleTorch(false);
+            isFlashOpened = false;
+        } else {
+            mStreamer.toggleTorch(true);
+            isFlashOpened = true;
+        }
+    }
+
+    private void onBackoffClick() {
+        new AlertDialog.Builder(CameraActivity.this).setCancelable(true)
+                .setTitle("结束直播?")
+                .setNegativeButton("取消", new DialogInterface.OnClickListener() {
+
+                    @Override
+                    public void onClick(DialogInterface arg0, int arg1) {
+
+                    }
+                })
+                .setPositiveButton("确定", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface arg0, int arg1) {
+                        mChronometer.stop();
+                        mRecording = false;
+                        CameraActivity.this.finish();
+                    }
+                }).show();
+    }
+
+    private void onShootClick() {
+        if (mRecording) {
+            stopStream();
+        } else {
+            startStream();
+        }
+    }
+
+    private void showChooseFilter() {
+        AlertDialog alertDialog;
+        alertDialog = new AlertDialog.Builder(this)
+                .setTitle("请选择美颜滤镜")
+                .setSingleChoiceItems(
+                        new String[]{"BEAUTY_SOFT", "SKIN_WHITEN", "BEAUTY_ILLUSION", "DENOISE",
+                                "BEAUTY_SMOOTH", "DEMOFILTER", "GROUP_FILTER"}, -1,
+                        new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                if (which < 5) {
+                                    mStreamer.getImgTexFilterMgt().setFilter(
+                                            mStreamer.getGLRender(), which + 16);
+                                } else if (which == 5) {
+                                    mStreamer.getImgTexFilterMgt().setFilter(
+                                            new DemoFilter(mStreamer.getGLRender()));
+                                } else if (which == 6) {
+                                    List<ImgTexFilter> groupFilter = new LinkedList<>();
+                                    groupFilter.add(new DemoFilter2(mStreamer.getGLRender()));
+                                    groupFilter.add(new DemoFilter3(mStreamer.getGLRender()));
+                                    groupFilter.add(new DemoFilter4(mStreamer.getGLRender()));
+                                    mStreamer.getImgTexFilterMgt().setFilter(groupFilter);
+                                }
+                                dialog.dismiss();
+                            }
+                        })
+                .create();
+        alertDialog.setCancelable(false);
+        alertDialog.show();
+    }
+
+    boolean[] mChooseFilter = {false, false};
+
+    private void showChooseAudioFilter() {
+        AlertDialog alertDialog;
+        alertDialog = new AlertDialog.Builder(this)
+                .setTitle("请选择音频滤镜")
+                .setMultiChoiceItems(
+                        new String[]{"REVERB", "DEMO",}, 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) {
+                        if (mChooseFilter[0] && mChooseFilter[1]) {
+                            List<AudioFilterBase> filters = new LinkedList<>();
+                            AudioReverbFilter reverbFilter = new AudioReverbFilter();
+                            DemoAudioFilter demofilter = new DemoAudioFilter();
+                            filters.add(reverbFilter);
+                            filters.add(demofilter);
+                            mStreamer.getAudioFilterMgt().setFilter(filters);
+                        } else if (mChooseFilter[0]) {
+                            AudioReverbFilter reverbFilter = new AudioReverbFilter();
+                            mStreamer.getAudioFilterMgt().setFilter(reverbFilter);
+                        } else if (mChooseFilter[1]) {
+                            DemoAudioFilter demofilter = new DemoAudioFilter();
+                            mStreamer.getAudioFilterMgt().setFilter(demofilter);
+                        } else {
+                            mStreamer.getAudioFilterMgt().setFilter((AudioFilterBase) null);
+                        }
+                        dialog.dismiss();
+                    }
+                })
+                .create();
+        alertDialog.setCancelable(false);
+        alertDialog.show();
+    }
+
+    private void onBeautyChecked(boolean isChecked) {
+        if (isChecked) {
+            if (mStreamer.getVideoEncodeMethod() ==
+                    StreamerConstants.ENCODE_METHOD_SOFTWARE_COMPAT) {
+                mStreamer.getImgTexFilterMgt().setFilter(mStreamer.getGLRender(),
+                        ImgTexFilterMgt.KSY_FILTER_BEAUTY_DENOISE);
+                mStreamer.setEnableImgBufBeauty(true);
+            } else {
+                showChooseFilter();
+            }
+        } else {
+            mStreamer.getImgTexFilterMgt().setFilter(mStreamer.getGLRender(),
+                    ImgTexFilterMgt.KSY_FILTER_BEAUTY_DISABLE);
+            mStreamer.setEnableImgBufBeauty(false);
+        }
+    }
+
+    private void onAudioFilterChecked(boolean isChecked) {
+        showChooseAudioFilter();
+    }
+
+    private void onBgmChecked(boolean isChecked) {
+        if (isChecked) {
+            mStreamer.getAudioPlayerCapture().getBgmPlayer()
+                    .setOnCompletionListener(new KSYBgmPlayer.OnCompletionListener() {
+                        @Override
+                        public void onCompletion(KSYBgmPlayer bgmPlayer) {
+                            Log.d(TAG, "End of the currently playing music");
+                        }
+                    });
+            mStreamer.getAudioPlayerCapture().getBgmPlayer()
+                    .setOnErrorListener(new KSYBgmPlayer.OnErrorListener() {
+                        @Override
+                        public void onError(KSYBgmPlayer bgmPlayer, int what, int extra) {
+                            Log.e(TAG, "onBgmError: " + what);
+                        }
+                    });
+            mStreamer.getAudioPlayerCapture().getBgmPlayer().setVolume(1.0f);
+            mStreamer.getAudioPlayerCapture().getBgmPlayer().setMute(false);
+            mStreamer.startBgm(mBgmPath, true);
+            mStreamer.setHeadsetPlugged(true);
+        } else {
+            mStreamer.stopBgm();
+        }
+    }
+
+    private void onAudioPreviewChecked(boolean isChecked) {
+        mStreamer.setEnableAudioPreview(isChecked);
+    }
+
+    private void onMuteChecked(boolean isChecked) {
+        mStreamer.setMuteAudio(isChecked);
+    }
+
+    private void onWaterMarkChecked(boolean isChecked) {
+        if (isChecked)
+            showWaterMark();
+        else
+            hideWaterMark();
+    }
+
+    private void onFrontMirrorChecked(boolean isChecked) {
+        mStreamer.setFrontCameraMirror(isChecked);
+    }
+
+    private void onAudioOnlyChecked(boolean isChecked) {
+        mStreamer.setAudioOnly(isChecked);
+    }
+
+    private class ButtonObserver implements View.OnClickListener {
+        @Override
+        public void onClick(View view) {
+            switch (view.getId()) {
+                case R.id.switch_cam:
+                    onSwitchCamera();
+                    break;
+                case R.id.backoff:
+                    onBackoffClick();
+                    break;
+                case R.id.flash:
+                    onFlashClick();
+                    break;
+                case R.id.click_to_shoot:
+                    onShootClick();
+                    break;
+                default:
+                    break;
+            }
+        }
+    }
+
+    private class CheckBoxObserver implements CompoundButton.OnCheckedChangeListener {
+
+        @Override
+        public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+            switch (buttonView.getId()) {
+                case R.id.click_to_switch_beauty:
+                    onBeautyChecked(isChecked);
+                    break;
+                case R.id.click_to_select_audio_filter:
+                    onAudioFilterChecked(isChecked);
+                    break;
+                case R.id.bgm:
+                    onBgmChecked(isChecked);
+                    break;
+                case R.id.ear_mirror:
+                    onAudioPreviewChecked(isChecked);
+                    break;
+                case R.id.mute:
+                    onMuteChecked(isChecked);
+                    break;
+                case R.id.watermark:
+                    onWaterMarkChecked(isChecked);
+                    break;
+                case R.id.front_camera_mirror:
+                    onFrontMirrorChecked(isChecked);
+                    break;
+                case R.id.audio_only:
+                    onAudioOnlyChecked(isChecked);
+                    break;
+                default:
+                    break;
+            }
+        }
+    }
+
+    private void startCameraPreviewWithPermCheck() {
+        int cameraPerm = ActivityCompat.checkSelfPermission(this, Manifest.permission.CAMERA);
+        int audioPerm = ActivityCompat.checkSelfPermission(this, Manifest.permission.RECORD_AUDIO);
+        if (cameraPerm != PackageManager.PERMISSION_GRANTED ||
+                audioPerm != PackageManager.PERMISSION_GRANTED) {
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+                Log.e(TAG, "No CAMERA or AudioRecord permission, please check");
+                Toast.makeText(this, "No CAMERA or AudioRecord permission, please check",
+                        Toast.LENGTH_LONG).show();
+            } else {
+                String[] permissions = {Manifest.permission.CAMERA,
+                        Manifest.permission.RECORD_AUDIO,
+                        Manifest.permission.READ_EXTERNAL_STORAGE};
+                ActivityCompat.requestPermissions(this, permissions,
+                        PERMISSION_REQUEST_CAMERA_AUDIOREC);
+            }
+        } else {
+            mStreamer.startCameraPreview();
+        }
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String permissions[],
+                                           @NonNull int[] grantResults) {
+        switch (requestCode) {
+            case PERMISSION_REQUEST_CAMERA_AUDIOREC: {
+                // If request is cancelled, the result arrays are empty.
+                if (grantResults.length > 0
+                        && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                    mStreamer.startCameraPreview();
+                } else {
+                    Log.e(TAG, "No CAMERA or AudioRecord permission");
+                    Toast.makeText(this, "No CAMERA or AudioRecord permission",
+                            Toast.LENGTH_LONG).show();
+                }
+                break;
+            }
+        }
+    }
+}
diff --git a/KSYLiveDemo/app/src/main/java/com/ksyun/media/streamer/demo/CameraHintView.java b/KSYLiveDemo/app/src/main/java/com/ksyun/media/streamer/demo/CameraHintView.java
new file mode 100644
index 0000000..2d6557d
--- /dev/null
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/media/streamer/demo/CameraHintView.java
@@ -0,0 +1,138 @@
+package com.ksyun.media.streamer.demo;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.graphics.Typeface;
+import android.os.Handler;
+import android.util.AttributeSet;
+import android.util.TypedValue;
+import android.view.View;
+
+import com.ksyun.media.streamer.capture.camera.ICameraHintView;
+
+import java.util.Locale;
+
+/**
+ * View to show camera focus rect and zoom value.
+ */
+
+public class CameraHintView extends View implements ICameraHintView {
+    private static final String TAG = "CameraHintView";
+    private static final int COLOR_FOCUSING = 0xeed7d7d7;
+    private static final int COLOR_FOCUSED = 0xee00ff00;
+    private static final int COLOR_UNFOCUSED = 0xeeff0000;
+    private static final int COLOR_ZOOM_TEXT = 0xffffffff;
+
+    private boolean mShowRect;
+    private Rect mRect;
+    private Paint mFocusPaint;
+    private Handler mHandler;
+    private Runnable mHideRect;
+
+    private Paint mZoomPaint;
+    private boolean mShowZoomRatio;
+    private float mZoomRatio;
+    private Runnable mHideZoom;
+
+    public CameraHintView(Context context) {
+        super(context);
+        init();
+    }
+
+    public CameraHintView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    private void init() {
+        mHandler = new Handler();
+        mHideRect = new Runnable() {
+            @Override
+            public void run() {
+                mShowRect = false;
+                invalidate();
+            }
+        };
+
+        mHideZoom = new Runnable() {
+            @Override
+            public void run() {
+                mShowZoomRatio = false;
+                invalidate();
+            }
+        };
+
+        mFocusPaint = new Paint();
+        mFocusPaint.setStyle(Paint.Style.STROKE);
+        mFocusPaint.setStrokeWidth(dpToPx(1));
+
+        mZoomPaint = new Paint();
+        mZoomPaint.setTypeface(Typeface.create(Typeface.DEFAULT, Typeface.NORMAL));
+        mZoomPaint.setStyle(Paint.Style.FILL_AND_STROKE);
+        mZoomPaint.setStrokeWidth(1);
+        mZoomPaint.setColor(COLOR_ZOOM_TEXT);
+        mZoomPaint.setTextAlign(Paint.Align.CENTER);
+        mZoomPaint.setTextSize(dpToPx(16));
+        mZoomPaint.setAntiAlias(true);
+        mZoomPaint.setFilterBitmap(true);
+    }
+
+    public void hideAll() {
+        mHandler.removeCallbacks(mHideRect);
+        mHandler.removeCallbacks(mHideZoom);
+        mHandler.post(mHideRect);
+        mHandler.post(mHideZoom);
+    }
+
+    @Override
+    public void updateZoomRatio(float val) {
+        mShowZoomRatio = true;
+        mZoomRatio = val;
+        mHandler.removeCallbacks(mHideZoom);
+        if (val == 1.0f) {
+            mHandler.postDelayed(mHideZoom, 1000);
+        }
+        invalidate();
+    }
+
+    @Override
+    public void startFocus(Rect rect) {
+        mShowRect = true;
+        mRect = rect;
+        mFocusPaint.setColor(COLOR_FOCUSING);
+        mHandler.removeCallbacks(mHideRect);
+        mHandler.postDelayed(mHideRect, 3000);
+        invalidate();
+    }
+
+    @Override
+    public void setFocused(boolean success) {
+        mShowRect = true;
+        mFocusPaint.setColor(success ? COLOR_FOCUSED : COLOR_UNFOCUSED);
+        mHandler.removeCallbacks(mHideRect);
+        mHandler.postDelayed(mHideRect, 400);
+        invalidate();
+    }
+
+    @Override
+    public void onDraw(Canvas canvas) {
+        if (mShowRect) {
+            mFocusPaint.setStrokeWidth(3);
+            mFocusPaint.setStyle(Paint.Style.STROKE);
+            canvas.drawRect(mRect.left, mRect.top, mRect.right, mRect.bottom, mFocusPaint);
+        }
+        if (mShowZoomRatio) {
+            String text = String.format(Locale.getDefault(), "%.1f", mZoomRatio) + "x";
+            int x = (int) (getWidth() * 0.5f);
+            int y = (int) dpToPx(48);
+            canvas.drawText(text, x, y, mZoomPaint);
+        }
+    }
+
+    private float dpToPx(float dp) {
+        return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp,
+                getResources().getDisplayMetrics());
+    }
+}
diff --git a/KSYLiveDemo/app/src/main/java/com/ksyun/media/streamer/demo/DemoActivity.java b/KSYLiveDemo/app/src/main/java/com/ksyun/media/streamer/demo/DemoActivity.java
new file mode 100644
index 0000000..b3821cf
--- /dev/null
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/media/streamer/demo/DemoActivity.java
@@ -0,0 +1,134 @@
+package com.ksyun.media.streamer.demo;
+
+import com.ksyun.live.demo.R;
+import android.app.Activity;
+import android.os.Bundle;
+import android.text.InputType;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.RadioButton;
+
+import com.ksyun.media.streamer.kit.StreamerConstants;
+
+public class DemoActivity extends Activity implements OnClickListener {
+    private static final String TAG = DemoActivity.class.getSimpleName();
+    private Button mConnectButton;
+    private EditText mUrlEditText;
+    private EditText mFrameRateEditText;
+    private EditText mVideoBitRateEditText;
+    private EditText mAudioBitRateEditText;
+    private RadioButton mRes360Button;
+    private RadioButton mRes480Button;
+    private RadioButton mRes540Button;
+    private RadioButton mRes720Button;
+
+    private RadioButton mLandscapeButton;
+    private RadioButton mPortraitButton;
+
+    private RadioButton mSWButton;
+    private RadioButton mHWButton;
+    private RadioButton mSW1Button;
+    private CheckBox mAutoStartCheckBox;
+    private CheckBox mShowDebugInfoCheckBox;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.demo_activity);
+
+        mConnectButton = (Button) findViewById(R.id.connectBT);
+        mConnectButton.setOnClickListener(this);
+
+        mUrlEditText = (EditText) findViewById(R.id.rtmpUrl);
+        mFrameRateEditText = (EditText) findViewById(R.id.frameRatePicker);
+        mFrameRateEditText.setInputType(InputType.TYPE_CLASS_NUMBER);
+        mVideoBitRateEditText = (EditText) findViewById(R.id.videoBitratePicker);
+        mVideoBitRateEditText.setInputType(InputType.TYPE_CLASS_NUMBER);
+        mAudioBitRateEditText = (EditText) findViewById(R.id.audioBitratePicker);
+        mAudioBitRateEditText.setInputType(InputType.TYPE_CLASS_NUMBER);
+        mRes360Button = (RadioButton) findViewById(R.id.radiobutton1);
+        mRes480Button = (RadioButton) findViewById(R.id.radiobutton2);
+        mRes540Button = (RadioButton) findViewById(R.id.radiobutton3);
+        mRes720Button = (RadioButton) findViewById(R.id.radiobutton4);
+        mLandscapeButton = (RadioButton) findViewById(R.id.orientationbutton1);
+        mPortraitButton = (RadioButton) findViewById(R.id.orientationbutton2);
+        mSWButton = (RadioButton) findViewById(R.id.encode_sw);
+        mHWButton = (RadioButton) findViewById(R.id.encode_hw);
+        mSW1Button = (RadioButton) findViewById(R.id.encode_sw1);
+        mAutoStartCheckBox = (CheckBox) findViewById(R.id.autoStart);
+        mShowDebugInfoCheckBox = (CheckBox) findViewById(R.id.print_debug_info);
+    }
+
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.connectBT:
+                int frameRate = 0;
+                int videoBitRate = 0;
+                int audioBitRate = 0;
+                int videoResolution;
+                int encodeMethod;
+                boolean landscape;
+                boolean startAuto;
+                boolean showDebugInfo;
+
+                if (!TextUtils.isEmpty(mUrlEditText.getText())
+					&& mUrlEditText.getText().toString().startsWith("rtmp")) {
+                    if (!TextUtils.isEmpty(mFrameRateEditText.getText().toString())) {
+                        frameRate = Integer.parseInt(mFrameRateEditText.getText()
+                                .toString());
+                    }
+
+                    if (!TextUtils.isEmpty(mVideoBitRateEditText.getText().toString())) {
+                        videoBitRate = Integer.parseInt(mVideoBitRateEditText.getText()
+                                .toString());
+                    }
+
+                    if (!TextUtils.isEmpty(mAudioBitRateEditText.getText().toString())) {
+                        audioBitRate = Integer.parseInt(mAudioBitRateEditText.getText()
+                                .toString());
+                    }
+
+                    if (mRes360Button.isChecked()) {
+                        videoResolution = StreamerConstants.VIDEO_RESOLUTION_360P;
+                    } else if (mRes480Button.isChecked()) {
+                        videoResolution = StreamerConstants.VIDEO_RESOLUTION_480P;
+                    } else if (mRes540Button.isChecked()) {
+                        videoResolution = StreamerConstants.VIDEO_RESOLUTION_540P;
+                    } else {
+                        videoResolution = StreamerConstants.VIDEO_RESOLUTION_720P;
+                    }
+
+                    if (mHWButton.isChecked()) {
+                        encodeMethod = StreamerConstants.ENCODE_METHOD_HARDWARE;
+                    } else if (mSWButton.isChecked()) {
+                        encodeMethod = StreamerConstants.ENCODE_METHOD_SOFTWARE;
+                    } else {
+                        encodeMethod = StreamerConstants.ENCODE_METHOD_SOFTWARE_COMPAT;
+                    }
+
+                    landscape = mLandscapeButton.isChecked();
+                    startAuto = mAutoStartCheckBox.isChecked();
+                    showDebugInfo = mShowDebugInfoCheckBox.isChecked();
+
+                    CameraActivity.startActivity(getApplicationContext(), 0,
+                            mUrlEditText.getText().toString(), frameRate, videoBitRate,
+                            audioBitRate, videoResolution, landscape, encodeMethod,
+                            startAuto, showDebugInfo);
+                }
+                break;
+            default:
+                break;
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+    }
+}
diff --git a/KSYLiveDemo/app/src/main/java/com/ksyun/media/streamer/demo/DemoAudioFilter.java b/KSYLiveDemo/app/src/main/java/com/ksyun/media/streamer/demo/DemoAudioFilter.java
new file mode 100644
index 0000000..166d27c
--- /dev/null
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/media/streamer/demo/DemoAudioFilter.java
@@ -0,0 +1,56 @@
+package com.ksyun.media.streamer.demo;
+
+import com.ksyun.media.streamer.filter.audio.AudioFilterBase;
+import com.ksyun.media.streamer.framework.AudioBufFormat;
+import com.ksyun.media.streamer.framework.AudioBufFrame;
+
+import java.nio.ShortBuffer;
+
+/**
+ * demo audio filter
+ * make voice lound
+ */
+
+public class DemoAudioFilter extends AudioFilterBase {
+    private AudioBufFormat mAudioFormat;
+    private float mVoiceVolume = 2.0f;
+
+    /**
+     * audio format changed
+     *
+     * @param format the changed format
+     * @return the changed format
+     */
+    @Override
+    protected AudioBufFormat doFormatChanged(AudioBufFormat format) {
+        mAudioFormat = format;
+        return format;
+    }
+
+    /**
+     * process your audio in this function
+     *
+     * @param frame the input frame (directBuffer)
+     * @return return the frame after process
+     */
+    @Override
+    protected AudioBufFrame doFilter(AudioBufFrame frame) {
+        //process frame
+        if (mVoiceVolume != 1.0f) {
+            ShortBuffer dstShort = frame.buf.asShortBuffer();
+            for (int i = 0; i < dstShort.limit(); i++) {
+                dstShort.put(i, (short) (dstShort.get(i) * mVoiceVolume));
+            }
+            dstShort.rewind();
+        }
+        return frame;
+    }
+
+    /**
+     * release your resource in this function
+     */
+    @Override
+    protected void doRelease() {
+
+    }
+}
diff --git a/KSYLiveDemo/app/src/main/java/com/ksyun/media/streamer/demo/DemoFilter.java b/KSYLiveDemo/app/src/main/java/com/ksyun/media/streamer/demo/DemoFilter.java
new file mode 100644
index 0000000..b51efd7
--- /dev/null
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/media/streamer/demo/DemoFilter.java
@@ -0,0 +1,33 @@
+package com.ksyun.media.streamer.demo;
+
+
+import android.opengl.GLES20;
+
+import com.ksyun.media.streamer.util.gles.GLRender;
+import com.ksyun.media.streamer.util.gles.GlUtil;
+import com.ksyun.media.streamer.filter.imgtex.ImgTexFilter;
+
+/**
+ * Demo filter.
+ */
+public class DemoFilter extends ImgTexFilter {
+    // Fragment shader that attempts to produce a high contrast image
+    private static final String FRAGMENT_SHADER_BODY =
+            "precision mediump float;\n" +
+                    "varying vec2 vTextureCoord;\n" +
+                    "uniform  float greenplus;\n" +
+                    "void main() {\n" +
+                    "    vec4 tc = texture2D(sTexture, vTextureCoord);\n" +
+                    "    float color = ((tc.r  + tc.g + tc.b ) / 3.0) ;\n" +
+                    "    gl_FragColor = vec4(color, color + greenplus, color, 1.0);\n" +
+                    "}\n";
+
+    public DemoFilter(GLRender glRender) {
+        super(glRender, BASE_VERTEX_SHADER, FRAGMENT_SHADER_BODY);
+    }
+
+    public void onInitialized() {
+        int greenplusLocation = getUniformLocation("greenplus");
+        GLES20.glUniform1f(greenplusLocation, 0.3f);
+    }
+}
diff --git a/KSYLiveDemo/app/src/main/java/com/ksyun/media/streamer/demo/DemoFilter2.java b/KSYLiveDemo/app/src/main/java/com/ksyun/media/streamer/demo/DemoFilter2.java
new file mode 100644
index 0000000..5ddb790
--- /dev/null
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/media/streamer/demo/DemoFilter2.java
@@ -0,0 +1,34 @@
+package com.ksyun.media.streamer.demo;
+
+
+import android.opengl.GLES20;
+
+import com.ksyun.media.streamer.util.gles.GLRender;
+import com.ksyun.media.streamer.util.gles.GlUtil;
+import com.ksyun.media.streamer.filter.imgtex.ImgTexFilter;
+
+/**
+ * Demo filter.
+ */
+public class DemoFilter2 extends ImgTexFilter {
+    // Fragment shader that attempts to produce a high contrast image
+    private static final String FRAGMENT_SHADER_BODY =
+            "precision mediump float;\n" +
+                    "varying vec2 vTextureCoord;\n" +
+                    "uniform  float greenplus;\n" +
+                    "void main() {\n" +
+                    "    vec4 tc = texture2D(sTexture, vTextureCoord);\n" +
+                    "    float color = ((tc.r  + tc.g + tc.b ) / 3.0) ;\n" +
+                    "    gl_FragColor = vec4(color, color + greenplus, color, 1.0);\n" +
+                    "}\n";
+
+    public DemoFilter2(GLRender glRender) {
+        super(glRender, BASE_VERTEX_SHADER, FRAGMENT_SHADER_BODY);
+    }
+
+    public void onInitialized() {
+        int greenplusLocation = getUniformLocation("greenplus");
+        GLES20.glUniform1f(greenplusLocation, -0.3f);
+    }
+
+}
diff --git a/KSYLiveDemo/app/src/main/java/com/ksyun/media/streamer/demo/DemoFilter3.java b/KSYLiveDemo/app/src/main/java/com/ksyun/media/streamer/demo/DemoFilter3.java
new file mode 100644
index 0000000..46e7c5c
--- /dev/null
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/media/streamer/demo/DemoFilter3.java
@@ -0,0 +1,34 @@
+package com.ksyun.media.streamer.demo;
+
+
+import android.opengl.GLES20;
+
+import com.ksyun.media.streamer.util.gles.GLRender;
+import com.ksyun.media.streamer.util.gles.GlUtil;
+import com.ksyun.media.streamer.filter.imgtex.ImgTexFilter;
+
+/**
+ * Demo filter.
+ */
+public class DemoFilter3 extends ImgTexFilter {
+    // Fragment shader that attempts to produce a high contrast image
+    private static final String FRAGMENT_SHADER_BODY =
+            "precision mediump float;\n" +
+                    "varying vec2 vTextureCoord;\n" +
+                    "uniform  float greenplus;\n" +
+                    "void main() {\n" +
+                    "    vec4 tc = texture2D(sTexture, vTextureCoord);\n" +
+                    "    float color = ((tc.r  + tc.g + tc.b ) / 3.0) ;\n" +
+                    "    gl_FragColor = vec4(color+ greenplus, color , color, 1.0);\n" +
+                    "}\n";
+
+    public DemoFilter3(GLRender glRender) {
+        super(glRender, BASE_VERTEX_SHADER, FRAGMENT_SHADER_BODY);
+    }
+
+    public void onInitialized() {
+        int greenplusLocation = getUniformLocation("greenplus");
+        GLES20.glUniform1f(greenplusLocation, 0.3f);
+    }
+
+}
diff --git a/KSYLiveDemo/app/src/main/java/com/ksyun/media/streamer/demo/DemoFilter4.java b/KSYLiveDemo/app/src/main/java/com/ksyun/media/streamer/demo/DemoFilter4.java
new file mode 100644
index 0000000..41a3d19
--- /dev/null
+++ b/KSYLiveDemo/app/src/main/java/com/ksyun/media/streamer/demo/DemoFilter4.java
@@ -0,0 +1,34 @@
+package com.ksyun.media.streamer.demo;
+
+
+import android.opengl.GLES20;
+
+import com.ksyun.media.streamer.util.gles.GLRender;
+import com.ksyun.media.streamer.util.gles.GlUtil;
+import com.ksyun.media.streamer.filter.imgtex.ImgTexFilter;
+
+/**
+ * Demo filter.
+ */
+public class DemoFilter4 extends ImgTexFilter {
+    // Fragment shader that attempts to produce a high contrast image
+    private static final String FRAGMENT_SHADER_BODY =
+            "precision mediump float;\n" +
+                    "varying vec2 vTextureCoord;\n" +
+                    "uniform  float greenplus;\n" +
+                    "void main() {\n" +
+                    "    vec4 tc = texture2D(sTexture, vTextureCoord);\n" +
+                    "    float color = ((tc.r  + tc.g + tc.b ) / 3.0) ;\n" +
+                    "    gl_FragColor = vec4(color+ greenplus, color + greenplus, color, 1.0);\n" +
+                    "}\n";
+
+    public DemoFilter4(GLRender glRender) {
+        super(glRender, BASE_VERTEX_SHADER, FRAGMENT_SHADER_BODY);
+    }
+
+    public void onInitialized() {
+        int greenplusLocation = getUniformLocation("greenplus");
+        GLES20.glUniform1f(greenplusLocation, +0.5f);
+    }
+
+}
diff --git a/LiveDemo/app/src/main/res/anim/slide_in_bottom.xml b/KSYLiveDemo/app/src/main/res/anim/slide_in_bottom.xml
similarity index 100%
rename from LiveDemo/app/src/main/res/anim/slide_in_bottom.xml
rename to KSYLiveDemo/app/src/main/res/anim/slide_in_bottom.xml
diff --git a/LiveDemo/app/src/main/res/anim/slide_in_top.xml b/KSYLiveDemo/app/src/main/res/anim/slide_in_top.xml
similarity index 100%
rename from LiveDemo/app/src/main/res/anim/slide_in_top.xml
rename to KSYLiveDemo/app/src/main/res/anim/slide_in_top.xml
diff --git a/LiveDemo/app/src/main/res/anim/slide_left_in.xml b/KSYLiveDemo/app/src/main/res/anim/slide_left_in.xml
similarity index 100%
rename from LiveDemo/app/src/main/res/anim/slide_left_in.xml
rename to KSYLiveDemo/app/src/main/res/anim/slide_left_in.xml
diff --git a/LiveDemo/app/src/main/res/anim/slide_left_out.xml b/KSYLiveDemo/app/src/main/res/anim/slide_left_out.xml
similarity index 100%
rename from LiveDemo/app/src/main/res/anim/slide_left_out.xml
rename to KSYLiveDemo/app/src/main/res/anim/slide_left_out.xml
diff --git a/LiveDemo/app/src/main/res/anim/slide_out_bottom.xml b/KSYLiveDemo/app/src/main/res/anim/slide_out_bottom.xml
similarity index 100%
rename from LiveDemo/app/src/main/res/anim/slide_out_bottom.xml
rename to KSYLiveDemo/app/src/main/res/anim/slide_out_bottom.xml
diff --git a/LiveDemo/app/src/main/res/anim/slide_out_top.xml b/KSYLiveDemo/app/src/main/res/anim/slide_out_top.xml
similarity index 100%
rename from LiveDemo/app/src/main/res/anim/slide_out_top.xml
rename to KSYLiveDemo/app/src/main/res/anim/slide_out_top.xml
diff --git a/LiveDemo/app/src/main/res/anim/slide_right_in.xml b/KSYLiveDemo/app/src/main/res/anim/slide_right_in.xml
similarity index 100%
rename from LiveDemo/app/src/main/res/anim/slide_right_in.xml
rename to KSYLiveDemo/app/src/main/res/anim/slide_right_in.xml
diff --git a/LiveDemo/app/src/main/res/anim/slide_right_out.xml b/KSYLiveDemo/app/src/main/res/anim/slide_right_out.xml
similarity index 100%
rename from LiveDemo/app/src/main/res/anim/slide_right_out.xml
rename to KSYLiveDemo/app/src/main/res/anim/slide_right_out.xml
diff --git a/LiveDemo/app/src/main/res/anim/slide_stand.xml b/KSYLiveDemo/app/src/main/res/anim/slide_stand.xml
similarity index 100%
rename from LiveDemo/app/src/main/res/anim/slide_stand.xml
rename to KSYLiveDemo/app/src/main/res/anim/slide_stand.xml
diff --git a/LiveDemo/app/src/main/res/drawable/ic_launcher.png b/KSYLiveDemo/app/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from LiveDemo/app/src/main/res/drawable/ic_launcher.png
rename to KSYLiveDemo/app/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/LiveDemo/app/src/main/res/drawable/record_exit_disable.png b/KSYLiveDemo/app/src/main/res/drawable-xhdpi/record_exit_disable.png
similarity index 100%
rename from LiveDemo/app/src/main/res/drawable/record_exit_disable.png
rename to KSYLiveDemo/app/src/main/res/drawable-xhdpi/record_exit_disable.png
diff --git a/LiveDemo/app/src/main/res/drawable/record_exit_normal.png b/KSYLiveDemo/app/src/main/res/drawable-xhdpi/record_exit_normal.png
similarity index 100%
rename from LiveDemo/app/src/main/res/drawable/record_exit_normal.png
rename to KSYLiveDemo/app/src/main/res/drawable-xhdpi/record_exit_normal.png
diff --git a/LiveDemo/app/src/main/res/drawable/record_exitsure_normal.png b/KSYLiveDemo/app/src/main/res/drawable-xhdpi/record_exitsure_normal.png
similarity index 100%
rename from LiveDemo/app/src/main/res/drawable/record_exitsure_normal.png
rename to KSYLiveDemo/app/src/main/res/drawable-xhdpi/record_exitsure_normal.png
diff --git a/LiveDemo/app/src/main/res/drawable/record_flash_disable.png b/KSYLiveDemo/app/src/main/res/drawable-xhdpi/record_flash_disable.png
similarity index 100%
rename from LiveDemo/app/src/main/res/drawable/record_flash_disable.png
rename to KSYLiveDemo/app/src/main/res/drawable-xhdpi/record_flash_disable.png
diff --git a/LiveDemo/app/src/main/res/drawable/record_flash_highlighted.png b/KSYLiveDemo/app/src/main/res/drawable-xhdpi/record_flash_highlighted.png
similarity index 100%
rename from LiveDemo/app/src/main/res/drawable/record_flash_highlighted.png
rename to KSYLiveDemo/app/src/main/res/drawable-xhdpi/record_flash_highlighted.png
diff --git a/LiveDemo/app/src/main/res/drawable/record_flash_normal.png b/KSYLiveDemo/app/src/main/res/drawable-xhdpi/record_flash_normal.png
similarity index 100%
rename from LiveDemo/app/src/main/res/drawable/record_flash_normal.png
rename to KSYLiveDemo/app/src/main/res/drawable-xhdpi/record_flash_normal.png
diff --git a/LiveDemo/app/src/main/res/drawable/record_switch_camera_disable.png b/KSYLiveDemo/app/src/main/res/drawable-xhdpi/record_switch_camera_disable.png
similarity index 100%
rename from LiveDemo/app/src/main/res/drawable/record_switch_camera_disable.png
rename to KSYLiveDemo/app/src/main/res/drawable-xhdpi/record_switch_camera_disable.png
diff --git a/LiveDemo/app/src/main/res/drawable/record_switch_camera_highlighted.png b/KSYLiveDemo/app/src/main/res/drawable-xhdpi/record_switch_camera_highlighted.png
similarity index 100%
rename from LiveDemo/app/src/main/res/drawable/record_switch_camera_highlighted.png
rename to KSYLiveDemo/app/src/main/res/drawable-xhdpi/record_switch_camera_highlighted.png
diff --git a/LiveDemo/app/src/main/res/drawable/record_switch_camera_normal.png b/KSYLiveDemo/app/src/main/res/drawable-xhdpi/record_switch_camera_normal.png
similarity index 100%
rename from LiveDemo/app/src/main/res/drawable/record_switch_camera_normal.png
rename to KSYLiveDemo/app/src/main/res/drawable-xhdpi/record_switch_camera_normal.png
diff --git a/KSYLiveDemo/app/src/main/res/drawable-xxhdpi/ksy_logo.png b/KSYLiveDemo/app/src/main/res/drawable-xxhdpi/ksy_logo.png
new file mode 100644
index 0000000..bdd0ad0
Binary files /dev/null and b/KSYLiveDemo/app/src/main/res/drawable-xxhdpi/ksy_logo.png differ
diff --git a/KSYLiveDemo/app/src/main/res/drawable/ic_launcher.png b/KSYLiveDemo/app/src/main/res/drawable/ic_launcher.png
new file mode 100644
index 0000000..90fc3ff
Binary files /dev/null and b/KSYLiveDemo/app/src/main/res/drawable/ic_launcher.png differ
diff --git a/KSYLiveDemo/app/src/main/res/drawable/ic_media_pause.png b/KSYLiveDemo/app/src/main/res/drawable/ic_media_pause.png
new file mode 100755
index 0000000..1d465a4
Binary files /dev/null and b/KSYLiveDemo/app/src/main/res/drawable/ic_media_pause.png differ
diff --git a/KSYLiveDemo/app/src/main/res/drawable/ic_media_play.png b/KSYLiveDemo/app/src/main/res/drawable/ic_media_play.png
new file mode 100755
index 0000000..2746d17
Binary files /dev/null and b/KSYLiveDemo/app/src/main/res/drawable/ic_media_play.png differ
diff --git a/LiveDemo/app/src/main/res/drawable/qyvideo_pause_btn.png b/KSYLiveDemo/app/src/main/res/drawable/qyvideo_pause_btn.png
similarity index 100%
rename from LiveDemo/app/src/main/res/drawable/qyvideo_pause_btn.png
rename to KSYLiveDemo/app/src/main/res/drawable/qyvideo_pause_btn.png
diff --git a/LiveDemo/app/src/main/res/drawable/qyvideo_start_btn.png b/KSYLiveDemo/app/src/main/res/drawable/qyvideo_start_btn.png
similarity index 100%
rename from LiveDemo/app/src/main/res/drawable/qyvideo_start_btn.png
rename to KSYLiveDemo/app/src/main/res/drawable/qyvideo_start_btn.png
diff --git a/LiveDemo/app/src/main/res/drawable/recorder_delete_icon.xml b/KSYLiveDemo/app/src/main/res/drawable/recorder_delete_icon.xml
similarity index 100%
rename from LiveDemo/app/src/main/res/drawable/recorder_delete_icon.xml
rename to KSYLiveDemo/app/src/main/res/drawable/recorder_delete_icon.xml
diff --git a/LiveDemo/app/src/main/res/drawable/recorder_flash_icon.xml b/KSYLiveDemo/app/src/main/res/drawable/recorder_flash_icon.xml
similarity index 100%
rename from LiveDemo/app/src/main/res/drawable/recorder_flash_icon.xml
rename to KSYLiveDemo/app/src/main/res/drawable/recorder_flash_icon.xml
diff --git a/LiveDemo/app/src/main/res/drawable/recorder_rotate_icon.xml b/KSYLiveDemo/app/src/main/res/drawable/recorder_rotate_icon.xml
similarity index 100%
rename from LiveDemo/app/src/main/res/drawable/recorder_rotate_icon.xml
rename to KSYLiveDemo/app/src/main/res/drawable/recorder_rotate_icon.xml
diff --git a/LiveDemo/app/src/main/res/drawable/video_image.png b/KSYLiveDemo/app/src/main/res/drawable/video_image.png
similarity index 100%
rename from LiveDemo/app/src/main/res/drawable/video_image.png
rename to KSYLiveDemo/app/src/main/res/drawable/video_image.png
diff --git a/LiveDemo/app/src/main/res/layout/activity_history.xml b/KSYLiveDemo/app/src/main/res/layout/activity_history.xml
similarity index 100%
rename from LiveDemo/app/src/main/res/layout/activity_history.xml
rename to KSYLiveDemo/app/src/main/res/layout/activity_history.xml
diff --git a/LiveDemo/app/src/main/res/layout/activity_main.xml b/KSYLiveDemo/app/src/main/res/layout/activity_main.xml
similarity index 100%
rename from LiveDemo/app/src/main/res/layout/activity_main.xml
rename to KSYLiveDemo/app/src/main/res/layout/activity_main.xml
diff --git a/LiveDemo/app/src/main/res/layout/activity_md_using_surface_view.xml b/KSYLiveDemo/app/src/main/res/layout/activity_md_using_surface_view.xml
similarity index 100%
rename from LiveDemo/app/src/main/res/layout/activity_md_using_surface_view.xml
rename to KSYLiveDemo/app/src/main/res/layout/activity_md_using_surface_view.xml
diff --git a/LiveDemo/app/src/main/res/layout/activity_md_using_texture_view.xml b/KSYLiveDemo/app/src/main/res/layout/activity_md_using_texture_view.xml
similarity index 100%
rename from LiveDemo/app/src/main/res/layout/activity_md_using_texture_view.xml
rename to KSYLiveDemo/app/src/main/res/layout/activity_md_using_texture_view.xml
diff --git a/LiveDemo/app/src/main/res/layout/activity_net.xml b/KSYLiveDemo/app/src/main/res/layout/activity_net.xml
similarity index 100%
rename from LiveDemo/app/src/main/res/layout/activity_net.xml
rename to KSYLiveDemo/app/src/main/res/layout/activity_net.xml
diff --git a/LiveDemo/app/src/main/res/layout/activity_player.xml b/KSYLiveDemo/app/src/main/res/layout/activity_player.xml
similarity index 89%
rename from LiveDemo/app/src/main/res/layout/activity_player.xml
rename to KSYLiveDemo/app/src/main/res/layout/activity_player.xml
index 76f0ee8..1b0e3fa 100644
--- a/LiveDemo/app/src/main/res/layout/activity_player.xml
+++ b/KSYLiveDemo/app/src/main/res/layout/activity_player.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".activity.MainActivity"
+    tools:context=".player.activity.PlayerActivity"
     >
 
 
diff --git a/LiveDemo/app/src/main/res/layout/activity_setting.xml b/KSYLiveDemo/app/src/main/res/layout/activity_setting.xml
similarity index 92%
rename from LiveDemo/app/src/main/res/layout/activity_setting.xml
rename to KSYLiveDemo/app/src/main/res/layout/activity_setting.xml
index 9f33057..70e52fe 100644
--- a/LiveDemo/app/src/main/res/layout/activity_setting.xml
+++ b/KSYLiveDemo/app/src/main/res/layout/activity_setting.xml
@@ -37,7 +37,6 @@
         android:textOff="@string/debugoff"
         android:textOn="@string/debugon"/>
 
-
     <LinearLayout
         android:id="@+id/linear_set_st"
         android:layout_marginTop="20dp"
@@ -63,11 +62,15 @@
                 android:layout_height="wrap_content"
                 android:checked="true"
                 android:text="@string/set_surface" />
-            <RadioButton android:id="@+id/use_textureview"
+
+            <RadioButton android:id="@+id/use_ksytextureview"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/set_texture" />
-
+                android:text="@string/set_ksytexture" />
+            <RadioButton android:id="@+id/glrender_view"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/glrender_view" />
         </RadioGroup>
 
     </LinearLayout>
diff --git a/LiveDemo/app/src/main/res/layout/activity_stream.xml b/KSYLiveDemo/app/src/main/res/layout/activity_stream.xml
similarity index 100%
rename from LiveDemo/app/src/main/res/layout/activity_stream.xml
rename to KSYLiveDemo/app/src/main/res/layout/activity_stream.xml
diff --git a/KSYLiveDemo/app/src/main/res/layout/activity_surface.xml b/KSYLiveDemo/app/src/main/res/layout/activity_surface.xml
new file mode 100644
index 0000000..9917637
--- /dev/null
+++ b/KSYLiveDemo/app/src/main/res/layout/activity_surface.xml
@@ -0,0 +1,212 @@
+<?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">
+
+    <SurfaceView
+        android:id="@+id/player_surface"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_centerInParent="true"/>
+
+    <TextView
+        android:id="@+id/loading_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:textColor="@color/player_yellow"/>
+
+    <RelativeLayout
+        android:id="@+id/player_qos"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="visible"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true">
+
+        <TextView
+            android:id="@+id/player_cpu"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="10dp"
+            android:textColor="@color/player_yellow"/>
+
+        <TextView
+            android:id="@+id/player_mem"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="10dp"
+            android:layout_below="@+id/player_cpu"
+            android:textColor="@color/player_yellow"/>
+
+        <TextView
+            android:id="@+id/player_re"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/player_mem"
+            android:textSize="10dp"
+            android:textColor="@color/player_yellow"/>
+
+        <TextView
+            android:id="@+id/player_br"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/player_yellow"
+            android:layout_below="@+id/player_re"
+            android:textSize="10dp"/>
+
+        <TextView
+            android:id="@+id/player_fr"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/player_br"
+            android:textColor="@color/player_yellow"
+            android:textSize="10dp"/>
+
+        <TextView
+            android:id="@+id/player_video_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/player_fr"
+            android:textColor="@color/player_yellow"
+            android:textSize="10dp"/>
+
+        <TextView
+            android:id="@+id/player_audio_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/player_video_time"
+            android:textColor="@color/player_yellow"
+            android:textSize="10dp"/>
+
+        <TextView
+            android:id="@+id/player_ip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/player_audio_time"
+            android:textColor="@color/player_yellow"
+            android:textSize="10dp"/>
+
+        <TextView
+            android:id="@+id/player_sdk_version"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/player_ip"
+            android:textColor="@color/player_yellow"
+            android:textSize="10dp"/>
+
+        <TextView
+            android:id="@+id/player_dns_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/player_sdk_version"
+            android:textColor="@color/player_yellow"
+            android:textSize="10dp"/>
+
+        <TextView
+            android:id="@+id/player_http_connection_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/player_dns_time"
+            android:textColor="@color/player_yellow"
+            android:textSize="10dp"/>
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/topPanel_player"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        android:layout_alignParentTop="true">
+
+
+        <Button
+            android:id="@+id/player_scale"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_marginLeft="10dp"
+            android:text="ScaleVideo"
+            android:textSize="10dp"
+            android:textColor="@color/player_black" />
+
+        <Button
+            android:id="@+id/player_reload"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="10dp"
+            android:text="reload"
+            android:layout_toRightOf="@+id/player_scale"
+            android:textColor="@color/player_black" />
+
+        <Button
+            android:id="@+id/btn_rotate_player"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="10dp"
+            android:textSize="10dp"
+            android:textColor="@color/player_black"
+            android:text="旋转"/>
+
+        <Button
+            android:id="@+id/btn_screen_player"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toLeftOf="@+id/btn_rotate_player"
+            android:textColor="@color/player_black"
+            android:textSize="10dp"
+            android:text="截屏"/>
+
+        <Button
+            android:id="@+id/btn_mute_player"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_below="@+id/player_scale"
+            android:textColor="@color/player_black"
+            android:textSize="10dp"
+            android:text="静音"/>
+
+
+    </RelativeLayout>
+
+
+    <LinearLayout
+        android:id="@+id/player_panel"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        android:layout_alignParentBottom="true">
+
+        <ImageView
+            android:id="@+id/player_start"
+            android:layout_width="@dimen/player_panel_start_btn"
+            android:layout_height="@dimen/player_panel_start_btn"
+            android:background="@drawable/qyvideo_start_btn"/>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+
+            <TextView
+                android:id="@+id/player_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="00:00/00:00"
+                android:layout_alignParentLeft="true"/>
+
+            <SeekBar
+                android:id="@+id/player_seekbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/player_time"
+                android:focusable="true"/>
+
+        </RelativeLayout>
+
+    </LinearLayout>
+
+</RelativeLayout>
diff --git a/LiveDemo/app/src/main/res/layout/camera.xml b/KSYLiveDemo/app/src/main/res/layout/camera.xml
similarity index 96%
rename from LiveDemo/app/src/main/res/layout/camera.xml
rename to KSYLiveDemo/app/src/main/res/layout/camera.xml
index cfd64dc..3bcc907 100644
--- a/LiveDemo/app/src/main/res/layout/camera.xml
+++ b/KSYLiveDemo/app/src/main/res/layout/camera.xml
@@ -9,7 +9,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center" />
 
-    <com.ksyun.live.demo.zxing.view.ViewfinderView
+    <com.ksyun.live.demo.player.zxing.view.ViewfinderView
         android:id="@+id/viewfinder_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
diff --git a/LiveDemo/app/src/main/res/layout/camera_activity.xml b/KSYLiveDemo/app/src/main/res/layout/camera_activity.xml
similarity index 83%
rename from LiveDemo/app/src/main/res/layout/camera_activity.xml
rename to KSYLiveDemo/app/src/main/res/layout/camera_activity.xml
index 77b5302..16ae10c 100644
--- a/LiveDemo/app/src/main/res/layout/camera_activity.xml
+++ b/KSYLiveDemo/app/src/main/res/layout/camera_activity.xml
@@ -5,13 +5,20 @@
     android:layout_height="match_parent"
     android:background="@color/recorder_bg_new" >
 
-    <com.ksy.recordlib.service.view.CameraGLSurfaceView
+    <android.opengl.GLSurfaceView
         android:id="@+id/camera_preview"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_alignParentBottom="true"
         android:layout_alignParentTop="true" />
 
+    <com.ksyun.media.streamer.demo.CameraHintView
+        android:id="@+id/camera_hint"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentTop="true" />
+
     <include
         android:id="@+id/actionbar"
         android:layout_width="match_parent"
@@ -19,7 +26,7 @@
         android:layout_gravity="top"
         layout="@layout/camera_titlebar" />
 
-    <EditText
+    <TextView
         android:id="@+id/url"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/LiveDemo/app/src/main/res/layout/camera_bottombar.xml b/KSYLiveDemo/app/src/main/res/layout/camera_bottombar.xml
similarity index 71%
rename from LiveDemo/app/src/main/res/layout/camera_bottombar.xml
rename to KSYLiveDemo/app/src/main/res/layout/camera_bottombar.xml
index 5c8e560..3631048 100644
--- a/LiveDemo/app/src/main/res/layout/camera_bottombar.xml
+++ b/KSYLiveDemo/app/src/main/res/layout/camera_bottombar.xml
@@ -4,14 +4,14 @@
     android:layout_height="wrap_content"
     android:background="#00000000">
 
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:orientation="vertical"
         android:background="#00000000"
-        android:paddingLeft="5dp">
+        android:paddingLeft="5dp"
+        android:id="@+id/linearLayout">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -20,35 +20,35 @@
             android:orientation="horizontal">
 
             <CheckBox
-                android:id="@+id/pitch"
+                android:id="@+id/watermark"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginLeft="10dp"
                 android:layout_weight="1"
                 android:background="#11123456"
-                android:checked="false"
-                android:text="pitch"
+                android:checked="true"
+                android:text="@string/watermark"
                 android:textColor="@color/font_color_35"
                 android:textSize="@dimen/font_size_28px">
             </CheckBox>
 
             <CheckBox
-                android:id="@+id/watermark"
+                android:id="@+id/mute"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginLeft="10dp"
                 android:layout_weight="1"
                 android:background="#11123456"
-                android:checked="true"
-                android:text="watermark"
+                android:checked="false"
+                android:text="@string/mute"
                 android:textColor="@color/font_color_35"
                 android:textSize="@dimen/font_size_28px">
             </CheckBox>
 
             <CheckBox
-                android:id="@+id/mute"
+                android:id="@+id/bgm"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
@@ -56,13 +56,13 @@
                 android:layout_weight="1"
                 android:background="#11123456"
                 android:checked="false"
-                android:text="mute"
+                android:text="@string/bgm"
                 android:textColor="@color/font_color_35"
                 android:textSize="@dimen/font_size_28px">
             </CheckBox>
 
             <CheckBox
-                android:id="@+id/bgm"
+                android:id="@+id/click_to_select_audio_filter"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
@@ -70,7 +70,7 @@
                 android:layout_weight="1"
                 android:background="#11123456"
                 android:checked="false"
-                android:text="bgm"
+                android:text="@string/audio_filter_selected"
                 android:textColor="@color/font_color_35"
                 android:textSize="@dimen/font_size_28px">
             </CheckBox>
@@ -84,7 +84,7 @@
                 android:layout_weight="1"
                 android:background="#11123456"
                 android:checked="false"
-                android:text="ear_mirror"
+                android:text="@string/ear_mirror"
                 android:textColor="@color/font_color_35"
                 android:textSize="@dimen/font_size_28px">
             </CheckBox>
@@ -98,8 +98,8 @@
 
             <ImageView
                 android:id="@+id/backoff"
-                android:layout_width="50dp"
-                android:layout_height="50dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_marginRight="10dp"
                 android:background="@drawable/recorder_delete_icon" />
@@ -111,36 +111,64 @@
                 android:layout_gravity="center"
                 android:layout_weight="1"
                 android:background="#11123456"
-                android:text="click_to_shoot"
+                android:text="@string/click_to_shoot"
                 android:textColor="@color/font_color_35"
                 android:textSize="@dimen/font_size_28px">
             </TextView>
 
-            <TextView
-                android:id="@+id/picture_pip"
+            <CheckBox
+                android:id="@+id/audio_only"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginLeft="10dp"
                 android:layout_weight="1"
                 android:background="#11123456"
-                android:text="picture_pip"
+                android:checked="false"
+                android:text="@string/audio_only"
                 android:textColor="@color/font_color_35"
                 android:textSize="@dimen/font_size_28px">
-            </TextView>
+            </CheckBox>
 
-            <TextView
-                android:id="@+id/pip"
+            <CheckBox
+                android:id="@+id/front_camera_mirror"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginLeft="10dp"
                 android:layout_weight="1"
                 android:background="#11123456"
-                android:text="pip"
+                android:checked="true"
+                android:text="@string/front_mirror"
                 android:textColor="@color/font_color_35"
                 android:textSize="@dimen/font_size_28px">
-            </TextView>
+            </CheckBox>
+
+            <!--<CheckBox-->
+                <!--android:id="@+id/picture_pip"-->
+                <!--android:layout_width="wrap_content"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:layout_gravity="center"-->
+                <!--android:layout_marginLeft="10dp"-->
+                <!--android:layout_weight="1"-->
+                <!--android:background="#11123456"-->
+                <!--android:text="@string/picture_pip"-->
+                <!--android:textColor="@color/font_color_35"-->
+                <!--android:textSize="@dimen/font_size_28px">-->
+            <!--</CheckBox>-->
+
+            <!--<CheckBox-->
+                <!--android:id="@+id/pip"-->
+                <!--android:layout_width="wrap_content"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:layout_gravity="center"-->
+                <!--android:layout_marginLeft="10dp"-->
+                <!--android:layout_weight="1"-->
+                <!--android:background="#11123456"-->
+                <!--android:text="@string/pip"-->
+                <!--android:textColor="@color/font_color_35"-->
+                <!--android:textSize="@dimen/font_size_28px">-->
+            <!--</CheckBox>-->
 
             <CheckBox
                 android:id="@+id/click_to_switch_beauty"
@@ -151,11 +179,11 @@
                 android:layout_weight="1"
                 android:background="#11123456"
                 android:checked="true"
-                android:text="beauty_switcher"
+                android:text="@string/beauty_switcher"
                 android:textColor="@color/font_color_35"
                 android:textSize="@dimen/font_size_28px">
             </CheckBox>
+
         </LinearLayout>
     </LinearLayout>
-
 </RelativeLayout>
\ No newline at end of file
diff --git a/LiveDemo/app/src/main/res/layout/camera_titlebar.xml b/KSYLiveDemo/app/src/main/res/layout/camera_titlebar.xml
similarity index 86%
rename from LiveDemo/app/src/main/res/layout/camera_titlebar.xml
rename to KSYLiveDemo/app/src/main/res/layout/camera_titlebar.xml
index d41e5d1..1a12473 100644
--- a/LiveDemo/app/src/main/res/layout/camera_titlebar.xml
+++ b/KSYLiveDemo/app/src/main/res/layout/camera_titlebar.xml
@@ -18,8 +18,8 @@
 
     <ImageView
         android:id="@+id/switch_cam"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:layout_gravity="center_vertical"
         android:layout_marginRight="10dp"
@@ -27,8 +27,8 @@
 
     <ImageView
         android:id="@+id/flash"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_toLeftOf="@id/switch_cam"
         android:background="@drawable/recorder_flash_icon" >
diff --git a/KSYLiveDemo/app/src/main/res/layout/demo_activity.xml b/KSYLiveDemo/app/src/main/res/layout/demo_activity.xml
new file mode 100755
index 0000000..aae1728
--- /dev/null
+++ b/KSYLiveDemo/app/src/main/res/layout/demo_activity.xml
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView 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"
+    tools:context=".DemoActivity">
+
+    <RelativeLayout
+        android:id="@+id/main"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:focusable="true"
+        android:focusableInTouchMode="true">
+
+        <TextView
+            android:id="@+id/rtmpTxt"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="5dp"
+            android:text="请输入rtmp服务器的地址"
+            android:textSize="16sp" />
+
+        <EditText
+            android:id="@+id/rtmpUrl"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/rtmpTxt"
+            android:text="rtmp://test.uplive.ks-cdn.com/live/androidtest" />
+
+        <Button
+            android:id="@+id/connectBT"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:layout_below="@id/rtmpUrl"
+            android:text="准备直播" />
+
+        <RadioGroup
+            android:id="@+id/resolution_group"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/connectBT"
+            android:orientation="horizontal">
+
+            <RadioButton
+                android:id="@+id/radiobutton1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:checked="true"
+                android:text="360P" />
+
+            <RadioButton
+                android:id="@+id/radiobutton2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:checked="false"
+                android:text="480P" />
+
+            <RadioButton
+                android:id="@+id/radiobutton3"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:checked="false"
+                android:text="540P" />
+
+            <RadioButton
+                android:id="@+id/radiobutton4"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:checked="false"
+                android:text="720P" />
+        </RadioGroup>
+
+        <RadioGroup
+            android:id="@+id/orientation_group"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/resolution_group"
+            android:orientation="horizontal">
+
+            <RadioButton
+                android:id="@+id/orientationbutton1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:checked="false"
+                android:text="横屏" />
+
+            <RadioButton
+                android:id="@+id/orientationbutton2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:checked="true"
+                android:text="竖屏" />
+        </RadioGroup>
+
+        <RadioGroup
+            android:id="@+id/encode_group"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/orientation_group"
+            android:orientation="horizontal">
+
+            <RadioButton
+                android:id="@+id/encode_hw"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:checked="false"
+                android:text="硬编" />
+
+            <RadioButton
+                android:id="@+id/encode_sw"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:checked="true"
+                android:text="软编" />
+
+            <RadioButton
+                android:id="@+id/encode_sw1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:checked="false"
+                android:text="软编1" />
+        </RadioGroup>
+
+        <LinearLayout
+            android:id="@+id/init_group"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/encode_group"
+            android:orientation="vertical">
+
+            <CheckBox
+                android:id="@+id/autoStart"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:checked="false"
+                android:text="初始化完成后启动推流" />
+
+            <CheckBox
+                android:id="@+id/print_debug_info"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:checked="false"
+                android:text="显示调试信息" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/frameRate"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/init_group">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="采集帧率"
+                android:textSize="16sp" />
+
+            <EditText
+                android:id="@+id/frameRatePicker"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="15" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/videoBitrate"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/frameRate"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="视频码率(Max)"
+                android:textSize="16sp" />
+
+            <EditText
+                android:id="@+id/videoBitratePicker"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="800" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/audioBitrate"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/videoBitrate"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="音频码率"
+                android:textSize="16sp" />
+
+            <EditText
+                android:id="@+id/audioBitratePicker"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="48" />
+        </LinearLayout>
+
+
+    </RelativeLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/LiveDemo/app/src/main/res/layout/fragment_local.xml b/KSYLiveDemo/app/src/main/res/layout/fragment_local.xml
similarity index 65%
rename from LiveDemo/app/src/main/res/layout/fragment_local.xml
rename to KSYLiveDemo/app/src/main/res/layout/fragment_local.xml
index 6927842..b675902 100644
--- a/LiveDemo/app/src/main/res/layout/fragment_local.xml
+++ b/KSYLiveDemo/app/src/main/res/layout/fragment_local.xml
@@ -2,16 +2,18 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+
         <android.support.v4.widget.SwipeRefreshLayout
             android:id="@+id/swipe_container"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
-        <ListView
-            android:id="@+id/list_local_frag"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
+                <ListView
+                    android:id="@+id/list_local_frag"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                </ListView>
 
-        </ListView>
         </android.support.v4.widget.SwipeRefreshLayout>
 
 </RelativeLayout>
diff --git a/KSYLiveDemo/app/src/main/res/layout/glrender_view_layout.xml b/KSYLiveDemo/app/src/main/res/layout/glrender_view_layout.xml
new file mode 100644
index 0000000..1de7755
--- /dev/null
+++ b/KSYLiveDemo/app/src/main/res/layout/glrender_view_layout.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextureView
+        android:layout_alignParentRight="true"
+        android:id="@+id/id_textureview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
diff --git a/LiveDemo/app/src/main/res/layout/list_history.xml b/KSYLiveDemo/app/src/main/res/layout/list_history.xml
similarity index 100%
rename from LiveDemo/app/src/main/res/layout/list_history.xml
rename to KSYLiveDemo/app/src/main/res/layout/list_history.xml
diff --git a/LiveDemo/app/src/main/res/layout/list_local.xml b/KSYLiveDemo/app/src/main/res/layout/list_local.xml
similarity index 100%
rename from LiveDemo/app/src/main/res/layout/list_local.xml
rename to KSYLiveDemo/app/src/main/res/layout/list_local.xml
diff --git a/LiveDemo/app/src/main/res/layout/listlayout.xml b/KSYLiveDemo/app/src/main/res/layout/listlayout.xml
similarity index 100%
rename from LiveDemo/app/src/main/res/layout/listlayout.xml
rename to KSYLiveDemo/app/src/main/res/layout/listlayout.xml
diff --git a/LiveDemo/app/src/main/res/layout/media_actionbar.xml b/KSYLiveDemo/app/src/main/res/layout/media_actionbar.xml
similarity index 100%
rename from LiveDemo/app/src/main/res/layout/media_actionbar.xml
rename to KSYLiveDemo/app/src/main/res/layout/media_actionbar.xml
diff --git a/KSYLiveDemo/app/src/main/res/layout/media_controller.xml b/KSYLiveDemo/app/src/main/res/layout/media_controller.xml
new file mode 100755
index 0000000..860cda3
--- /dev/null
+++ b/KSYLiveDemo/app/src/main/res/layout/media_controller.xml
@@ -0,0 +1,58 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="#CC000000"
+    android:orientation="vertical"
+    android:layoutDirection="ltr">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingTop="4dip"
+        android:orientation="horizontal">
+
+        <ImageButton android:id="@+id/prev" style="@android:style/MediaButton.Previous" />
+        <ImageButton android:id="@+id/rew" style="@android:style/MediaButton.Rew" />
+        <ImageButton android:id="@+id/pause" style="@android:style/MediaButton.Play" />
+        <ImageButton android:id="@+id/ffwd" style="@android:style/MediaButton.Ffwd" />
+        <ImageButton android:id="@+id/next" style="@android:style/MediaButton.Next" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <TextView android:id="@+id/time_current"
+            android:textSize="14sp"
+            android:textStyle="bold"
+            android:paddingTop="4dip"
+            android:paddingStart="4dip"
+            android:layout_gravity="center_horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingEnd="4dip" />
+
+        <SeekBar
+            android:id="@+id/mediacontroller_progress"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="0dip"
+            android:layout_weight="1"
+            android:layout_height="32dip"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentRight="true" />
+
+        <TextView android:id="@+id/time"
+            android:textSize="14sp"
+            android:textStyle="bold"
+            android:paddingTop="4dip"
+            android:paddingEnd="4dip"
+            android:layout_gravity="center_horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingStart="4dip" />
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/LiveDemo/app/src/main/res/layout/net_actionbar.xml b/KSYLiveDemo/app/src/main/res/layout/net_actionbar.xml
similarity index 100%
rename from LiveDemo/app/src/main/res/layout/net_actionbar.xml
rename to KSYLiveDemo/app/src/main/res/layout/net_actionbar.xml
diff --git a/LiveDemo/app/src/main/res/layout/pippopwindow.xml b/KSYLiveDemo/app/src/main/res/layout/pippopwindow.xml
similarity index 100%
rename from LiveDemo/app/src/main/res/layout/pippopwindow.xml
rename to KSYLiveDemo/app/src/main/res/layout/pippopwindow.xml
diff --git a/LiveDemo/app/src/main/res/layout/popup_layout.xml b/KSYLiveDemo/app/src/main/res/layout/popup_layout.xml
similarity index 100%
rename from LiveDemo/app/src/main/res/layout/popup_layout.xml
rename to KSYLiveDemo/app/src/main/res/layout/popup_layout.xml
diff --git a/LiveDemo/app/src/main/res/layout/popupwindow.xml b/KSYLiveDemo/app/src/main/res/layout/popupwindow.xml
similarity index 85%
rename from LiveDemo/app/src/main/res/layout/popupwindow.xml
rename to KSYLiveDemo/app/src/main/res/layout/popupwindow.xml
index 65412da..4687a15 100644
--- a/LiveDemo/app/src/main/res/layout/popupwindow.xml
+++ b/KSYLiveDemo/app/src/main/res/layout/popupwindow.xml
@@ -12,11 +12,11 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="美颜"/>
-        <Button
-            android:id="@+id/btn_pip"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="画中画"/>
+        <!--<Button-->
+            <!--android:id="@+id/btn_pip"-->
+            <!--android:layout_width="match_parent"-->
+            <!--android:layout_height="wrap_content"-->
+            <!--android:text="画中画"/>-->
         <Button
             android:id="@+id/btn_audio"
             android:layout_width="match_parent"
diff --git a/LiveDemo/app/src/main/res/layout/qianyi_player.xml b/KSYLiveDemo/app/src/main/res/layout/qianyi_player.xml
similarity index 100%
rename from LiveDemo/app/src/main/res/layout/qianyi_player.xml
rename to KSYLiveDemo/app/src/main/res/layout/qianyi_player.xml
diff --git a/LiveDemo/app/src/main/res/layout/simple_spinner_item.xml b/KSYLiveDemo/app/src/main/res/layout/simple_spinner_item.xml
similarity index 100%
rename from LiveDemo/app/src/main/res/layout/simple_spinner_item.xml
rename to KSYLiveDemo/app/src/main/res/layout/simple_spinner_item.xml
diff --git a/KSYLiveDemo/app/src/main/res/layout/texture_player.xml b/KSYLiveDemo/app/src/main/res/layout/texture_player.xml
new file mode 100644
index 0000000..fbfc05c
--- /dev/null
+++ b/KSYLiveDemo/app/src/main/res/layout/texture_player.xml
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:background="@color/player_black">
+
+    <com.ksyun.media.player.KSYTextureView
+        android:id="@+id/texture_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:targetApi="ice_cream_sandwich"
+        android:layout_centerInParent="true"/>
+
+    <com.ksyun.live.demo.player.activity.MediaController
+        android:id="@+id/media_control"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"/>
+
+    <RelativeLayout
+        android:id="@+id/player_qos"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="visible"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true">
+
+        <TextView
+            android:id="@+id/player_cpu"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="10dp"
+            android:textColor="@color/player_yellow"/>
+
+        <TextView
+            android:id="@+id/player_mem"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="10dp"
+            android:layout_below="@+id/player_cpu"
+            android:textColor="@color/player_yellow"/>
+
+        <TextView
+            android:id="@+id/player_re"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/player_mem"
+            android:textSize="10dp"
+            android:textColor="@color/player_yellow"/>
+
+        <TextView
+            android:id="@+id/player_br"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/player_yellow"
+            android:layout_below="@+id/player_re"
+            android:textSize="10dp"/>
+
+        <TextView
+            android:id="@+id/player_fr"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/player_br"
+            android:textColor="@color/player_yellow"
+            android:textSize="10dp"/>
+
+        <TextView
+            android:id="@+id/player_video_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/player_fr"
+            android:textColor="@color/player_yellow"
+            android:textSize="10dp"/>
+
+        <TextView
+            android:id="@+id/player_audio_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/player_video_time"
+            android:textColor="@color/player_yellow"
+            android:textSize="10dp"/>
+
+        <TextView
+            android:id="@+id/player_ip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/player_audio_time"
+            android:textColor="@color/player_yellow"
+            android:textSize="10dp"/>
+
+        <TextView
+            android:id="@+id/player_sdk_version"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/player_ip"
+            android:textColor="@color/player_yellow"
+            android:textSize="10dp"/>
+
+        <TextView
+            android:id="@+id/player_dns_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/player_sdk_version"
+            android:textColor="@color/player_yellow"
+            android:textSize="10dp"/>
+
+        <TextView
+            android:id="@+id/player_http_connection_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/player_dns_time"
+            android:textColor="@color/player_yellow"
+            android:textSize="10dp"/>
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/topPanel_player"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        android:layout_alignParentTop="true">
+
+
+        <Button
+            android:id="@+id/player_scale"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_marginLeft="10dp"
+            android:text="ScaleVideo"
+            android:textSize="10dp"
+            android:textColor="@color/player_black" />
+
+        <Button
+            android:id="@+id/player_reload"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="10dp"
+            android:text="reload"
+            android:layout_toRightOf="@+id/player_scale"
+            android:textColor="@color/player_black" />
+
+        <Button
+            android:id="@+id/btn_rotate_player"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="10dp"
+            android:textSize="10dp"
+            android:textColor="@color/player_black"
+            android:text="旋转"/>
+
+        <Button
+            android:id="@+id/btn_screen_player"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toLeftOf="@+id/btn_rotate_player"
+            android:textColor="@color/player_black"
+            android:textSize="10dp"
+            android:text="截屏"/>
+
+        <Button
+            android:id="@+id/btn_mute_player"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_below="@+id/player_scale"
+            android:textColor="@color/player_black"
+            android:textSize="10dp"
+            android:text="静音"/>
+
+        <Button
+            android:id="@+id/btn_replay"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_below="@+id/player_reload"
+            android:layout_toRightOf="@+id/btn_mute_player"
+            android:textColor="@color/player_black"
+            android:textSize="10dp"
+            android:text="重置播放器"/>
+
+    </RelativeLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/LiveDemo/app/src/main/res/layout/videopopwindow.xml b/KSYLiveDemo/app/src/main/res/layout/videopopwindow.xml
similarity index 100%
rename from LiveDemo/app/src/main/res/layout/videopopwindow.xml
rename to KSYLiveDemo/app/src/main/res/layout/videopopwindow.xml
diff --git a/LiveDemo/app/src/main/res/mipmap-hdpi/ic_launcher.png b/KSYLiveDemo/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from LiveDemo/app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to KSYLiveDemo/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/LiveDemo/app/src/main/res/mipmap-mdpi/ic_launcher.png b/KSYLiveDemo/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from LiveDemo/app/src/main/res/mipmap-mdpi/ic_launcher.png
rename to KSYLiveDemo/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/LiveDemo/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/KSYLiveDemo/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from LiveDemo/app/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to KSYLiveDemo/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/LiveDemo/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/KSYLiveDemo/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from LiveDemo/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to KSYLiveDemo/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/LiveDemo/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/KSYLiveDemo/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from LiveDemo/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to KSYLiveDemo/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/LiveDemo/app/src/main/res/raw/beep.ogg b/KSYLiveDemo/app/src/main/res/raw/beep.ogg
similarity index 100%
rename from LiveDemo/app/src/main/res/raw/beep.ogg
rename to KSYLiveDemo/app/src/main/res/raw/beep.ogg
diff --git a/KSYLiveDemo/app/src/main/res/raw/fragment_sharder.glsl b/KSYLiveDemo/app/src/main/res/raw/fragment_sharder.glsl
new file mode 100755
index 0000000..9756d5b
--- /dev/null
+++ b/KSYLiveDemo/app/src/main/res/raw/fragment_sharder.glsl
@@ -0,0 +1,9 @@
+#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
diff --git a/LiveDemo/app/src/main/res/raw/realm_properties b/KSYLiveDemo/app/src/main/res/raw/realm_properties
similarity index 100%
rename from LiveDemo/app/src/main/res/raw/realm_properties
rename to KSYLiveDemo/app/src/main/res/raw/realm_properties
diff --git a/KSYLiveDemo/app/src/main/res/raw/vetext_sharder.glsl b/KSYLiveDemo/app/src/main/res/raw/vetext_sharder.glsl
new file mode 100755
index 0000000..5c10b9a
--- /dev/null
+++ b/KSYLiveDemo/app/src/main/res/raw/vetext_sharder.glsl
@@ -0,0 +1,9 @@
+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
diff --git a/LiveDemo/app/src/main/res/values-w820dp/dimens.xml b/KSYLiveDemo/app/src/main/res/values-w820dp/dimens.xml
similarity index 100%
rename from LiveDemo/app/src/main/res/values-w820dp/dimens.xml
rename to KSYLiveDemo/app/src/main/res/values-w820dp/dimens.xml
diff --git a/LiveDemo/app/src/main/res/values/colors.xml b/KSYLiveDemo/app/src/main/res/values/colors.xml
similarity index 100%
rename from LiveDemo/app/src/main/res/values/colors.xml
rename to KSYLiveDemo/app/src/main/res/values/colors.xml
diff --git a/LiveDemo/app/src/main/res/values/dimens.xml b/KSYLiveDemo/app/src/main/res/values/dimens.xml
similarity index 100%
rename from LiveDemo/app/src/main/res/values/dimens.xml
rename to KSYLiveDemo/app/src/main/res/values/dimens.xml
diff --git a/LiveDemo/app/src/main/res/values/ids.xml b/KSYLiveDemo/app/src/main/res/values/ids.xml
similarity index 100%
rename from LiveDemo/app/src/main/res/values/ids.xml
rename to KSYLiveDemo/app/src/main/res/values/ids.xml
diff --git a/LiveDemo/app/src/main/res/values/strings.xml b/KSYLiveDemo/app/src/main/res/values/strings.xml
similarity index 89%
rename from LiveDemo/app/src/main/res/values/strings.xml
rename to KSYLiveDemo/app/src/main/res/values/strings.xml
index b8a17f3..efd4b1f 100644
--- a/LiveDemo/app/src/main/res/values/strings.xml
+++ b/KSYLiveDemo/app/src/main/res/values/strings.xml
@@ -53,6 +53,11 @@
     <string name="debugon">Debug开</string>
     <string name="debugchange">Debubg开关</string>
     <string name="vrchange">VR开关</string>
+    <string name="set_ksytexture">KSYTexture</string>
+    <string name="glrender_view">GLRednerView</string>
+    <string name="audio_filter_selected">音频滤镜</string>
+    <string name="audio_only">音频推流</string>
+    <string name="front_mirror">前置镜像</string>
 
 
 </resources>
diff --git a/LiveDemo/app/src/main/res/values/styles.xml b/KSYLiveDemo/app/src/main/res/values/styles.xml
similarity index 99%
rename from LiveDemo/app/src/main/res/values/styles.xml
rename to KSYLiveDemo/app/src/main/res/values/styles.xml
index a4583bf..54f8415 100644
--- a/LiveDemo/app/src/main/res/values/styles.xml
+++ b/KSYLiveDemo/app/src/main/res/values/styles.xml
@@ -38,4 +38,4 @@
         <item name="android:windowAnimationStyle">@style/DefaultAnimation</item>
     </style>
 
-</resources>
+</resources>
\ No newline at end of file
diff --git a/LiveDemo/build.gradle b/KSYLiveDemo/build.gradle
similarity index 88%
rename from LiveDemo/build.gradle
rename to KSYLiveDemo/build.gradle
index 168f129..c20bca1 100644
--- a/LiveDemo/build.gradle
+++ b/KSYLiveDemo/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0'
+        classpath 'com.android.tools.build:gradle:2.2.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/KSYLiveDemo/build_streamer.sh b/KSYLiveDemo/build_streamer.sh
new file mode 100755
index 0000000..e942000
--- /dev/null
+++ b/KSYLiveDemo/build_streamer.sh
@@ -0,0 +1,87 @@
+#! /bin/sh
+
+set -e
+
+while [ $# -gt 0 ]; do
+    case $1 in
+        help|--help|-h)
+            echo "With none params means build ndk"
+            echo "exp: $0"
+            echo "Use -release to gen streamer out project"
+            echo "-v to set the version"
+            echo "exp: $0 -release -v v4.0.0"
+            exit 0
+            ;;
+        release|-release)
+            RELEASE=1
+            ;;
+        v|-v)
+            CUR_BRANCH=$2
+            shift
+            ;;
+    esac
+    shift
+done
+
+cd libksylive-arm64
+ndk-build clean
+ndk-build
+cd ..
+
+cd libksylive-armv7a
+ndk-build clean
+ndk-build
+cd ..
+
+cd libksylive-x86
+ndk-build clean
+ndk-build
+cd ..
+
+echo "ndk build success"
+
+if [ -z "$RELEASE" ]; then
+    exit 0
+fi
+
+KSYSTREAMER_ANDROID_URL=https://github.com/ksvc/KSYStreamer_Android.git
+OUT_DIR=KSYStreamer_Android_Release
+RELEASE_LIBS=$OUT_DIR/libs
+RELEASE_DOC=$OUT_DIR/docs
+DEMO_DIR=$OUT_DIR/demo
+
+echo "====================== check KSYStreamer_Android ========"
+if [ ! -d "$OUT_DIR" ] ; then
+echo "can't find $OUT_DIR, clone again"
+git clone ${KSYSTREAMER_ANDROID_URL} $OUT_DIR
+fi
+cd $OUT_DIR
+git fetch origin
+git reset --hard
+git checkout master
+git pull origin master
+if [ -n "$CUR_BRANCH" ]; then
+git checkout -b $CUR_BRANCH
+fi
+cd -
+
+echo "====================== copy to  ========"
+cp -p ksystreamerdemo/src/main/AndroidManifest.xml $DEMO_DIR/
+rm -rf $DEMO_DIR/res
+cp -p -r ksystreamerdemo/src/main/res/ $DEMO_DIR/res
+rm -rf $DEMO_DIR/src/*
+cp -p -r ksystreamerdemo/src/main/java/ $DEMO_DIR/src
+rm -rf $RELEASE_LIBS
+mkdir -p $RELEASE_LIBS
+LIB_DIRS="java arm64 armv7a x86"
+for LIB_DIR in $LIB_DIRS
+do
+cp -p -r libksylive-$LIB_DIR/libs/ $RELEASE_LIBS
+done
+cd $DEMO_DIR
+rm -rf libs
+ln -s ../libs libs
+cd -
+rm -rf $RELEASE_DOC
+cp -p -r ../prebuilt/docs/streamer/docs/ $RELEASE_DOC
+echo "====================== copy done  ========"
diff --git a/LiveDemo/gradle.properties b/KSYLiveDemo/gradle.properties
similarity index 78%
rename from LiveDemo/gradle.properties
rename to KSYLiveDemo/gradle.properties
index 1d3591c..aac7c9b 100644
--- a/LiveDemo/gradle.properties
+++ b/KSYLiveDemo/gradle.properties
@@ -9,10 +9,9 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx10248m -XX:MaxPermSize=256m
-# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
\ No newline at end of file
+# org.gradle.parallel=true
diff --git a/LiveDemo/gradle/wrapper/gradle-wrapper.jar b/KSYLiveDemo/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from LiveDemo/gradle/wrapper/gradle-wrapper.jar
rename to KSYLiveDemo/gradle/wrapper/gradle-wrapper.jar
diff --git a/LiveDemo/gradle/wrapper/gradle-wrapper.properties b/KSYLiveDemo/gradle/wrapper/gradle-wrapper.properties
similarity index 93%
rename from LiveDemo/gradle/wrapper/gradle-wrapper.properties
rename to KSYLiveDemo/gradle/wrapper/gradle-wrapper.properties
index 122a0dc..5642922 100644
--- a/LiveDemo/gradle/wrapper/gradle-wrapper.properties
+++ b/KSYLiveDemo/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip
diff --git a/LiveDemo/gradlew b/KSYLiveDemo/gradlew
similarity index 100%
rename from LiveDemo/gradlew
rename to KSYLiveDemo/gradlew
diff --git a/LiveDemo/gradlew.bat b/KSYLiveDemo/gradlew.bat
similarity index 96%
rename from LiveDemo/gradlew.bat
rename to KSYLiveDemo/gradlew.bat
index aec9973..8a0b282 100644
--- a/LiveDemo/gradlew.bat
+++ b/KSYLiveDemo/gradlew.bat
@@ -1,90 +1,90 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/LiveDemo/livelib/.gitignore b/KSYLiveDemo/libksylive/.gitignore
similarity index 100%
rename from LiveDemo/livelib/.gitignore
rename to KSYLiveDemo/libksylive/.gitignore
diff --git a/LiveDemo/livelib/build.gradle b/KSYLiveDemo/libksylive/build.gradle
similarity index 58%
rename from LiveDemo/livelib/build.gradle
rename to KSYLiveDemo/libksylive/build.gradle
index b902f8a..7646abf 100644
--- a/LiveDemo/livelib/build.gradle
+++ b/KSYLiveDemo/libksylive/build.gradle
@@ -2,10 +2,10 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 24
-    buildToolsVersion "24.0.0"
+    buildToolsVersion "24.0.1"
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion 15
         targetSdkVersion 24
         versionCode 1
         versionName "1.0"
@@ -24,10 +24,6 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:24.1.1'
-    compile files('libs/ksylive3.0.jar')
-    compile files('libs/libksyplayer.jar')
-    compile files('libs/libksystat.jar')
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile 'com.android.support:appcompat-v7:24.2.1'
 }
diff --git a/LiveDemo/livelib/libs b/KSYLiveDemo/libksylive/libs
similarity index 100%
rename from LiveDemo/livelib/libs
rename to KSYLiveDemo/libksylive/libs
diff --git a/LiveDemo/app/proguard-rules.pro b/KSYLiveDemo/libksylive/proguard-rules.pro
similarity index 83%
rename from LiveDemo/app/proguard-rules.pro
rename to KSYLiveDemo/libksylive/proguard-rules.pro
index 2340a13..39b21ed 100644
--- a/LiveDemo/app/proguard-rules.pro
+++ b/KSYLiveDemo/libksylive/proguard-rules.pro
@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # By default, the flags in this file are appended to flags specified
-# in /Users/liubohua/Library/Android/sdk/tools/proguard/proguard-android.txt
+# in /Users/xbc/Library/Android/sdk/tools/proguard/proguard-android.txt
 # You can edit the include path and order by changing the proguardFiles
 # directive in build.gradle.
 #
@@ -15,5 +15,3 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
-
--keep class com.ksy.recordlib.** { *;}
diff --git a/LiveDemo/livelib/src/main/AndroidManifest.xml b/KSYLiveDemo/libksylive/src/main/AndroidManifest.xml
similarity index 86%
rename from LiveDemo/livelib/src/main/AndroidManifest.xml
rename to KSYLiveDemo/libksylive/src/main/AndroidManifest.xml
index bd7764f..c5b9af7 100644
--- a/LiveDemo/livelib/src/main/AndroidManifest.xml
+++ b/KSYLiveDemo/libksylive/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.ksy.livelib.demo">
+    package="com.ksyun.libksylive">
 
     <application
         android:allowBackup="true"
diff --git a/KSYLiveDemo/libksylive/src/main/res/values/strings.xml b/KSYLiveDemo/libksylive/src/main/res/values/strings.xml
new file mode 100644
index 0000000..6a67f21
--- /dev/null
+++ b/KSYLiveDemo/libksylive/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">libksylive</string>
+</resources>
diff --git a/KSYLiveDemo/settings.gradle b/KSYLiveDemo/settings.gradle
new file mode 100644
index 0000000..c3a79b3
--- /dev/null
+++ b/KSYLiveDemo/settings.gradle
@@ -0,0 +1 @@
+include ':app', ':libksylive'
\ No newline at end of file
diff --git a/LiveDemo/.idea/.name b/LiveDemo/.idea/.name
deleted file mode 100644
index cfd5c6f..0000000
--- a/LiveDemo/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-LiveDemo
\ No newline at end of file
diff --git a/LiveDemo/app/libs/arm64-v8a/libBugly.so b/LiveDemo/app/libs/arm64-v8a/libBugly.so
deleted file mode 100755
index d4ea212..0000000
Binary files a/LiveDemo/app/libs/arm64-v8a/libBugly.so and /dev/null differ
diff --git a/LiveDemo/app/libs/armeabi-v7a/libBugly.so b/LiveDemo/app/libs/armeabi-v7a/libBugly.so
deleted file mode 100755
index ef557fd..0000000
Binary files a/LiveDemo/app/libs/armeabi-v7a/libBugly.so and /dev/null differ
diff --git a/LiveDemo/app/libs/bugly_crash_release.jar b/LiveDemo/app/libs/bugly_crash_release.jar
deleted file mode 100644
index b2d024b..0000000
Binary files a/LiveDemo/app/libs/bugly_crash_release.jar and /dev/null differ
diff --git a/LiveDemo/app/libs/x86/libBugly.so b/LiveDemo/app/libs/x86/libBugly.so
deleted file mode 100755
index 603bf74..0000000
Binary files a/LiveDemo/app/libs/x86/libBugly.so and /dev/null differ
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/CameraActivity.java b/LiveDemo/app/src/main/java/com/ksyun/live/demo/CameraActivity.java
deleted file mode 100644
index b79d717..0000000
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/CameraActivity.java
+++ /dev/null
@@ -1,1092 +0,0 @@
-package com.ksyun.live.demo;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.Context;
-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.BitmapFactory;
-import android.graphics.Color;
-import android.opengl.GLSurfaceView;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.os.SystemClock;
-import android.support.v4.content.PermissionChecker;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.CheckBox;
-import android.widget.Chronometer;
-import android.widget.CompoundButton;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.ksy.recordlib.service.core.KSYStreamer;
-import com.ksy.recordlib.service.core.KSYStreamerConfig;
-import com.ksy.recordlib.service.hardware.ksyfilter.KSYImageFilter;
-import com.ksy.recordlib.service.stats.OnLogEventListener;
-import com.ksy.recordlib.service.stats.StreamStatusEventHandler;
-import com.ksy.recordlib.service.streamer.OnPreviewFrameListener;
-import com.ksy.recordlib.service.streamer.OnStatusListener;
-import com.ksy.recordlib.service.streamer.RecorderConstants;
-import com.ksy.recordlib.service.util.audio.KSYBgmPlayer;
-import com.ksy.recordlib.service.util.audio.OnAudioRawDataListener;
-import com.ksyun.media.player.IMediaPlayer;
-import com.ksyun.media.player.KSYMediaPlayer;
-
-import java.util.Arrays;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-public class CameraActivity extends Activity {
-
-    private static final String TAG = "CameraActivity";
-
-
-    private GLSurfaceView mCameraPreview;
-
-    private KSYStreamer mStreamer;
-
-    private KSYMediaPlayer mKsyMediaPlayer;
-
-    private KSYBgmPlayer mKsyBgmPlayer;
-
-    private Handler mHandler;
-
-    Bitmap mPipBitmap;
-
-    Bitmap mBitmap;
-
-    private final ButtonObserver mObserverButton = new ButtonObserver();
-
-    private Chronometer chronometer;
-    private View mDeleteView;
-    private View mSwitchCameraView;
-    private View mFlashView;
-    private CheckBox enable_beauty;
-    private TextView mPip;
-    private TextView mPicturePip;
-    private CheckBox mBgm;
-    private CheckBox mEarMirror;
-    private CheckBox mMuteAudio;
-    private CheckBox mWaterMark;
-    private CheckBox mPitch;
-    private TextView mShootingText;
-    private boolean recording = false;
-    private boolean isFlashOpened = false;
-    private boolean startAuto = false;
-    private boolean audio_mix = false;
-    private boolean mute_audio = false;
-    private boolean earMirror = false;
-    private boolean showWaterMark = false;
-    private boolean landscape = false;
-    private boolean printDebugInfo = false;
-    private boolean mPipMode = false;
-    private boolean mPicPipMode = false;
-    private long lastPipClickTime = 0;
-    private float pipVolume = 0.6f;
-    private float bgmVolume = 0.6f;
-    private String mUrl, mDebugInfo = "";
-    private String mBgmPath = "/sdcard/test.mp3";
-    private String mLogoPath = "/sdcard/test.png";
-    private String mPipPath = "/sdcard/test.mp4";
-    private static final String START_STRING = "开始直播";
-    private static final String STOP_STRING = "停止直播";
-    private TextView mUrlTextView, mDebugInfoTextView;
-    private volatile boolean mAcitivityResumed = false;
-    private KSYStreamerConfig.ENCODE_METHOD encode_method = KSYStreamerConfig.ENCODE_METHOD.SOFTWARE;
-    public final static String URL = "url";
-    public final static String FRAME_RATE = "framerate";
-    public final static String VIDEO_BITRATE = "video_bitrate";
-    public final static String AUDIO_BITRATE = "audio_bitrate";
-    public final static String VIDEO_RESOLUTION = "video_resolution";
-    public final static String EncodeWithHEVC = "encode_with_hevc";
-    public final static String LANDSCAPE = "landscape";
-    public final static String ENCDODE_METHOD = "ENCDODE_METHOD";
-    public final static String START_ATUO = "start_auto";
-    public final static String FRONT_CAMERA_MIRROR = "front_camera_mirror";
-    public final static String TEST_SW_FILTER = "testSWFilterInterface";
-    public final static String MANUAL_FOCUS = "manual_focus";
-    public static final String SHOW_DEBUGINFO = "SHOW_DEBUGINFO";
-
-    Timer timer;
-    ExecutorService executorService = Executors.newSingleThreadExecutor();
-
-    private int frameCount;
-    private boolean testSWFilterInterface;
-
-    public static void startActivity(Context context, int fromType,
-                                     String rtmpUrl, int frameRate, int videoBitrate, int audioBitrate,
-                                     int videoResolution, boolean encodeWithHEVC, boolean isLandscape, boolean isFrontCameraMirror, KSYStreamerConfig.ENCODE_METHOD encodeMethod, boolean startAuto,
-                                     boolean testSWFilterInterface, boolean manualFocus, boolean showDebugInfo) {
-        Intent intent = new Intent(context, CameraActivity.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        intent.putExtra("type", fromType);
-        intent.putExtra(URL, rtmpUrl);
-        intent.putExtra(FRAME_RATE, frameRate);
-        intent.putExtra(VIDEO_BITRATE, videoBitrate);
-        intent.putExtra(AUDIO_BITRATE, audioBitrate);
-        intent.putExtra(VIDEO_RESOLUTION, videoResolution);
-        intent.putExtra(EncodeWithHEVC, encodeWithHEVC);
-        intent.putExtra(LANDSCAPE, isLandscape);
-        intent.putExtra(ENCDODE_METHOD, encodeMethod);
-        intent.putExtra(START_ATUO, startAuto);
-        intent.putExtra(FRONT_CAMERA_MIRROR, isFrontCameraMirror);
-        intent.putExtra(TEST_SW_FILTER, testSWFilterInterface);
-        intent.putExtra(MANUAL_FOCUS, manualFocus);
-        intent.putExtra(SHOW_DEBUGINFO, showDebugInfo);
-        context.startActivity(intent);
-    }
-
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-
-        setContentView(R.layout.camera_activity);
-        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
-                WindowManager.LayoutParams.FLAG_FULLSCREEN);
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-
-        mCameraPreview = (GLSurfaceView) findViewById(R.id.camera_preview);
-        mUrlTextView = (TextView) findViewById(R.id.url);
-        enable_beauty = (CheckBox) findViewById(R.id.click_to_switch_beauty);
-        mPip = (TextView) findViewById(R.id.pip);
-        mPip.setClickable(true);
-        mPicturePip = (TextView) findViewById(R.id.picture_pip);
-        mPicturePip.setClickable(true);
-        mBgm = (CheckBox) findViewById(R.id.bgm);
-        mEarMirror = (CheckBox) findViewById(R.id.ear_mirror);
-        mMuteAudio = (CheckBox) findViewById(R.id.mute);
-        mWaterMark = (CheckBox) findViewById(R.id.watermark);
-        mPitch = (CheckBox) findViewById(R.id.pitch);
-
-        audio_mix = mBgm.isChecked();
-        earMirror = mEarMirror.isChecked();
-        mute_audio = mMuteAudio.isChecked();
-        showWaterMark = mWaterMark.isChecked();
-
-        KSYStreamerConfig.Builder builder = new KSYStreamerConfig.Builder();
-        mHandler = new Handler() {
-
-            @Override
-            public void handleMessage(Message msg) {
-                if (msg != null && msg.obj != null) {
-                    String content = msg.obj.toString();
-                    switch (msg.what) {
-                        case RecorderConstants.KSYVIDEO_ENCODED_FRAMES_FAILED:
-                        case RecorderConstants.KSYVIDEO_CODEC_OPEN_FAILED:
-                        case RecorderConstants.KSYVIDEO_CONNECT_FAILED:
-                        case RecorderConstants.KSYVIDEO_DNS_PARSE_FAILED:
-                        case RecorderConstants.KSYVIDEO_RTMP_PUBLISH_FAILED:
-                        case RecorderConstants.KSYVIDEO_CONNECT_BREAK:
-                        case RecorderConstants.KSYVIDEO_AUDIO_INIT_FAILED:
-                        case RecorderConstants.KSYVIDEO_OPEN_CAMERA_FAIL:
-                        case RecorderConstants.KSYVIDEO_CAMERA_PARAMS_ERROR:
-                        case RecorderConstants.KSYVIDEO_AUDIO_START_FAILED:
-                            Toast.makeText(CameraActivity.this, content,
-                                    Toast.LENGTH_LONG).show();
-                            chronometer.stop();
-                            mShootingText.setText(START_STRING);
-                            mShootingText.postInvalidate();
-                            break;
-                        case RecorderConstants.KSYVIDEO_OPEN_STREAM_SUCC:
-                            chronometer.setBase(SystemClock.elapsedRealtime());
-                            // 开始计时
-                            chronometer.start();
-                            mShootingText.setText(STOP_STRING);
-                            mShootingText.postInvalidate();
-                            beginInfoUploadTimer();
-                            break;
-                        case RecorderConstants.KSYVIDEO_INIT_DONE:
-                            if (mShootingText != null)
-                                mShootingText.setEnabled(true);
-                            Toast.makeText(getApplicationContext(), "初始化完成", Toast.LENGTH_SHORT).show();
-                            checkPermission();
-                            if (startAuto && mStreamer.startStream()) {
-                                mShootingText.setText(STOP_STRING);
-                                mShootingText.postInvalidate();
-                                recording = true;
-                            }
-                            break;
-                        default:
-                            Toast.makeText(CameraActivity.this, content,
-                                    Toast.LENGTH_SHORT).show();
-                    }
-                }
-            }
-
-        };
-
-        Bundle bundle = getIntent().getExtras();
-        if (bundle != null) {
-            String url = bundle.getString(URL);
-            if (!TextUtils.isEmpty(url)) {
-                builder.setmUrl(url);
-                mUrl = url;
-                mUrlTextView.setText(mUrl);
-            }
-
-            int frameRate = bundle.getInt(FRAME_RATE, 0);
-            if (frameRate > 0) {
-                builder.setFrameRate(frameRate);
-            }
-
-            int videoBitrate = bundle.getInt(VIDEO_BITRATE, 0);
-            if (videoBitrate > 0) {
-                //设置最高码率，即目标码率
-                builder.setMaxAverageVideoBitrate(videoBitrate);
-                //设置最低码率
-                builder.setMinAverageVideoBitrate(videoBitrate * 2 / 8);
-                //设置初始码率
-                builder.setInitAverageVideoBitrate(videoBitrate * 5 / 8);
-            }
-
-            int audioBitrate = bundle.getInt(AUDIO_BITRATE, 0);
-            if (audioBitrate > 0) {
-                builder.setAudioBitrate(audioBitrate);
-            }
-
-            int videoResolution = bundle.getInt(VIDEO_RESOLUTION, 0);
-            builder.setVideoResolution(videoResolution);
-
-            encode_method = (KSYStreamerConfig.ENCODE_METHOD) bundle.get(ENCDODE_METHOD);
-            builder.setEncodeMethod(encode_method);
-
-            builder.setSampleAudioRateInHz(44100);
-            builder.setEnableStreamStatModule(true);
-
-            landscape = bundle.getBoolean(LANDSCAPE, false);
-            builder.setDefaultLandscape(landscape);
-
-            if (landscape) {
-                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-            } else {
-                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-            }
-            startAuto = bundle.getBoolean(START_ATUO, false);
-
-            boolean isFrontCameraMirror = bundle.getBoolean(FRONT_CAMERA_MIRROR, false);
-            builder.setFrontCameraMirror(isFrontCameraMirror);
-            testSWFilterInterface = bundle.getBoolean(TEST_SW_FILTER, false);
-            boolean focus_manual = bundle.getBoolean(MANUAL_FOCUS, false);
-            builder.setManualFocus(focus_manual);
-            printDebugInfo = bundle.getBoolean(SHOW_DEBUGINFO, false);
-
-            builder.setIsSlightBeauty(false);
-        }
-
-        //可以在这里做权限检查,若没有audio和camera权限,进一步引导用户做权限设置
-        checkPermission();
-        mStreamer = new KSYStreamer(this);
-        mStreamer.setConfig(builder.build());
-        mStreamer.setDisplayPreview(mCameraPreview);
-        //老的状态回调机制
-        mStreamer.setOnStatusListener(mOnErrorListener);
-
-        //新的状态回调机制
-        StreamStatusEventHandler.getInstance().addOnStatusErrorListener(mOnStatusErrorListener);
-        StreamStatusEventHandler.getInstance().addOnStatusInfoListener(mOnStatusInfoListener);
-
-        mStreamer.setOnLogListener(mOnLogListener);
-        mStreamer.setOnAudioRawDataListener(mOnAudioRawDataListener);
-        mStreamer.enableDebugLog(true);
-        mStreamer.setMuteAudio(mute_audio);
-        mStreamer.setEnableEarMirror(earMirror);
-        mStreamer.setBeautyFilter(RecorderConstants.FILTER_BEAUTY_DENOISE);
-        if (showWaterMark) {
-            showWaterMark();
-        }
-
-        if (testSWFilterInterface) {
-            mStreamer.setOnPreviewFrameListener(new OnPreviewFrameListener() {
-                @Override
-                public void onPreviewFrame(byte[] data, int width, int height, boolean isRecording) {
-                    frameCount++;
-                    if (isRecording) {
-                        Arrays.fill(data, width * height, data.length, (byte) 128);
-                    }
-                    if (frameCount % 60 == 0) {
-                        Log.e(TAG, "setOnPreviewFrameListener" + isRecording);
-                    }
-                }
-            });
-        }
-
-        enable_beauty.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                if (isChecked) {
-                    if (encode_method == KSYStreamerConfig.ENCODE_METHOD.SOFTWARE) {
-                        mStreamer.setBeautyFilter(RecorderConstants.FILTER_BEAUTY_DENOISE);
-                    } else {
-                        showChooseFilter();
-                    }
-                } else {
-                    if (encode_method == KSYStreamerConfig.ENCODE_METHOD.SOFTWARE) {
-                        mStreamer.setBeautyFilter(RecorderConstants.FILTER_BEAUTY_DISABLE);
-                    } else {
-                        mStreamer.setBeautyFilter(new KSYImageFilter());
-                    }
-                }
-            }
-        });
-
-        mPip.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                long curTime = System.currentTimeMillis();
-                if (curTime - lastPipClickTime < 1000) {
-                    return;
-                }
-                lastPipClickTime = curTime;
-                if (mPicPipMode) {
-                    mStreamer.hidePipBitmap();
-                    if (mPipBitmap != null) {
-                        mPipBitmap.recycle();
-                        mPipBitmap = null;
-                    }
-                    mPicPipMode = false;
-                    mPicturePip.setText(CameraActivity.this.getResources().getString(R.string.app_name));
-                    mPicturePip.postInvalidate();
-                }
-
-                if (!mPipMode) {
-                    mKsyMediaPlayer = new KSYMediaPlayer.Builder(CameraActivity.this).build();
-                    mKsyMediaPlayer.setOnBufferingUpdateListener(mOnBufferingUpdateListener);
-                    mKsyMediaPlayer.setOnCompletionListener(mOnCompletionListener);
-                    mKsyMediaPlayer.setOnInfoListener(mOnInfoListener);
-                    mKsyMediaPlayer.setOnErrorListener(mOnPlayerErrorListener);
-                    mKsyMediaPlayer.setOnSeekCompleteListener(mOnSeekCompletedListener);
-                    mKsyMediaPlayer.setScreenOnWhilePlaying(true);
-                    mKsyMediaPlayer.setBufferTimeMax(5);
-                    mKsyMediaPlayer.setLooping(true);
-                    mKsyMediaPlayer.setVolume(pipVolume, pipVolume);
-                    mKsyMediaPlayer.setPlayerMute(earMirror ? 1 : 0);
-                    mStreamer.setPipPlayer(mKsyMediaPlayer);
-                    mStreamer.setHeadsetPlugged(true);
-                    mStreamer.setPipLocation(0.6f, 0.6f, 0.4f, 0.4f);
-                    mStreamer.startPlayer(mPipPath);
-                    mPipMode = true;
-                    mPip.setText(CameraActivity.this.getResources().getString(R.string.app_name));
-                    mPip.postInvalidate();
-                } else {
-                    if (mKsyMediaPlayer != null) {
-                        mKsyMediaPlayer.stop();
-                        mKsyMediaPlayer.release();
-                        mStreamer.stopPlayer();
-                        mKsyMediaPlayer = null;
-                    }
-                    mPipMode = false;
-                    mPip.setText(CameraActivity.this.getResources().getString(R.string.app_name));
-                    mPip.postInvalidate();
-                }
-            }
-        });
-
-        mPicturePip.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-
-                long curTime = System.currentTimeMillis();
-                if (curTime - lastPipClickTime < 1000) {
-                    return;
-                }
-                lastPipClickTime = curTime;
-                if (mPipMode) {
-                    if (mKsyMediaPlayer != null) {
-                        mKsyMediaPlayer.stop();
-                        mKsyMediaPlayer.release();
-                        mStreamer.stopPlayer();
-                        mKsyMediaPlayer = null;
-                    }
-                    mPipMode = false;
-                    mPip.setText(CameraActivity.this.getResources().getString(R.string.app_name));
-                    mPip.postInvalidate();
-                }
-
-                if (!mPicPipMode) {
-                    executorService.submit(new Runnable() {
-                        @Override
-                        public void run() {
-                            mPipBitmap = BitmapFactory.decodeFile("/sdcard/test.png");
-                            mStreamer.showPipBitmap(mPipBitmap, 0.6f, 0.6f, 0.4f, 0.4f);
-                            mPicPipMode = true;
-                            mPicturePip.setText(CameraActivity.this.getResources().getString(R.string.app_name));
-                            mPicturePip.postInvalidate();
-                        }
-                    });
-                } else {
-                    mStreamer.hidePipBitmap();
-                    if (mPipBitmap != null) {
-                        mPipBitmap.recycle();
-                        mPipBitmap = null;
-                    }
-                    mPicPipMode = false;
-                    mPicturePip.setText(CameraActivity.this.getResources().getString(R.string.app_name));
-                    mPicturePip.postInvalidate();
-                }
-            }
-        });
-
-
-        mBgm.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                if (isChecked) {
-                    mKsyBgmPlayer = KSYBgmPlayer.getInstance();
-                    mKsyBgmPlayer.setOnBgmPlayerListener(mBgmListener);
-                    mKsyBgmPlayer.setVolume(bgmVolume);
-                    mKsyBgmPlayer.setMute(earMirror);
-                    mStreamer.setBgmPlayer(mKsyBgmPlayer);
-                    mStreamer.startMixMusic(mBgmPath, true);
-                    mStreamer.setHeadsetPlugged(true);
-                } else {
-                    mStreamer.stopMixMusic();
-                }
-            }
-        });
-
-        mEarMirror.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                earMirror = isChecked;
-                if (mKsyBgmPlayer != null) {
-                    mKsyBgmPlayer.setMute(isChecked);
-                }
-                if (mKsyMediaPlayer != null) {
-                    mKsyMediaPlayer.setPlayerMute(isChecked ? 1 : 0);
-                }
-                mStreamer.setEnableEarMirror(isChecked);
-            }
-        });
-
-        mMuteAudio.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                mStreamer.setMuteAudio(isChecked);
-            }
-        });
-
-        mWaterMark.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                if (isChecked)
-                    showWaterMark();
-                else
-                    hideWaterMark();
-            }
-        });
-
-        mPitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                // 升降调，变速
-                if ( isChecked ) {
-                    mStreamer.setEnableAudioEffect(true);
-                    mStreamer.setPitch(-0.318f);
-                    mStreamer.setSpeed(1 / 0.7f);
-                    mStreamer.setTempo(0.7f);
-                }else{
-                    mStreamer.setEnableAudioEffect(false);
-                }
-            }
-        });
-
-
-        mShootingText = (TextView) findViewById(R.id.click_to_shoot);
-        mShootingText.setClickable(true);
-        mShootingText.setOnClickListener(new View.OnClickListener() {
-
-            @Override
-            public void onClick(View arg0) {
-                if (recording) {
-                    if (mStreamer.stopStream()) {
-                        chronometer.stop();
-                        mShootingText.setText(START_STRING);
-                        mShootingText.postInvalidate();
-                        recording = false;
-                    } else {
-                        Log.e(TAG, "操作太频繁");
-                    }
-                } else {
-                    checkPermission();
-                    if (mStreamer.startStream()) {
-                        mShootingText.setText(STOP_STRING);
-                        mShootingText.postInvalidate();
-                        recording = true;
-
-                        // 混响
-                        mStreamer.setEnableReverb(true);
-                        mStreamer.setReverbLevel(4);
-                    } else {
-                        Log.e(TAG, "操作太频繁");
-                    }
-                }
-
-            }
-        });
-        if (startAuto) {
-            mShootingText.setEnabled(false);
-        }
-
-        mDeleteView = findViewById(R.id.backoff);
-        mDeleteView.setOnClickListener(mObserverButton);
-        mDeleteView.setEnabled(true);
-
-        mSwitchCameraView = findViewById(R.id.switch_cam);
-        mSwitchCameraView.setOnClickListener(mObserverButton);
-        mSwitchCameraView.setEnabled(true);
-
-        mFlashView = findViewById(R.id.flash);
-        mFlashView.setOnClickListener(mObserverButton);
-        mFlashView.setEnabled(true);
-
-        chronometer = (Chronometer) this.findViewById(R.id.chronometer);
-        mDebugInfoTextView = (TextView) this.findViewById(R.id.debuginfo);
-    }
-
-    private void beginInfoUploadTimer() {
-        if (printDebugInfo && timer == null) {
-            timer = new Timer();
-            timer.schedule(new TimerTask() {
-                @Override
-                public void run() {
-                    updateDebugInfo();
-                    runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            mDebugInfoTextView.setText(mDebugInfo);
-                        }
-                    });
-                }
-            }, 100, 3000);
-        }
-    }
-
-    //update debug info
-    private void updateDebugInfo() {
-        if (mStreamer == null) return;
-        mDebugInfo = String.format("RtmpHostIP()=%s DroppedFrameCount()=%d \n " +
-                        "ConnectTime()=%d DnsParseTime()=%d \n " +
-                        "UploadedKB()=%d EncodedFrames()=%d \n" +
-                        "CurrentBitrate=%f Version()=%s",
-                mStreamer.getRtmpHostIP(), mStreamer.getDroppedFrameCount(),
-                mStreamer.getConnectTime(), mStreamer.getDnsParseTime(),
-                mStreamer.getUploadedKBytes(), mStreamer.getEncodedFrames(),
-                mStreamer.getCurrentBitrate(), mStreamer.getVersion());
-    }
-
-    //show watermark in specific location
-    private void showWaterMark() {
-        if (!landscape) {
-            mStreamer.showWaterMarkLogo(mLogoPath, 0.08f, 0.06f, 0.27f, 0.15f, 0.8f);
-            mStreamer.showWaterMarkTime(0.02f, 0.015f, 0.4f, Color.RED, 1.0f);
-        } else {
-            mStreamer.showWaterMarkLogo(mLogoPath, 0.06f, 0.08f, 0.15f, 0.27f, 0.8f);
-            mStreamer.showWaterMarkTime(0.015f, 0.02f, 0.25f, Color.RED, 1.0f);
-        }
-    }
-
-    private void hideWaterMark() {
-        mStreamer.hideWaterMarkLogo();
-        mStreamer.hideWaterMarkTime();
-    }
-
-    private void showChooseFilter() {
-        AlertDialog alertDialog;
-        alertDialog = new AlertDialog.Builder(this).setTitle("请选择美颜滤镜").setSingleChoiceItems(
-                new String[]{"BEAUTY_SOFT", "SKIN_WHITEN", "BEAUTY_ILLUSION", "DENOISE", "DEMOFILTER", "SPLIT_E/P_FILTER", "GROUP_FILTER"}, -1, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        if (which < 4) {
-                            mStreamer.setBeautyFilter(which + 16);
-                        } else if (which == 4) {
-
-                        } else if (which == 5) {
-                            mStreamer.setBeautyFilter(new DEMOFILTER(), RecorderConstants.FILTER_USAGE_ENCODE);
-                            mStreamer.setBeautyFilter(new DEMOFILTER2(), RecorderConstants.FILTER_USAGE_PREVIEW);
-                        } else if (which == 6) {
-                            mStreamer.setBeautyFilter(new GroupFilterDemo());
-                        }
-                        dialog.dismiss();
-                    }
-                })
-                .create();
-        alertDialog.setCancelable(false);
-        alertDialog.show();
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        //可以在这里做权限检查,若没有audio和camera权限,进一步引导用户做权限设置
-        checkPermission();
-        if (mKsyBgmPlayer != null) {
-            mKsyBgmPlayer.resume();
-        }
-        if (mKsyMediaPlayer != null) {
-            mKsyMediaPlayer.start();
-        }
-        mStreamer.onResume();
-        mAcitivityResumed = true;
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        if (mKsyBgmPlayer != null) {
-            mKsyBgmPlayer.pause();
-        }
-        if (mKsyMediaPlayer != null) {
-            mKsyMediaPlayer.pause();
-        }
-        mStreamer.onPause();
-        mAcitivityResumed = false;
-    }
-
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        switch (keyCode) {
-            case KeyEvent.KEYCODE_BACK:
-                new AlertDialog.Builder(CameraActivity.this).setCancelable(true)
-                        .setTitle("结束直播?")
-                        .setNegativeButton("取消", new DialogInterface.OnClickListener() {
-
-                            @Override
-                            public void onClick(DialogInterface arg0, int arg1) {
-
-                            }
-                        })
-                        .setPositiveButton("确定", new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface arg0, int arg1) {
-                                mStreamer.stopStream(true);
-                                chronometer.stop();
-                                recording = false;
-                                CameraActivity.this.finish();
-                            }
-                        }).show();
-                break;
-
-            default:
-                break;
-        }
-        return true;
-    }
-
-    //推流失败,需要退出重新启动推流,建议做log输出,方便快速定位问题
-    public StreamStatusEventHandler.OnStatusErrorListener mOnStatusErrorListener = new StreamStatusEventHandler.OnStatusErrorListener() {
-        @Override
-        public void onError(int what, int arg1, int arg2, String msg) {
-            switch (what) {
-                case RecorderConstants.KSYVIDEO_ENCODED_FRAMES_FAILED:
-                    //视频编码失败,发生在软解,会停止推流
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_ENCODED_FRAMES_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_CODEC_OPEN_FAILED:
-                    //编码器初始化失败,发生在推流开始时
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CODEC_OPEN_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_CONNECT_FAILED:
-                    //打开编码器的输入输出文件失败,发生在推流开始时,会停止推流
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CONNECT_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_DNS_PARSE_FAILED:
-                    //打开编码器的输入输出文件失败,发生在推流开始时,会停止推流
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CONNECT_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_RTMP_PUBLISH_FAILED:
-                    //打开编码器的输入输出文件失败,发生在推流开始时,会停止推流
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CONNECT_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_CONNECT_BREAK:
-                    //写入一个音视频文件失败
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CONNECT_BREAK");
-                    break;
-                case RecorderConstants.KSYVIDEO_AUDIO_INIT_FAILED:
-                    //软编,音频初始化失败
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_AUDIO_INIT_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_AUDIO_COVERT_FAILED:
-                    //软编,音频转码失败
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_AUDIO_COVERT_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_OPEN_CAMERA_FAIL:
-                    //openCamera失败
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_OPEN_CAMERA_FAIL");
-                    break;
-                case RecorderConstants.KSYVIDEO_CAMERA_PARAMS_ERROR:
-                    //获取不到camera参数,android 6.0 以下没有camera权限时可能发生
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CAMERA_PARAMS_ERROR");
-                    break;
-                case RecorderConstants.KSYVIDEO_AUDIO_START_FAILED:
-                    //audio startRecord 失败
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_AUDIO_START_FAILED");
-                    break;
-                default:
-                    break;
-            }
-
-//            if (mHandler != null) {
-//                mHandler.obtainMessage(what, msg).sendToTarget();
-//            }
-        }
-    };
-
-    public StreamStatusEventHandler.OnStatusInfoListener mOnStatusInfoListener = new StreamStatusEventHandler.OnStatusInfoListener() {
-        @Override
-        public void onInfo(int what, int arg1, int arg2, String msg) {
-            switch (what) {
-                case RecorderConstants.KSYVIDEO_OPEN_STREAM_SUCC:
-                    //推流成功
-                    Log.d("TAG", "KSYVIDEO_OPEN_STREAM_SUCC");
-//                    mHandler.obtainMessage(what, "start stream succ")
-//                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_FRAME_DATA_SEND_SLOW:
-                    //网络状况不佳
-//                    if (mHandler != null) {
-//                        mHandler.obtainMessage(what, "network not good").sendToTarget();
-//                    }
-                    break;
-                case RecorderConstants.KSYVIDEO_EST_BW_RAISE:
-                    //码率上调
-                    Log.d("TAG", "KSYVIDEO_EST_BW_RAISE");
-                    break;
-                case RecorderConstants.KSYVIDEO_EST_BW_DROP:
-                    //码率下调
-                    Log.d("TAG", "KSYVIDEO_EST_BW_DROP");
-                    break;
-                case RecorderConstants.KSYVIDEO_INIT_DONE:
-                    //video preview init done
-                    Log.d("TAG", "KSYVIDEO_INIT_DONE");
-                    break;
-                case RecorderConstants.KSYVIDEO_PIP_EXCEPTION:
-                    Log.d("TAG", "KSYVIDEO_PIP_EXCEPTION");
-//                    mHandler.obtainMessage(what, "pip exception")
-//                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_RENDER_EXCEPTION:
-                    Log.d("TAG", "KSYVIDEO_RENDER_EXCEPTION");
-//                    mHandler.obtainMessage(what, "renderer exception")
-//                            .sendToTarget();
-                    break;
-                default:
-                    break;
-
-            }
-        }
-    };
-
-    public OnStatusListener mOnErrorListener = new OnStatusListener() {
-        @Override
-        public void onStatus(int what, int arg1, int arg2, String msg) {
-            // msg may be null
-            switch (what) {
-                case RecorderConstants.KSYVIDEO_OPEN_STREAM_SUCC:
-                    // 推流成功
-                    Log.d("TAG", "KSYVIDEO_OPEN_STREAM_SUCC");
-                    mHandler.obtainMessage(what, "start stream succ")
-                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_ENCODED_FRAMES_FAILED:
-                    //编码失败
-                    Log.e(TAG, "---------KSYVIDEO_ENCODED_FRAMES_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_WLD_UPLOAD:
-                    break;
-                case RecorderConstants.KSYVIDEO_FRAME_DATA_SEND_SLOW:
-                    //网络状况不佳
-                    if (mHandler != null) {
-                        mHandler.obtainMessage(what, "network not good").sendToTarget();
-                    }
-                    break;
-                case RecorderConstants.KSYVIDEO_EST_BW_DROP:
-                    //编码码率下降状态通知
-                    break;
-                case RecorderConstants.KSYVIDEO_EST_BW_RAISE:
-                    //编码码率上升状态通知
-                    break;
-                case RecorderConstants.KSYVIDEO_AUDIO_INIT_FAILED:
-                    Log.e("CameraActivity", "init audio failed");
-                    //音频录制初始化失败回调
-                    break;
-                case RecorderConstants.KSYVIDEO_INIT_DONE:
-                    mHandler.obtainMessage(what, "init done")
-                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_PIP_EXCEPTION:
-                    mHandler.obtainMessage(what, "pip exception")
-                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_RENDER_EXCEPTION:
-                    mHandler.obtainMessage(what, "renderer exception")
-                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_AUDIO_START_FAILED:
-                    Log.e("CameraActivity", "-------audio start failed");
-                    break;
-                case RecorderConstants.KSYVIDEO_CAMERA_PARAMS_ERROR:
-                    Log.e("CameraActivity", "-------camera param is null");
-                    break;
-                case RecorderConstants.KSYVIDEO_OPEN_CAMERA_FAIL:
-                    Log.e("CameraActivity", "-------open camera failed");
-                    break;
-                default:
-                    if (msg != null) {
-                        // 可以在这里处理断网重连的逻辑
-                        if (TextUtils.isEmpty(mUrl)) {
-                            mStreamer
-                                    .updateUrl("rtmp://test.uplive.ksyun.com/live/androidtest");
-                        } else {
-                            mStreamer.updateUrl(mUrl);
-                        }
-                        if (!executorService.isShutdown()) {
-                            executorService.submit(new Runnable() {
-
-                                @Override
-                                public void run() {
-                                    boolean needReconnect = true;
-                                    try {
-                                        while (needReconnect) {
-                                            Thread.sleep(3000);
-                                            //只在Activity对用户可见时重连
-                                            if (mAcitivityResumed) {
-                                                if (mStreamer.startStream()) {
-                                                    recording = true;
-                                                    needReconnect = false;
-                                                }
-                                            }
-                                        }
-                                    } catch (InterruptedException e) {
-                                        e.printStackTrace();
-                                    }
-                                }
-
-                            });
-                        }
-                    }
-                    if (mHandler != null) {
-                        mHandler.obtainMessage(what, msg).sendToTarget();
-                    }
-            }
-        }
-
-    };
-
-    private KSYBgmPlayer.OnBgmPlayerListener mBgmListener = new KSYBgmPlayer.OnBgmPlayerListener() {
-        @Override
-        public void onCompleted() {
-            Log.d(TAG, "End of the currently playing music");
-        }
-
-        @Override
-        public void onError(int err) {
-            Log.e(TAG, "onMusicError: " + err);
-        }
-    };
-
-    private OnLogEventListener mOnLogListener = new OnLogEventListener() {
-        @Override
-        public void onLogEvent(StringBuffer singleLogContent) {
-            Log.d(TAG, "***onLogEvent : " + singleLogContent.toString());
-        }
-    };
-
-    private OnAudioRawDataListener mOnAudioRawDataListener = new OnAudioRawDataListener() {
-        @Override
-        public short[] OnAudioRawData(short[] data, int count) {
-            //audio pcm data
-            return data;
-        }
-    };
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        //新的状态回调机制
-        StreamStatusEventHandler.getInstance().removeStatusErrorListener(mOnStatusErrorListener);
-        StreamStatusEventHandler.getInstance().removeStatusInfoListener(mOnStatusInfoListener);
-
-        if (mKsyBgmPlayer != null) {
-            mKsyBgmPlayer.release();
-            mKsyBgmPlayer = null;
-        }
-        if (mKsyMediaPlayer != null) {
-            mKsyMediaPlayer.release();
-            mKsyMediaPlayer = null;
-        }
-        mStreamer.onDestroy();
-        executorService.shutdownNow();
-        if (mHandler != null) {
-            mHandler.removeCallbacksAndMessages(null);
-            mHandler = null;
-        }
-        if (timer != null) {
-            timer.cancel();
-        }
-    }
-
-    private boolean clearState() {
-        if (clearBackoff()) {
-            return true;
-        }
-        return false;
-    }
-
-    private long lastClickTime = 0;
-
-    private void onSwitchCamClick() {
-        long curTime = System.currentTimeMillis();
-        if (curTime - lastClickTime < 1000) {
-            return;
-        }
-        lastClickTime = curTime;
-
-        if (clearState()) {
-            return;
-        }
-        mStreamer.switchCamera();
-
-    }
-
-    private void onFlashClick() {
-        if (mStreamer.isFrontCamera())
-            isFlashOpened = true;
-
-        if (isFlashOpened) {
-            mStreamer.toggleTorch(false);
-            isFlashOpened = false;
-        } else {
-            mStreamer.toggleTorch(true);
-            isFlashOpened = true;
-        }
-    }
-
-    private boolean clearBackoff() {
-        if (mDeleteView.isSelected()) {
-            mDeleteView.setSelected(false);
-            return true;
-        }
-        return false;
-    }
-
-    private void onBackoffClick() {
-
-        new AlertDialog.Builder(CameraActivity.this).setCancelable(true)
-                .setTitle("结束直播?")
-                .setNegativeButton("取消", new DialogInterface.OnClickListener() {
-
-                    @Override
-                    public void onClick(DialogInterface arg0, int arg1) {
-
-                    }
-                })
-                .setPositiveButton("确定", new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface arg0, int arg1) {
-                        mStreamer.stopStream(true);
-                        chronometer.stop();
-                        recording = false;
-                        CameraActivity.this.finish();
-                    }
-                }).show();
-    }
-
-    private class ButtonObserver implements View.OnClickListener {
-        @Override
-        public void onClick(View view) {
-            switch (view.getId()) {
-                case R.id.switch_cam:
-                    onSwitchCamClick();
-                    break;
-                case R.id.backoff:
-                    onBackoffClick();
-                    break;
-                case R.id.flash:
-                    onFlashClick();
-                    break;
-                default:
-                    break;
-            }
-        }
-    }
-
-    private IMediaPlayer.OnBufferingUpdateListener mOnBufferingUpdateListener = new IMediaPlayer.OnBufferingUpdateListener() {
-        @Override
-        public void onBufferingUpdate(IMediaPlayer mp, int percent) {
-            long duration = mKsyMediaPlayer.getDuration();
-            long progress = duration * percent / 100;
-        }
-    };
-
-    private IMediaPlayer.OnSeekCompleteListener mOnSeekCompletedListener = new IMediaPlayer.OnSeekCompleteListener() {
-        @Override
-        public void onSeekComplete(IMediaPlayer mp) {
-            Log.d(TAG, "onSeekComplete...............");
-        }
-    };
-
-    private IMediaPlayer.OnCompletionListener mOnCompletionListener = new IMediaPlayer.OnCompletionListener() {
-        @Override
-        public void onCompletion(IMediaPlayer mp) {
-
-        }
-    };
-
-    private IMediaPlayer.OnErrorListener mOnPlayerErrorListener = new IMediaPlayer.OnErrorListener() {
-        @Override
-        public boolean onError(IMediaPlayer mp, int what, int extra) {
-            switch (what) {
-                case KSYMediaPlayer.MEDIA_ERROR_UNKNOWN:
-                    Log.e(TAG, "OnErrorListener, Error Unknown:" + what + ",extra:" + extra);
-                    break;
-                default:
-                    Log.e(TAG, "OnErrorListener, Error:" + what + ",extra:" + extra);
-            }
-
-            return false;
-        }
-    };
-
-    public IMediaPlayer.OnInfoListener mOnInfoListener = new IMediaPlayer.OnInfoListener() {
-        @Override
-        public boolean onInfo(IMediaPlayer iMediaPlayer, int i, int i1) {
-            Log.d(TAG, "onInfo, what:" + i + ",extra:" + i1);
-            return false;
-        }
-    };
-
-    private boolean checkPermission() {
-        try {
-            int pRecordAudio = PermissionChecker.checkCallingOrSelfPermission(this, "android.permission.RECORD_AUDIO");
-            int pCamera = PermissionChecker.checkCallingOrSelfPermission(this, "android.permission.CAMERA");
-
-            if (pRecordAudio != PackageManager.PERMISSION_GRANTED) {
-                Log.e(TAG, "do not have AudioRecord permission, please check");
-                Toast.makeText(this, "do not have AudioRecord permission, please check", Toast.LENGTH_LONG).show();
-                return false;
-            }
-            if (pCamera != PackageManager.PERMISSION_GRANTED) {
-                Log.e(TAG, "do not have CAMERA permission, please check");
-                Toast.makeText(this, "do not have CAMERA permission, please check", Toast.LENGTH_LONG).show();
-                return false;
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return true;
-    }
-
-}
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/CameraActivityAudioEffect.java b/LiveDemo/app/src/main/java/com/ksyun/live/demo/CameraActivityAudioEffect.java
deleted file mode 100644
index 5f02bb0..0000000
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/CameraActivityAudioEffect.java
+++ /dev/null
@@ -1,746 +0,0 @@
-package com.ksyun.live.demo;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageManager;
-import android.opengl.GLSurfaceView;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.os.SystemClock;
-import android.support.v4.content.PermissionChecker;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.CheckBox;
-import android.widget.Chronometer;
-import android.widget.CompoundButton;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.ksy.recordlib.service.core.KSYStreamer;
-import com.ksy.recordlib.service.core.KSYStreamerConfig;
-import com.ksy.recordlib.service.stats.OnLogEventListener;
-import com.ksy.recordlib.service.stats.StreamStatusEventHandler;
-import com.ksy.recordlib.service.streamer.OnStatusListener;
-import com.ksy.recordlib.service.streamer.RecorderConstants;
-
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-public class CameraActivityAudioEffect extends Activity {
-
-    private static final String TAG = "CameraActivityAudio";
-    private GLSurfaceView mCameraPreview;
-    private KSYStreamer mStreamer;
-    private Handler mHandler;
-    private final ButtonObserver mObserverButton = new ButtonObserver();
-
-    private Chronometer chronometer;
-    private View mDeleteView;
-    private View mSwitchCameraView;
-    private View mFlashView;
-    private TextView mShootingText;
-
-    private CheckBox mPitch;
-    private CheckBox mReverb;
-
-    private boolean recording = false;
-    private boolean isFlashOpened = false;
-    private boolean startAuto = false;
-    private boolean landscape = false;
-    private boolean printDebugInfo = false;
-    private long lastPipClickTime = 0;
-    private String mUrl, mDebugInfo = "";
-    private static final String START_STRING = "开始直播";
-    private static final String STOP_STRING = "停止直播";
-    private TextView mUrlTextView, mDebugInfoTextView;
-    private volatile boolean mAcitivityResumed = false;
-    private KSYStreamerConfig.ENCODE_METHOD encode_method = KSYStreamerConfig.ENCODE_METHOD.SOFTWARE;
-    public final static String URL = "url";
-    public final static String FRAME_RATE = "framerate";
-    public final static String VIDEO_BITRATE = "video_bitrate";
-    public final static String AUDIO_BITRATE = "audio_bitrate";
-    public final static String VIDEO_RESOLUTION = "video_resolution";
-    public final static String LANDSCAPE = "landscape";
-    public final static String ENCDODE_METHOD = "ENCDODE_METHOD";
-    public final static String START_ATUO = "start_auto";
-    public final static String MANUAL_FOCUS = "manual_focus";
-    public static final String SHOW_DEBUGINFO = "SHOW_DEBUGINFO";
-
-    Timer timer;
-    ExecutorService executorService = Executors.newSingleThreadExecutor();
-
-    public static void startActivity(Context context, int fromType,
-                                     String rtmpUrl, int frameRate, int videoBitrate, int audioBitrate,
-                                     int videoResolution, boolean isLandscape, KSYStreamerConfig.ENCODE_METHOD encodeMethod, boolean startAuto,
-                                      boolean manualFocus, boolean showDebugInfo,int audiohz) {
-        Intent intent = new Intent(context, CameraActivityAudioEffect.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        intent.putExtra("type", fromType);
-        intent.putExtra(URL, rtmpUrl);
-        intent.putExtra(FRAME_RATE, frameRate);
-        intent.putExtra(VIDEO_BITRATE, videoBitrate);
-        intent.putExtra(AUDIO_BITRATE, audioBitrate);
-        intent.putExtra(VIDEO_RESOLUTION, videoResolution);
-        intent.putExtra(LANDSCAPE, isLandscape);
-        intent.putExtra(ENCDODE_METHOD, encodeMethod);
-        intent.putExtra(START_ATUO, startAuto);
-        intent.putExtra(MANUAL_FOCUS, manualFocus);
-        intent.putExtra(SHOW_DEBUGINFO, showDebugInfo);
-        intent.putExtra("audiohz",audiohz);
-        context.startActivity(intent);
-    }
-
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-
-        setContentView(R.layout.camera_activity_audio_effect);
-        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
-                WindowManager.LayoutParams.FLAG_FULLSCREEN);
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-
-        mCameraPreview = (GLSurfaceView) findViewById(R.id.camera_preview);
-        mUrlTextView = (TextView) findViewById(R.id.url);
-        mPitch = (CheckBox) findViewById(R.id.pitch);
-        mReverb = (CheckBox) findViewById(R.id.reverb);
-
-        KSYStreamerConfig.Builder builder = new KSYStreamerConfig.Builder();
-        mHandler = new Handler() {
-
-            @Override
-            public void handleMessage(Message msg) {
-                if (msg != null && msg.obj != null) {
-                    String content = msg.obj.toString();
-                    switch (msg.what) {
-                        case RecorderConstants.KSYVIDEO_ENCODED_FRAMES_FAILED:
-                        case RecorderConstants.KSYVIDEO_CODEC_OPEN_FAILED:
-                        case RecorderConstants.KSYVIDEO_CONNECT_FAILED:
-                        case RecorderConstants.KSYVIDEO_DNS_PARSE_FAILED:
-                        case RecorderConstants.KSYVIDEO_RTMP_PUBLISH_FAILED:
-                        case RecorderConstants.KSYVIDEO_CONNECT_BREAK:
-                        case RecorderConstants.KSYVIDEO_AUDIO_INIT_FAILED:
-                        case RecorderConstants.KSYVIDEO_OPEN_CAMERA_FAIL:
-                        case RecorderConstants.KSYVIDEO_CAMERA_PARAMS_ERROR:
-                        case RecorderConstants.KSYVIDEO_AUDIO_START_FAILED:
-                            Toast.makeText(CameraActivityAudioEffect.this, content,
-                                    Toast.LENGTH_LONG).show();
-                            chronometer.stop();
-                            mShootingText.setText(START_STRING);
-                            mShootingText.postInvalidate();
-                            break;
-                        case RecorderConstants.KSYVIDEO_OPEN_STREAM_SUCC:
-                            chronometer.setBase(SystemClock.elapsedRealtime());
-                            // 开始计时
-                            chronometer.start();
-                            mShootingText.setText(STOP_STRING);
-                            mShootingText.postInvalidate();
-                            beginInfoUploadTimer();
-                            break;
-                        case RecorderConstants.KSYVIDEO_INIT_DONE:
-                            if (mShootingText != null)
-                                mShootingText.setEnabled(true);
-                            Toast.makeText(getApplicationContext(), "初始化完成", Toast.LENGTH_SHORT).show();
-                            checkPermission();
-                            if (startAuto && mStreamer.startStream()) {
-                                mShootingText.setText(STOP_STRING);
-                                mShootingText.postInvalidate();
-                                recording = true;
-                            }
-                            break;
-                        default:
-                            Toast.makeText(CameraActivityAudioEffect.this, content,
-                                    Toast.LENGTH_SHORT).show();
-                    }
-                }
-            }
-
-        };
-
-        Bundle bundle = getIntent().getExtras();
-        if (bundle != null) {
-            String url = bundle.getString(URL);
-            if (!TextUtils.isEmpty(url)) {
-                builder.setmUrl(url);
-                mUrl = url;
-                mUrlTextView.setText(mUrl);
-            }
-
-            int frameRate = bundle.getInt(FRAME_RATE, 0);
-            if (frameRate > 0) {
-                builder.setFrameRate(frameRate);
-            }
-
-            int videoBitrate = bundle.getInt(VIDEO_BITRATE, 0);
-            if (videoBitrate > 0) {
-                //设置最高码率，即目标码率
-                builder.setMaxAverageVideoBitrate(videoBitrate);
-                //设置最低码率
-                builder.setMinAverageVideoBitrate(videoBitrate * 2 / 8);
-                //设置初始码率
-                builder.setInitAverageVideoBitrate(videoBitrate * 5 / 8);
-            }
-
-            int audioBitrate = bundle.getInt(AUDIO_BITRATE, 0);
-            if (audioBitrate > 0) {
-                builder.setAudioBitrate(audioBitrate);
-            }
-
-            int videoResolution = bundle.getInt(VIDEO_RESOLUTION, 0);
-            builder.setVideoResolution(videoResolution);
-
-            encode_method = (KSYStreamerConfig.ENCODE_METHOD) bundle.get(ENCDODE_METHOD);
-            builder.setEncodeMethod(encode_method);
-
-            int audiohz = bundle.getInt("audiohz",0);
-            builder.setSampleAudioRateInHz(audiohz);
-
-            builder.setEnableStreamStatModule(true);
-
-            landscape = bundle.getBoolean(LANDSCAPE, false);
-            builder.setDefaultLandscape(landscape);
-
-            if (landscape) {
-                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-            } else {
-                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-            }
-            startAuto = bundle.getBoolean(START_ATUO, false);
-            boolean focus_manual = bundle.getBoolean(MANUAL_FOCUS, false);
-            builder.setManualFocus(focus_manual);
-            printDebugInfo = bundle.getBoolean(SHOW_DEBUGINFO, false);
-
-            builder.setIsSlightBeauty(false);
-            builder.setAutoAdjustBitrate(false);
-        }
-
-        //可以在这里做权限检查,若没有audio和camera权限,进一步引导用户做权限设置
-        checkPermission();
-        mStreamer = new KSYStreamer(this);
-        mStreamer.setConfig(builder.build());
-        mStreamer.setDisplayPreview(mCameraPreview);
-        //老的状态回调机制
-        mStreamer.setOnStatusListener(mOnErrorListener);
-
-        //新的状态回调机制
-        StreamStatusEventHandler.getInstance().addOnStatusErrorListener(mOnStatusErrorListener);
-        StreamStatusEventHandler.getInstance().addOnStatusInfoListener(mOnStatusInfoListener);
-
-        mStreamer.setOnLogListener(mOnLogListener);
-        mStreamer.enableDebugLog(true);
-
-        mShootingText = (TextView) findViewById(R.id.click_to_shoot);
-        mShootingText.setClickable(true);
-        mShootingText.setOnClickListener(new View.OnClickListener() {
-
-            @Override
-            public void onClick(View arg0) {
-                if (recording) {
-                    if (mStreamer.stopStream()) {
-                        chronometer.stop();
-                        mShootingText.setText(START_STRING);
-                        mShootingText.postInvalidate();
-                        recording = false;
-                    } else {
-                        Log.e(TAG, "操作太频繁");
-                    }
-                } else {
-                    checkPermission();
-                    if (mStreamer.startStream()) {
-                        mShootingText.setText(STOP_STRING);
-                        mShootingText.postInvalidate();
-                        recording = true;
-
-                        mStreamer.setEnableReverb(true);
-                        mStreamer.setReverbLevel(4);
-                    } else {
-                        Log.e(TAG, "操作太频繁");
-                    }
-                }
-
-            }
-        });
-        if (startAuto) {
-            mShootingText.setEnabled(false);
-        }
-
-        mReverb.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                if(isChecked){
-                    mStreamer.setEnableReverb(true);
-                    new AlertDialog.Builder(CameraActivityAudioEffect.this).setTitle("选择音效")
-                            .setIcon(android.R.drawable.ic_dialog_info)
-                            .setSingleChoiceItems(new String[]{"悠扬","空灵","小剧场","KTV"},0,
-                                    new DialogInterface.OnClickListener(){
-                                        @Override
-                                        public void onClick(DialogInterface dialogInterface, int i) {
-                                            mStreamer.setReverbLevel(i+1);
-                                            Toast.makeText(CameraActivityAudioEffect.this, "    "+(i+1)+"     ", Toast.LENGTH_SHORT).show();
-                                            dialogInterface.dismiss();
-                                        }
-                                    }).setNegativeButton("取消", new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialogInterface, int i) {
-                            mReverb.setChecked(false);
-                        }
-                    }).setCancelable(false).show();
-
-                }else{
-                    mStreamer.setEnableReverb(false);
-                }
-            }
-        });
-
-        mPitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                // 升降调，变速
-                if ( isChecked ) {
-                    mStreamer.setEnableAudioEffect(true);
-                    mStreamer.setPitch(-0.318f);
-                    mStreamer.setSpeed(1 / 0.7f);
-                    mStreamer.setTempo(0.7f);
-                }else{
-                    mStreamer.setEnableAudioEffect(false);
-                }
-            }
-        });
-
-        mDeleteView = findViewById(R.id.backoff);
-        mDeleteView.setOnClickListener(mObserverButton);
-        mDeleteView.setEnabled(true);
-
-        mSwitchCameraView = findViewById(R.id.switch_cam);
-        mSwitchCameraView.setOnClickListener(mObserverButton);
-        mSwitchCameraView.setEnabled(true);
-
-        mFlashView = findViewById(R.id.flash);
-        mFlashView.setOnClickListener(mObserverButton);
-        mFlashView.setEnabled(true);
-
-        chronometer = (Chronometer) this.findViewById(R.id.chronometer);
-        mDebugInfoTextView = (TextView) this.findViewById(R.id.debuginfo);
-    }
-
-    private void beginInfoUploadTimer() {
-        if (printDebugInfo && timer == null) {
-            timer = new Timer();
-            timer.schedule(new TimerTask() {
-                @Override
-                public void run() {
-                    updateDebugInfo();
-                    runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            mDebugInfoTextView.setText(mDebugInfo);
-                        }
-                    });
-                }
-            }, 100, 3000);
-        }
-    }
-
-    //update debug info
-    private void updateDebugInfo() {
-        if (mStreamer == null) return;
-        mDebugInfo = String.format("RtmpHostIP()=%s DroppedFrameCount()=%d \n " +
-                        "ConnectTime()=%d DnsParseTime()=%d \n " +
-                        "UploadedKB()=%d EncodedFrames()=%d \n" +
-                        "CurrentBitrate=%f Version()=%s",
-                mStreamer.getRtmpHostIP(), mStreamer.getDroppedFrameCount(),
-                mStreamer.getConnectTime(), mStreamer.getDnsParseTime(),
-                mStreamer.getUploadedKBytes(), mStreamer.getEncodedFrames(),
-                mStreamer.getCurrentBitrate(), mStreamer.getVersion());
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        //可以在这里做权限检查,若没有audio和camera权限,进一步引导用户做权限设置
-        checkPermission();
-        mStreamer.onResume();
-        mAcitivityResumed = true;
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        mStreamer.onPause();
-        mAcitivityResumed = false;
-    }
-
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        switch (keyCode) {
-            case KeyEvent.KEYCODE_BACK:
-                new AlertDialog.Builder(CameraActivityAudioEffect.this).setCancelable(true)
-                        .setTitle("结束直播?")
-                        .setNegativeButton("取消", new DialogInterface.OnClickListener() {
-
-                            @Override
-                            public void onClick(DialogInterface arg0, int arg1) {
-
-                            }
-                        })
-                        .setPositiveButton("确定", new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface arg0, int arg1) {
-                                mStreamer.stopStream(true);
-                                chronometer.stop();
-                                recording = false;
-                                CameraActivityAudioEffect.this.finish();
-                            }
-                        }).show();
-                break;
-
-            default:
-                break;
-        }
-        return true;
-    }
-
-    //推流失败,需要退出重新启动推流,建议做log输出,方便快速定位问题
-    public StreamStatusEventHandler.OnStatusErrorListener mOnStatusErrorListener = new StreamStatusEventHandler.OnStatusErrorListener() {
-        @Override
-        public void onError(int what, int arg1, int arg2, String msg) {
-            switch (what) {
-                case RecorderConstants.KSYVIDEO_ENCODED_FRAMES_FAILED:
-                    //视频编码失败,发生在软解,会停止推流
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_ENCODED_FRAMES_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_CODEC_OPEN_FAILED:
-                    //编码器初始化失败,发生在推流开始时
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CODEC_OPEN_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_CONNECT_FAILED:
-                    //打开编码器的输入输出文件失败,发生在推流开始时,会停止推流
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CONNECT_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_DNS_PARSE_FAILED:
-                    //打开编码器的输入输出文件失败,发生在推流开始时,会停止推流
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CONNECT_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_RTMP_PUBLISH_FAILED:
-                    //打开编码器的输入输出文件失败,发生在推流开始时,会停止推流
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CONNECT_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_CONNECT_BREAK:
-                    //写入一个音视频文件失败
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CONNECT_BREAK");
-                    break;
-                case RecorderConstants.KSYVIDEO_AUDIO_INIT_FAILED:
-                    //软编,音频初始化失败
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_AUDIO_INIT_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_AUDIO_COVERT_FAILED:
-                    //软编,音频转码失败
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_AUDIO_COVERT_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_OPEN_CAMERA_FAIL:
-                    //openCamera失败
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_OPEN_CAMERA_FAIL");
-                    break;
-                case RecorderConstants.KSYVIDEO_CAMERA_PARAMS_ERROR:
-                    //获取不到camera参数,android 6.0 以下没有camera权限时可能发生
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CAMERA_PARAMS_ERROR");
-                    break;
-                case RecorderConstants.KSYVIDEO_AUDIO_START_FAILED:
-                    //audio startRecord 失败
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_AUDIO_START_FAILED");
-                    break;
-                default:
-                    break;
-            }
-
-//            if (mHandler != null) {
-//                mHandler.obtainMessage(what, msg).sendToTarget();
-//            }
-        }
-    };
-
-    public StreamStatusEventHandler.OnStatusInfoListener mOnStatusInfoListener = new StreamStatusEventHandler.OnStatusInfoListener() {
-        @Override
-        public void onInfo(int what, int arg1, int arg2, String msg) {
-            switch (what) {
-                case RecorderConstants.KSYVIDEO_OPEN_STREAM_SUCC:
-                    //推流成功
-                    Log.d("TAG", "KSYVIDEO_OPEN_STREAM_SUCC");
-//                    mHandler.obtainMessage(what, "start stream succ")
-//                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_FRAME_DATA_SEND_SLOW:
-                    //网络状况不佳
-//                    if (mHandler != null) {
-//                        mHandler.obtainMessage(what, "network not good").sendToTarget();
-//                    }
-                    break;
-                case RecorderConstants.KSYVIDEO_EST_BW_RAISE:
-                    //码率上调
-                    Log.d("TAG", "KSYVIDEO_EST_BW_RAISE");
-                    break;
-                case RecorderConstants.KSYVIDEO_EST_BW_DROP:
-                    //码率下调
-                    Log.d("TAG", "KSYVIDEO_EST_BW_DROP");
-                    break;
-                case RecorderConstants.KSYVIDEO_INIT_DONE:
-                    //video preview init done
-                    Log.d("TAG", "KSYVIDEO_INIT_DONE");
-                    break;
-                case RecorderConstants.KSYVIDEO_PIP_EXCEPTION:
-                    Log.d("TAG", "KSYVIDEO_PIP_EXCEPTION");
-//                    mHandler.obtainMessage(what, "pip exception")
-//                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_RENDER_EXCEPTION:
-                    Log.d("TAG", "KSYVIDEO_RENDER_EXCEPTION");
-//                    mHandler.obtainMessage(what, "renderer exception")
-//                            .sendToTarget();
-                    break;
-                default:
-                    break;
-
-            }
-        }
-    };
-
-    public OnStatusListener mOnErrorListener = new OnStatusListener() {
-        @Override
-        public void onStatus(int what, int arg1, int arg2, String msg) {
-            // msg may be null
-            switch (what) {
-                case RecorderConstants.KSYVIDEO_OPEN_STREAM_SUCC:
-                    // 推流成功
-                    Log.d("TAG", "KSYVIDEO_OPEN_STREAM_SUCC");
-                    mHandler.obtainMessage(what, "start stream succ")
-                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_ENCODED_FRAMES_FAILED:
-                    //编码失败
-                    Log.e(TAG, "---------KSYVIDEO_ENCODED_FRAMES_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_WLD_UPLOAD:
-                    break;
-                case RecorderConstants.KSYVIDEO_FRAME_DATA_SEND_SLOW:
-                    //网络状况不佳
-                    if (mHandler != null) {
-                        mHandler.obtainMessage(what, "network not good").sendToTarget();
-                    }
-                    break;
-                case RecorderConstants.KSYVIDEO_EST_BW_DROP:
-                    //编码码率下降状态通知
-                    break;
-                case RecorderConstants.KSYVIDEO_EST_BW_RAISE:
-                    //编码码率上升状态通知
-                    break;
-                case RecorderConstants.KSYVIDEO_AUDIO_INIT_FAILED:
-                    Log.e("CameraActivity", "init audio failed");
-                    //音频录制初始化失败回调
-                    break;
-                case RecorderConstants.KSYVIDEO_INIT_DONE:
-                    mHandler.obtainMessage(what, "init done")
-                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_PIP_EXCEPTION:
-                    mHandler.obtainMessage(what, "pip exception")
-                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_RENDER_EXCEPTION:
-                    mHandler.obtainMessage(what, "renderer exception")
-                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_AUDIO_START_FAILED:
-                    Log.e("CameraActivity", "-------audio start failed");
-                    break;
-                case RecorderConstants.KSYVIDEO_CAMERA_PARAMS_ERROR:
-                    Log.e("CameraActivity", "-------camera param is null");
-                    break;
-                case RecorderConstants.KSYVIDEO_OPEN_CAMERA_FAIL:
-                    Log.e("CameraActivity", "-------open camera failed");
-                    break;
-                default:
-                    if (msg != null) {
-                        // 可以在这里处理断网重连的逻辑
-                        if (TextUtils.isEmpty(mUrl)) {
-                            mStreamer
-                                    .updateUrl("rtmp://test.uplive.ksyun.com/live/androidtest");
-                        } else {
-                            mStreamer.updateUrl(mUrl);
-                        }
-                        if (!executorService.isShutdown()) {
-                            executorService.submit(new Runnable() {
-
-                                @Override
-                                public void run() {
-                                    boolean needReconnect = true;
-                                    try {
-                                        while (needReconnect) {
-                                            Thread.sleep(3000);
-                                            //只在Activity对用户可见时重连
-                                            if (mAcitivityResumed) {
-                                                if (mStreamer.startStream()) {
-                                                    recording = true;
-                                                    needReconnect = false;
-                                                }
-                                            }
-                                        }
-                                    } catch (InterruptedException e) {
-                                        e.printStackTrace();
-                                    }
-                                }
-
-                            });
-                        }
-                    }
-                    if (mHandler != null) {
-                        mHandler.obtainMessage(what, msg).sendToTarget();
-                    }
-            }
-        }
-
-    };
-
-    private OnLogEventListener mOnLogListener = new OnLogEventListener() {
-        @Override
-        public void onLogEvent(StringBuffer singleLogContent) {
-            Log.d(TAG, "***onLogEvent : " + singleLogContent.toString());
-        }
-    };
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        //新的状态回调机制
-        StreamStatusEventHandler.getInstance().removeStatusErrorListener(mOnStatusErrorListener);
-        StreamStatusEventHandler.getInstance().removeStatusInfoListener(mOnStatusInfoListener);
-
-        mStreamer.onDestroy();
-        executorService.shutdownNow();
-        if (mHandler != null) {
-            mHandler.removeCallbacksAndMessages(null);
-            mHandler = null;
-        }
-        if (timer != null) {
-            timer.cancel();
-        }
-    }
-
-    private boolean clearState() {
-        if (clearBackoff()) {
-            return true;
-        }
-        return false;
-    }
-
-    private long lastClickTime = 0;
-
-    private void onSwitchCamClick() {
-        long curTime = System.currentTimeMillis();
-        if (curTime - lastClickTime < 1000) {
-            return;
-        }
-        lastClickTime = curTime;
-
-        if (clearState()) {
-            return;
-        }
-        mStreamer.switchCamera();
-
-    }
-
-    private void onFlashClick() {
-        if (mStreamer.isFrontCamera())
-            isFlashOpened = true;
-
-        if (isFlashOpened) {
-            mStreamer.toggleTorch(false);
-            isFlashOpened = false;
-        } else {
-            mStreamer.toggleTorch(true);
-            isFlashOpened = true;
-        }
-    }
-
-    private boolean clearBackoff() {
-        if (mDeleteView.isSelected()) {
-            mDeleteView.setSelected(false);
-            return true;
-        }
-        return false;
-    }
-
-    private void onBackoffClick() {
-
-        new AlertDialog.Builder(CameraActivityAudioEffect.this).setCancelable(true)
-                .setTitle("结束直播?")
-                .setNegativeButton("取消", new DialogInterface.OnClickListener() {
-
-                    @Override
-                    public void onClick(DialogInterface arg0, int arg1) {
-
-                    }
-                })
-                .setPositiveButton("确定", new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface arg0, int arg1) {
-                        mStreamer.stopStream(true);
-                        chronometer.stop();
-                        recording = false;
-                        CameraActivityAudioEffect.this.finish();
-                    }
-                }).show();
-    }
-
-    private class ButtonObserver implements View.OnClickListener {
-        @Override
-        public void onClick(View view) {
-            switch (view.getId()) {
-                case R.id.switch_cam:
-                    onSwitchCamClick();
-                    break;
-                case R.id.backoff:
-                    onBackoffClick();
-                    break;
-                case R.id.flash:
-                    onFlashClick();
-                    break;
-                default:
-                    break;
-            }
-        }
-    }
-
-    private boolean checkPermission() {
-        try {
-            int pRecordAudio = PermissionChecker.checkCallingOrSelfPermission(this, "android.permission.RECORD_AUDIO");
-            int pCamera = PermissionChecker.checkCallingOrSelfPermission(this, "android.permission.CAMERA");
-
-            if (pRecordAudio != PackageManager.PERMISSION_GRANTED) {
-                Log.e(TAG, "do not have AudioRecord permission, please check");
-                Toast.makeText(this, "do not have AudioRecord permission, please check", Toast.LENGTH_LONG).show();
-                return false;
-            }
-            if (pCamera != PackageManager.PERMISSION_GRANTED) {
-                Log.e(TAG, "do not have CAMERA permission, please check");
-                Toast.makeText(this, "do not have CAMERA permission, please check", Toast.LENGTH_LONG).show();
-                return false;
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return true;
-    }
-
-}
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/CameraActivityAudioMix.java b/LiveDemo/app/src/main/java/com/ksyun/live/demo/CameraActivityAudioMix.java
deleted file mode 100644
index 8de389c..0000000
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/CameraActivityAudioMix.java
+++ /dev/null
@@ -1,810 +0,0 @@
-package com.ksyun.live.demo;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageManager;
-import android.opengl.GLSurfaceView;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.os.SystemClock;
-import android.support.v4.content.PermissionChecker;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.CheckBox;
-import android.widget.Chronometer;
-import android.widget.CompoundButton;
-import android.widget.LinearLayout;
-import android.widget.SeekBar;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.ksy.recordlib.service.core.KSYStreamer;
-import com.ksy.recordlib.service.core.KSYStreamerConfig;
-import com.ksy.recordlib.service.stats.OnLogEventListener;
-import com.ksy.recordlib.service.stats.StreamStatusEventHandler;
-import com.ksy.recordlib.service.streamer.OnStatusListener;
-import com.ksy.recordlib.service.streamer.RecorderConstants;
-import com.ksy.recordlib.service.util.audio.KSYBgmPlayer;
-
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-public class CameraActivityAudioMix extends Activity {
-
-    private static final String TAG = "CameraActivityAudioMix";
-
-    private GLSurfaceView mCameraPreview;
-
-    private SeekBar seek_mix;
-
-    private KSYStreamer mStreamer;
-    private KSYBgmPlayer mKsyBgmPlayer;
-
-    private Handler mHandler;
-
-    private LinearLayout layout_seek;
-
-    private final ButtonObserver mObserverButton = new ButtonObserver();
-
-    private Chronometer chronometer;
-    private View mDeleteView;
-    private View mSwitchCameraView;
-    private View mFlashView;
-
-    private CheckBox mBgm;
-    private CheckBox mEarMirror;
-    private CheckBox mMuteAudio;
-    private TextView mShootingText;
-    private boolean recording = false;
-    private boolean isFlashOpened = false;
-    private boolean startAuto = false;
-    private boolean audio_mix = false;
-    private boolean mute_audio = false;
-    private boolean earMirror = false;
-    private boolean landscape = false;
-    private boolean printDebugInfo = false;
-    private float bgmVolume = 0.6f;
-    private long lastPipClickTime = 0;
-    private String mUrl, mDebugInfo = "";
-    private String mBgmPath = "/sdcard/test.mp3";
-    private static final String START_STRING = "开始直播";
-    private static final String STOP_STRING = "停止直播";
-    private TextView mUrlTextView, mDebugInfoTextView;
-    private volatile boolean mAcitivityResumed = false;
-    private KSYStreamerConfig.ENCODE_METHOD encode_method = KSYStreamerConfig.ENCODE_METHOD.SOFTWARE;
-    public final static String URL = "url";
-    public final static String FRAME_RATE = "framerate";
-    public final static String VIDEO_BITRATE = "video_bitrate";
-    public final static String AUDIO_BITRATE = "audio_bitrate";
-    public final static String VIDEO_RESOLUTION = "video_resolution";
-    public final static String LANDSCAPE = "landscape";
-    public final static String ENCDODE_METHOD = "ENCDODE_METHOD";
-    public final static String START_ATUO = "start_auto";
-    public final static String MANUAL_FOCUS = "manual_focus";
-    public static final String SHOW_DEBUGINFO = "SHOW_DEBUGINFO";
-
-    Timer timer;
-    ExecutorService executorService = Executors.newSingleThreadExecutor();
-    public static void startActivity(Context context, int fromType,
-                                     String rtmpUrl, int frameRate, int videoBitrate, int audioBitrate,
-                                     int videoResolution, boolean isLandscape, KSYStreamerConfig.ENCODE_METHOD encodeMethod, boolean startAuto,
-                                     boolean manualFocus, boolean showDebugInfo, int audiohz) {
-        Intent intent = new Intent(context, CameraActivityAudioMix.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        intent.putExtra("type", fromType);
-        intent.putExtra(URL, rtmpUrl);
-        intent.putExtra(FRAME_RATE, frameRate);
-        intent.putExtra(VIDEO_BITRATE, videoBitrate);
-        intent.putExtra(AUDIO_BITRATE, audioBitrate);
-        intent.putExtra(VIDEO_RESOLUTION, videoResolution);
-        intent.putExtra(LANDSCAPE, isLandscape);
-        intent.putExtra(ENCDODE_METHOD, encodeMethod);
-        intent.putExtra(START_ATUO, startAuto);
-        intent.putExtra(MANUAL_FOCUS, manualFocus);
-        intent.putExtra(SHOW_DEBUGINFO, showDebugInfo);
-        intent.putExtra("audiohz",audiohz);
-        context.startActivity(intent);
-    }
-
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-
-        setContentView(R.layout.camera_activity_audio_mix);
-        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
-                WindowManager.LayoutParams.FLAG_FULLSCREEN);
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-
-        mCameraPreview = (GLSurfaceView) findViewById(R.id.camera_preview);
-        mUrlTextView = (TextView) findViewById(R.id.url);
-
-        layout_seek = (LinearLayout)findViewById(R.id.layout_seek);
-        layout_seek.setVisibility(View.INVISIBLE);
-
-        seek_mix = (SeekBar)findViewById(R.id.seek_mix);
-        seek_mix.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
-            @Override
-            public void onProgressChanged(SeekBar seekBar, int i, boolean b) {
-                mKsyBgmPlayer.setVolume(seekBar.getProgress()/100f);
-            }
-
-            @Override
-            public void onStartTrackingTouch(SeekBar seekBar) {
-
-            }
-
-            @Override
-            public void onStopTrackingTouch(SeekBar seekBar) {
-
-            }
-        });
-
-        mBgm = (CheckBox) findViewById(R.id.bgm);
-        mEarMirror = (CheckBox) findViewById(R.id.ear_mirror);
-        mMuteAudio = (CheckBox) findViewById(R.id.mute);
-
-        audio_mix = mBgm.isChecked();
-        earMirror = mEarMirror.isChecked();
-        mute_audio = mMuteAudio.isChecked();
-
-        KSYStreamerConfig.Builder builder = new KSYStreamerConfig.Builder();
-        mHandler = new Handler() {
-
-            @Override
-            public void handleMessage(Message msg) {
-                if (msg != null && msg.obj != null) {
-                    String content = msg.obj.toString();
-                    switch (msg.what) {
-                        case RecorderConstants.KSYVIDEO_ENCODED_FRAMES_FAILED:
-                        case RecorderConstants.KSYVIDEO_CODEC_OPEN_FAILED:
-                        case RecorderConstants.KSYVIDEO_CONNECT_FAILED:
-                        case RecorderConstants.KSYVIDEO_DNS_PARSE_FAILED:
-                        case RecorderConstants.KSYVIDEO_RTMP_PUBLISH_FAILED:
-                        case RecorderConstants.KSYVIDEO_CONNECT_BREAK:
-                        case RecorderConstants.KSYVIDEO_AUDIO_INIT_FAILED:
-                        case RecorderConstants.KSYVIDEO_OPEN_CAMERA_FAIL:
-                        case RecorderConstants.KSYVIDEO_CAMERA_PARAMS_ERROR:
-                        case RecorderConstants.KSYVIDEO_AUDIO_START_FAILED:
-                            Toast.makeText(CameraActivityAudioMix.this, content,
-                                    Toast.LENGTH_LONG).show();
-                            chronometer.stop();
-                            mShootingText.setText(START_STRING);
-                            mShootingText.postInvalidate();
-                            break;
-                        case RecorderConstants.KSYVIDEO_OPEN_STREAM_SUCC:
-                            chronometer.setBase(SystemClock.elapsedRealtime());
-                            // 开始计时
-                            chronometer.start();
-                            mShootingText.setText(STOP_STRING);
-                            mShootingText.postInvalidate();
-                            beginInfoUploadTimer();
-                            break;
-                        case RecorderConstants.KSYVIDEO_INIT_DONE:
-                            if (mShootingText != null)
-                                mShootingText.setEnabled(true);
-                            Toast.makeText(getApplicationContext(), "初始化完成", Toast.LENGTH_SHORT).show();
-                            checkPermission();
-                            if (startAuto && mStreamer.startStream()) {
-                                mShootingText.setText(STOP_STRING);
-                                mShootingText.postInvalidate();
-                                recording = true;
-                            }
-                            break;
-                        default:
-                            Toast.makeText(CameraActivityAudioMix.this, content,
-                                    Toast.LENGTH_SHORT).show();
-                    }
-                }
-            }
-
-        };
-
-        Bundle bundle = getIntent().getExtras();
-        if (bundle != null) {
-            String url = bundle.getString(URL);
-            if (!TextUtils.isEmpty(url)) {
-                builder.setmUrl(url);
-                mUrl = url;
-                mUrlTextView.setText(mUrl);
-            }
-
-            int frameRate = bundle.getInt(FRAME_RATE, 0);
-            if (frameRate > 0) {
-                builder.setFrameRate(frameRate);
-            }
-
-            int audiohz = bundle.getInt("audiohz",0);
-            builder.setSampleAudioRateInHz(audiohz);
-
-            int videoBitrate = bundle.getInt(VIDEO_BITRATE, 0);
-            if (videoBitrate > 0) {
-                //设置最高码率，即目标码率
-                builder.setMaxAverageVideoBitrate(videoBitrate);
-                //设置最低码率
-                builder.setMinAverageVideoBitrate(videoBitrate * 2 / 8);
-                //设置初始码率
-                builder.setInitAverageVideoBitrate(videoBitrate * 5 / 8);
-            }
-
-            int audioBitrate = bundle.getInt(AUDIO_BITRATE, 0);
-            if (audioBitrate > 0) {
-                builder.setAudioBitrate(audioBitrate);
-            }
-
-            int videoResolution = bundle.getInt(VIDEO_RESOLUTION, 0);
-            builder.setVideoResolution(videoResolution);
-
-            encode_method = (KSYStreamerConfig.ENCODE_METHOD) bundle.get(ENCDODE_METHOD);
-            builder.setEncodeMethod(encode_method);
-
-            builder.setSampleAudioRateInHz(44100);
-            builder.setEnableStreamStatModule(true);
-
-            landscape = bundle.getBoolean(LANDSCAPE, false);
-            builder.setDefaultLandscape(landscape);
-
-            if (landscape) {
-                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-            } else {
-                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-            }
-            startAuto = bundle.getBoolean(START_ATUO, false);
-            boolean focus_manual = bundle.getBoolean(MANUAL_FOCUS, false);
-            builder.setManualFocus(focus_manual);
-            printDebugInfo = bundle.getBoolean(SHOW_DEBUGINFO, false);
-
-            builder.setIsSlightBeauty(false);
-        }
-
-        //可以在这里做权限检查,若没有audio和camera权限,进一步引导用户做权限设置
-        checkPermission();
-        mStreamer = new KSYStreamer(this);
-        mStreamer.setConfig(builder.build());
-        mStreamer.setDisplayPreview(mCameraPreview);
-        //老的状态回调机制
-        mStreamer.setOnStatusListener(mOnErrorListener);
-
-        //新的状态回调机制
-        StreamStatusEventHandler.getInstance().addOnStatusErrorListener(mOnStatusErrorListener);
-        StreamStatusEventHandler.getInstance().addOnStatusInfoListener(mOnStatusInfoListener);
-
-        mStreamer.setOnLogListener(mOnLogListener);
-        mStreamer.enableDebugLog(true);
-        mStreamer.setMuteAudio(mute_audio);
-        mStreamer.setEnableEarMirror(earMirror);
-
-        mBgm.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                if (isChecked) {
-                    mKsyBgmPlayer = KSYBgmPlayer.getInstance();
-                    mKsyBgmPlayer.setOnBgmPlayerListener(mBgmListener);
-                    mKsyBgmPlayer.setVolume(bgmVolume);
-                    mKsyBgmPlayer.setMute(earMirror);
-                    mStreamer.setBgmPlayer(mKsyBgmPlayer);
-                    mStreamer.startMixMusic(mBgmPath, true);
-                    mStreamer.setHeadsetPlugged(true);
-                    layout_seek.setVisibility(View.VISIBLE);
-                } else {
-                    layout_seek.setVisibility(View.INVISIBLE);
-                    mStreamer.stopMixMusic();
-                }
-            }
-        });
-
-
-
-        mEarMirror.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                earMirror = isChecked;
-                if (mKsyBgmPlayer != null) {
-                    mKsyBgmPlayer.setMute(isChecked);
-                }
-                mStreamer.setEnableEarMirror(isChecked);
-            }
-        });
-
-        mMuteAudio.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                mStreamer.setMuteAudio(isChecked);
-            }
-        });
-
-        mShootingText = (TextView) findViewById(R.id.click_to_shoot);
-        mShootingText.setClickable(true);
-        mShootingText.setOnClickListener(new View.OnClickListener() {
-
-            @Override
-            public void onClick(View arg0) {
-                if (recording) {
-                    if (mStreamer.stopStream()) {
-                        chronometer.stop();
-                        mShootingText.setText(START_STRING);
-                        mShootingText.postInvalidate();
-                        recording = false;
-                    } else {
-                        Log.e(TAG, "操作太频繁");
-                    }
-                } else {
-                    checkPermission();
-                    if (mStreamer.startStream()) {
-                        mShootingText.setText(STOP_STRING);
-                        mShootingText.postInvalidate();
-                        recording = true;
-                    } else {
-                        Log.e(TAG, "操作太频繁");
-                    }
-                }
-
-            }
-        });
-
-        if (startAuto) {
-            mShootingText.setEnabled(false);
-        }
-
-        mDeleteView = findViewById(R.id.backoff);
-        mDeleteView.setOnClickListener(mObserverButton);
-        mDeleteView.setEnabled(true);
-
-        mSwitchCameraView = findViewById(R.id.switch_cam);
-        mSwitchCameraView.setOnClickListener(mObserverButton);
-        mSwitchCameraView.setEnabled(true);
-
-        mFlashView = findViewById(R.id.flash);
-        mFlashView.setOnClickListener(mObserverButton);
-        mFlashView.setEnabled(true);
-
-        chronometer = (Chronometer) this.findViewById(R.id.chronometer);
-        mDebugInfoTextView = (TextView) this.findViewById(R.id.debuginfo);
-    }
-
-    private void beginInfoUploadTimer() {
-        if (printDebugInfo && timer == null) {
-            timer = new Timer();
-            timer.schedule(new TimerTask() {
-                @Override
-                public void run() {
-                    updateDebugInfo();
-                    runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            mDebugInfoTextView.setText(mDebugInfo);
-                        }
-                    });
-                }
-            }, 100, 3000);
-        }
-    }
-
-
-    //update debug info
-    private void updateDebugInfo() {
-        if (mStreamer == null) return;
-        mDebugInfo = String.format("RtmpHostIP()=%s DroppedFrameCount()=%d \n " +
-                        "ConnectTime()=%d DnsParseTime()=%d \n " +
-                        "UploadedKB()=%d EncodedFrames()=%d \n" +
-                        "CurrentBitrate=%f Version()=%s",
-                mStreamer.getRtmpHostIP(), mStreamer.getDroppedFrameCount(),
-                mStreamer.getConnectTime(), mStreamer.getDnsParseTime(),
-                mStreamer.getUploadedKBytes(), mStreamer.getEncodedFrames(),
-                mStreamer.getCurrentBitrate(), mStreamer.getVersion());
-    }
-
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        //可以在这里做权限检查,若没有audio和camera权限,进一步引导用户做权限设置
-        checkPermission();
-        if (mKsyBgmPlayer != null) {
-            mKsyBgmPlayer.resume();
-        }
-        mStreamer.onResume();
-        mAcitivityResumed = true;
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        if (mKsyBgmPlayer != null) {
-            mKsyBgmPlayer.pause();
-        }
-        mStreamer.onPause();
-        mAcitivityResumed = false;
-    }
-
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        switch (keyCode) {
-            case KeyEvent.KEYCODE_BACK:
-                new AlertDialog.Builder(CameraActivityAudioMix.this).setCancelable(true)
-                        .setTitle("结束直播?")
-                        .setNegativeButton("取消", new DialogInterface.OnClickListener() {
-
-                            @Override
-                            public void onClick(DialogInterface arg0, int arg1) {
-
-                            }
-                        })
-                        .setPositiveButton("确定", new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface arg0, int arg1) {
-                                mStreamer.stopStream(true);
-                                chronometer.stop();
-                                recording = false;
-                                CameraActivityAudioMix.this.finish();
-                            }
-                        }).show();
-                break;
-
-            default:
-                break;
-        }
-        return true;
-    }
-
-    //推流失败,需要退出重新启动推流,建议做log输出,方便快速定位问题
-    public StreamStatusEventHandler.OnStatusErrorListener mOnStatusErrorListener = new StreamStatusEventHandler.OnStatusErrorListener() {
-        @Override
-        public void onError(int what, int arg1, int arg2, String msg) {
-            switch (what) {
-                case RecorderConstants.KSYVIDEO_ENCODED_FRAMES_FAILED:
-                    //视频编码失败,发生在软解,会停止推流
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_ENCODED_FRAMES_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_CODEC_OPEN_FAILED:
-                    //编码器初始化失败,发生在推流开始时
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CODEC_OPEN_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_CONNECT_FAILED:
-                    //打开编码器的输入输出文件失败,发生在推流开始时,会停止推流
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CONNECT_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_DNS_PARSE_FAILED:
-                    //打开编码器的输入输出文件失败,发生在推流开始时,会停止推流
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CONNECT_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_RTMP_PUBLISH_FAILED:
-                    //打开编码器的输入输出文件失败,发生在推流开始时,会停止推流
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CONNECT_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_CONNECT_BREAK:
-                    //写入一个音视频文件失败
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CONNECT_BREAK");
-                    break;
-                case RecorderConstants.KSYVIDEO_AUDIO_INIT_FAILED:
-                    //软编,音频初始化失败
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_AUDIO_INIT_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_AUDIO_COVERT_FAILED:
-                    //软编,音频转码失败
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_AUDIO_COVERT_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_OPEN_CAMERA_FAIL:
-                    //openCamera失败
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_OPEN_CAMERA_FAIL");
-                    break;
-                case RecorderConstants.KSYVIDEO_CAMERA_PARAMS_ERROR:
-                    //获取不到camera参数,android 6.0 以下没有camera权限时可能发生
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CAMERA_PARAMS_ERROR");
-                    break;
-                case RecorderConstants.KSYVIDEO_AUDIO_START_FAILED:
-                    //audio startRecord 失败
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_AUDIO_START_FAILED");
-                    break;
-                default:
-                    break;
-            }
-
-//            if (mHandler != null) {
-//                mHandler.obtainMessage(what, msg).sendToTarget();
-//            }
-        }
-    };
-
-    public StreamStatusEventHandler.OnStatusInfoListener mOnStatusInfoListener = new StreamStatusEventHandler.OnStatusInfoListener() {
-        @Override
-        public void onInfo(int what, int arg1, int arg2, String msg) {
-            switch (what) {
-                case RecorderConstants.KSYVIDEO_OPEN_STREAM_SUCC:
-                    //推流成功
-                    Log.d("TAG", "KSYVIDEO_OPEN_STREAM_SUCC");
-//                    mHandler.obtainMessage(what, "start stream succ")
-//                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_FRAME_DATA_SEND_SLOW:
-                    //网络状况不佳
-//                    if (mHandler != null) {
-//                        mHandler.obtainMessage(what, "network not good").sendToTarget();
-//                    }
-                    break;
-                case RecorderConstants.KSYVIDEO_EST_BW_RAISE:
-                    //码率上调
-                    Log.d("TAG", "KSYVIDEO_EST_BW_RAISE");
-                    break;
-                case RecorderConstants.KSYVIDEO_EST_BW_DROP:
-                    //码率下调
-                    Log.d("TAG", "KSYVIDEO_EST_BW_DROP");
-                    break;
-                case RecorderConstants.KSYVIDEO_INIT_DONE:
-                    //video preview init done
-                    Log.d("TAG", "KSYVIDEO_INIT_DONE");
-                    break;
-                case RecorderConstants.KSYVIDEO_PIP_EXCEPTION:
-                    Log.d("TAG", "KSYVIDEO_PIP_EXCEPTION");
-//                    mHandler.obtainMessage(what, "pip exception")
-//                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_RENDER_EXCEPTION:
-                    Log.d("TAG", "KSYVIDEO_RENDER_EXCEPTION");
-//                    mHandler.obtainMessage(what, "renderer exception")
-//                            .sendToTarget();
-                    break;
-                default:
-                    break;
-
-            }
-        }
-    };
-
-    public OnStatusListener mOnErrorListener = new OnStatusListener() {
-        @Override
-        public void onStatus(int what, int arg1, int arg2, String msg) {
-            // msg may be null
-            switch (what) {
-                case RecorderConstants.KSYVIDEO_OPEN_STREAM_SUCC:
-                    // 推流成功
-                    Log.d("TAG", "KSYVIDEO_OPEN_STREAM_SUCC");
-                    mHandler.obtainMessage(what, "start stream succ")
-                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_ENCODED_FRAMES_FAILED:
-                    //编码失败
-                    Log.e(TAG, "---------KSYVIDEO_ENCODED_FRAMES_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_WLD_UPLOAD:
-                    break;
-                case RecorderConstants.KSYVIDEO_FRAME_DATA_SEND_SLOW:
-                    //网络状况不佳
-                    if (mHandler != null) {
-                        mHandler.obtainMessage(what, "network not good").sendToTarget();
-                    }
-                    break;
-                case RecorderConstants.KSYVIDEO_EST_BW_DROP:
-                    //编码码率下降状态通知
-                    break;
-                case RecorderConstants.KSYVIDEO_EST_BW_RAISE:
-                    //编码码率上升状态通知
-                    break;
-                case RecorderConstants.KSYVIDEO_AUDIO_INIT_FAILED:
-                    Log.e("CameraActivityAudioMix", "init audio failed");
-                    //音频录制初始化失败回调
-                    break;
-                case RecorderConstants.KSYVIDEO_INIT_DONE:
-                    mHandler.obtainMessage(what, "init done")
-                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_PIP_EXCEPTION:
-                    mHandler.obtainMessage(what, "pip exception")
-                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_RENDER_EXCEPTION:
-                    mHandler.obtainMessage(what, "renderer exception")
-                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_AUDIO_START_FAILED:
-                    Log.e("CameraActivityAudioMix", "-------audio start failed");
-                    break;
-                case RecorderConstants.KSYVIDEO_CAMERA_PARAMS_ERROR:
-                    Log.e("CameraActivityAudioMix", "-------camera param is null");
-                    break;
-                case RecorderConstants.KSYVIDEO_OPEN_CAMERA_FAIL:
-                    Log.e("CameraActivityAudioMix", "-------open camera failed");
-                    break;
-                default:
-                    if (msg != null) {
-                        // 可以在这里处理断网重连的逻辑
-                        if (TextUtils.isEmpty(mUrl)) {
-                            mStreamer
-                                    .updateUrl("rtmp://test.uplive.ksyun.com/live/androidtest");
-                        } else {
-                            mStreamer.updateUrl(mUrl);
-                        }
-                        if (!executorService.isShutdown()) {
-                            executorService.submit(new Runnable() {
-
-                                @Override
-                                public void run() {
-                                    boolean needReconnect = true;
-                                    try {
-                                        while (needReconnect) {
-                                            Thread.sleep(3000);
-                                            //只在Activity对用户可见时重连
-                                            if (mAcitivityResumed) {
-                                                if (mStreamer.startStream()) {
-                                                    recording = true;
-                                                    needReconnect = false;
-                                                }
-                                            }
-                                        }
-                                    } catch (InterruptedException e) {
-                                        e.printStackTrace();
-                                    }
-                                }
-
-                            });
-                        }
-                    }
-                    if (mHandler != null) {
-                        mHandler.obtainMessage(what, msg).sendToTarget();
-                    }
-            }
-        }
-
-    };
-
-    private KSYBgmPlayer.OnBgmPlayerListener mBgmListener = new KSYBgmPlayer.OnBgmPlayerListener() {
-        @Override
-        public void onCompleted() {
-            Log.d(TAG, "End of the currently playing music");
-        }
-
-        @Override
-        public void onError(int err) {
-            Log.e(TAG, "onMusicError: " + err);
-        }
-    };
-
-    private OnLogEventListener mOnLogListener = new OnLogEventListener() {
-        @Override
-        public void onLogEvent(StringBuffer singleLogContent) {
-            Log.d(TAG, "***onLogEvent : " + singleLogContent.toString());
-        }
-    };
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        //新的状态回调机制
-        StreamStatusEventHandler.getInstance().removeStatusErrorListener(mOnStatusErrorListener);
-        StreamStatusEventHandler.getInstance().removeStatusInfoListener(mOnStatusInfoListener);
-
-        if (mKsyBgmPlayer != null) {
-            mKsyBgmPlayer.release();
-            mKsyBgmPlayer = null;
-        }
-
-        mStreamer.onDestroy();
-        executorService.shutdownNow();
-        if (mHandler != null) {
-            mHandler.removeCallbacksAndMessages(null);
-            mHandler = null;
-        }
-        if (timer != null) {
-            timer.cancel();
-        }
-    }
-
-    private boolean clearState() {
-        if (clearBackoff()) {
-            return true;
-        }
-        return false;
-    }
-
-    private long lastClickTime = 0;
-
-    private void onSwitchCamClick() {
-        long curTime = System.currentTimeMillis();
-        if (curTime - lastClickTime < 1000) {
-            return;
-        }
-        lastClickTime = curTime;
-
-        if (clearState()) {
-            return;
-        }
-        mStreamer.switchCamera();
-
-    }
-
-    private void onFlashClick() {
-        if (mStreamer.isFrontCamera())
-            isFlashOpened = true;
-
-        if (isFlashOpened) {
-            mStreamer.toggleTorch(false);
-            isFlashOpened = false;
-        } else {
-            mStreamer.toggleTorch(true);
-            isFlashOpened = true;
-        }
-    }
-
-    private boolean clearBackoff() {
-        if (mDeleteView.isSelected()) {
-            mDeleteView.setSelected(false);
-            return true;
-        }
-        return false;
-    }
-
-    private void onBackoffClick() {
-
-        new AlertDialog.Builder(CameraActivityAudioMix.this).setCancelable(true)
-                .setTitle("结束直播?")
-                .setNegativeButton("取消", new DialogInterface.OnClickListener() {
-
-                    @Override
-                    public void onClick(DialogInterface arg0, int arg1) {
-
-                    }
-                })
-                .setPositiveButton("确定", new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface arg0, int arg1) {
-                        mStreamer.stopStream(true);
-                        chronometer.stop();
-                        recording = false;
-                        CameraActivityAudioMix.this.finish();
-                    }
-                }).show();
-    }
-
-    private class ButtonObserver implements View.OnClickListener {
-        @Override
-        public void onClick(View view) {
-            switch (view.getId()) {
-                case R.id.switch_cam:
-                    onSwitchCamClick();
-                    break;
-                case R.id.backoff:
-                    onBackoffClick();
-                    break;
-                case R.id.flash:
-                    onFlashClick();
-                    break;
-                default:
-                    break;
-            }
-        }
-    }
-
-    private boolean checkPermission() {
-        try {
-            int pRecordAudio = PermissionChecker.checkCallingOrSelfPermission(this, "android.permission.RECORD_AUDIO");
-            int pCamera = PermissionChecker.checkCallingOrSelfPermission(this, "android.permission.CAMERA");
-
-            if (pRecordAudio != PackageManager.PERMISSION_GRANTED) {
-                Log.e(TAG, "do not have AudioRecord permission, please check");
-                Toast.makeText(this, "do not have AudioRecord permission, please check", Toast.LENGTH_LONG).show();
-                return false;
-            }
-            if (pCamera != PackageManager.PERMISSION_GRANTED) {
-                Log.e(TAG, "do not have CAMERA permission, please check");
-                Toast.makeText(this, "do not have CAMERA permission, please check", Toast.LENGTH_LONG).show();
-                return false;
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return true;
-    }
-
-}
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/CameraActivityBeauty.java b/LiveDemo/app/src/main/java/com/ksyun/live/demo/CameraActivityBeauty.java
deleted file mode 100644
index f0bdddd..0000000
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/CameraActivityBeauty.java
+++ /dev/null
@@ -1,746 +0,0 @@
-package com.ksyun.live.demo;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageManager;
-import android.opengl.GLSurfaceView;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.os.SystemClock;
-import android.support.v4.content.PermissionChecker;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.CheckBox;
-import android.widget.Chronometer;
-import android.widget.CompoundButton;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.ksy.recordlib.service.core.KSYStreamer;
-import com.ksy.recordlib.service.core.KSYStreamerConfig;
-import com.ksy.recordlib.service.hardware.ksyfilter.KSYImageFilter;
-import com.ksy.recordlib.service.stats.OnLogEventListener;
-import com.ksy.recordlib.service.stats.StreamStatusEventHandler;
-import com.ksy.recordlib.service.streamer.OnStatusListener;
-import com.ksy.recordlib.service.streamer.RecorderConstants;
-
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-public class CameraActivityBeauty extends Activity {
-
-    private static final String TAG = "CameraActivityBeauty";
-
-    private GLSurfaceView mCameraPreview;
-
-    private KSYStreamer mStreamer;
-
-    private Handler mHandler;
-
-    private final ButtonObserver mObserverButton = new ButtonObserver();
-
-    private Chronometer chronometer;
-    private View mDeleteView;
-    private View mSwitchCameraView;
-    private View mFlashView;
-    private CheckBox enable_beauty;
-    private TextView mShootingText;
-    private boolean recording = false;
-    private boolean isFlashOpened = false;
-    private boolean startAuto = false;
-    private boolean landscape = false;
-    private boolean printDebugInfo = false;
-    private long lastPipClickTime = 0;
-    private String mUrl, mDebugInfo = "";
-    private static final String START_STRING = "开始直播";
-    private static final String STOP_STRING = "停止直播";
-    private TextView mUrlTextView, mDebugInfoTextView;
-    private volatile boolean mAcitivityResumed = false;
-    private KSYStreamerConfig.ENCODE_METHOD encode_method = KSYStreamerConfig.ENCODE_METHOD.SOFTWARE;
-    public final static String URL = "url";
-    public final static String FRAME_RATE = "framerate";
-    public final static String VIDEO_BITRATE = "video_bitrate";
-    public final static String AUDIO_BITRATE = "audio_bitrate";
-    public final static String VIDEO_RESOLUTION = "video_resolution";
-    public final static String EncodeWithHEVC = "encode_with_hevc";
-    public final static String LANDSCAPE = "landscape";
-    public final static String ENCDODE_METHOD = "ENCDODE_METHOD";
-    public final static String START_ATUO = "start_auto";
-    public final static String MANUAL_FOCUS = "manual_focus";
-    public static final String SHOW_DEBUGINFO = "SHOW_DEBUGINFO";
-
-    Timer timer;
-    ExecutorService executorService = Executors.newSingleThreadExecutor();
-
-    public static void startActivity(Context context, int fromType,
-                                     String rtmpUrl, int frameRate, int videoBitrate, int audioBitrate,
-                                     int videoResolution, boolean isLandscape, KSYStreamerConfig.ENCODE_METHOD encodeMethod, boolean startAuto,
-                                     boolean manualFocus, boolean showDebugInfo,int audiohz) {
-        Intent intent = new Intent(context, CameraActivityBeauty.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        intent.putExtra("type", fromType);
-        intent.putExtra(URL, rtmpUrl);
-        intent.putExtra(FRAME_RATE, frameRate);
-        intent.putExtra(VIDEO_BITRATE, videoBitrate);
-        intent.putExtra(AUDIO_BITRATE, audioBitrate);
-        intent.putExtra(VIDEO_RESOLUTION, videoResolution);
-        intent.putExtra(LANDSCAPE, isLandscape);
-        intent.putExtra(ENCDODE_METHOD, encodeMethod);
-        intent.putExtra(START_ATUO, startAuto);
-        intent.putExtra(MANUAL_FOCUS, manualFocus);
-        intent.putExtra(SHOW_DEBUGINFO, showDebugInfo);
-        intent.putExtra("audiohz",audiohz);
-        context.startActivity(intent);
-    }
-
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-
-        setContentView(R.layout.camera_activity_beauty);
-        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
-                WindowManager.LayoutParams.FLAG_FULLSCREEN);
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-
-        mCameraPreview = (GLSurfaceView) findViewById(R.id.camera_preview);
-        mUrlTextView = (TextView) findViewById(R.id.url);
-        enable_beauty = (CheckBox) findViewById(R.id.click_to_switch_beauty);
-
-        KSYStreamerConfig.Builder builder = new KSYStreamerConfig.Builder();
-        mHandler = new Handler() {
-
-            @Override
-            public void handleMessage(Message msg) {
-                if (msg != null && msg.obj != null) {
-                    String content = msg.obj.toString();
-                    switch (msg.what) {
-                        case RecorderConstants.KSYVIDEO_ENCODED_FRAMES_FAILED:
-                        case RecorderConstants.KSYVIDEO_CODEC_OPEN_FAILED:
-                        case RecorderConstants.KSYVIDEO_CONNECT_FAILED:
-                        case RecorderConstants.KSYVIDEO_DNS_PARSE_FAILED:
-                        case RecorderConstants.KSYVIDEO_RTMP_PUBLISH_FAILED:
-                        case RecorderConstants.KSYVIDEO_CONNECT_BREAK:
-                        case RecorderConstants.KSYVIDEO_AUDIO_INIT_FAILED:
-                        case RecorderConstants.KSYVIDEO_OPEN_CAMERA_FAIL:
-                        case RecorderConstants.KSYVIDEO_CAMERA_PARAMS_ERROR:
-                        case RecorderConstants.KSYVIDEO_AUDIO_START_FAILED:
-                            Toast.makeText(CameraActivityBeauty.this, content,
-                                    Toast.LENGTH_LONG).show();
-                            chronometer.stop();
-                            mShootingText.setText(START_STRING);
-                            mShootingText.postInvalidate();
-                            break;
-                        case RecorderConstants.KSYVIDEO_OPEN_STREAM_SUCC:
-                            chronometer.setBase(SystemClock.elapsedRealtime());
-                            // 开始计时
-                            chronometer.start();
-                            mShootingText.setText(STOP_STRING);
-                            mShootingText.postInvalidate();
-                            beginInfoUploadTimer();
-                            break;
-                        case RecorderConstants.KSYVIDEO_INIT_DONE:
-                            if (mShootingText != null)
-                                mShootingText.setEnabled(true);
-                            Toast.makeText(getApplicationContext(), "初始化完成", Toast.LENGTH_SHORT).show();
-                            checkPermission();
-                            if (startAuto && mStreamer.startStream()) {
-                                mShootingText.setText(STOP_STRING);
-                                mShootingText.postInvalidate();
-                                recording = true;
-                            }
-                            break;
-                        default:
-                            Toast.makeText(CameraActivityBeauty.this, content,
-                                    Toast.LENGTH_SHORT).show();
-                    }
-                }
-            }
-
-        };
-
-        Bundle bundle = getIntent().getExtras();
-        if (bundle != null) {
-            String url = bundle.getString(URL);
-            if (!TextUtils.isEmpty(url)) {
-                builder.setmUrl(url);
-                mUrl = url;
-                mUrlTextView.setText(mUrl);
-            }
-            int audiohz = bundle.getInt("audiohz",0);
-            builder.setSampleAudioRateInHz(audiohz);
-
-            int frameRate = bundle.getInt(FRAME_RATE, 0);
-            if (frameRate > 0) {
-                builder.setFrameRate(frameRate);
-            }
-
-            int videoBitrate = bundle.getInt(VIDEO_BITRATE, 0);
-            if (videoBitrate > 0) {
-                //设置最高码率，即目标码率
-                builder.setMaxAverageVideoBitrate(videoBitrate);
-                //设置最低码率
-                builder.setMinAverageVideoBitrate(videoBitrate * 2 / 8);
-                //设置初始码率
-                builder.setInitAverageVideoBitrate(videoBitrate * 5 / 8);
-            }
-
-            int audioBitrate = bundle.getInt(AUDIO_BITRATE, 0);
-            if (audioBitrate > 0) {
-                builder.setAudioBitrate(audioBitrate);
-            }
-
-            int videoResolution = bundle.getInt(VIDEO_RESOLUTION, 0);
-            builder.setVideoResolution(videoResolution);
-
-            encode_method = (KSYStreamerConfig.ENCODE_METHOD) bundle.get(ENCDODE_METHOD);
-            builder.setEncodeMethod(encode_method);
-
-            builder.setSampleAudioRateInHz(44100);
-            builder.setEnableStreamStatModule(true);
-
-            landscape = bundle.getBoolean(LANDSCAPE, false);
-            builder.setDefaultLandscape(landscape);
-
-            if (landscape) {
-                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-            } else {
-                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-            }
-            startAuto = bundle.getBoolean(START_ATUO, false);
-            boolean focus_manual = bundle.getBoolean(MANUAL_FOCUS, false);
-            builder.setManualFocus(focus_manual);
-            printDebugInfo = bundle.getBoolean(SHOW_DEBUGINFO, false);
-
-            builder.setIsSlightBeauty(false);
-            builder.setAutoAdjustBitrate(false);
-        }
-
-        //可以在这里做权限检查,若没有audio和camera权限,进一步引导用户做权限设置
-        checkPermission();
-        mStreamer = new KSYStreamer(this);
-        mStreamer.setConfig(builder.build());
-        mStreamer.setDisplayPreview(mCameraPreview);
-        //老的状态回调机制
-        mStreamer.setOnStatusListener(mOnErrorListener);
-
-        //新的状态回调机制
-        StreamStatusEventHandler.getInstance().addOnStatusErrorListener(mOnStatusErrorListener);
-        StreamStatusEventHandler.getInstance().addOnStatusInfoListener(mOnStatusInfoListener);
-
-        mStreamer.setOnLogListener(mOnLogListener);
-        mStreamer.enableDebugLog(true);
-        mStreamer.setBeautyFilter(RecorderConstants.FILTER_BEAUTY_DENOISE);
-
-        enable_beauty.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                if (isChecked) {
-                    if (encode_method == KSYStreamerConfig.ENCODE_METHOD.SOFTWARE) {
-                        mStreamer.setBeautyFilter(RecorderConstants.FILTER_BEAUTY_DENOISE);
-                    } else {
-                        showChooseFilter();
-                    }
-                } else {
-                    if (encode_method == KSYStreamerConfig.ENCODE_METHOD.SOFTWARE) {
-                        mStreamer.setBeautyFilter(RecorderConstants.FILTER_BEAUTY_DISABLE);
-                    } else {
-                        mStreamer.setBeautyFilter(new KSYImageFilter());
-                    }
-                }
-            }
-        });
-
-
-        mShootingText = (TextView) findViewById(R.id.click_to_shoot);
-        mShootingText.setClickable(true);
-        mShootingText.setOnClickListener(new View.OnClickListener() {
-
-            @Override
-            public void onClick(View arg0) {
-                if (recording) {
-                    if (mStreamer.stopStream()) {
-                        chronometer.stop();
-                        mShootingText.setText(START_STRING);
-                        mShootingText.postInvalidate();
-                        recording = false;
-                    } else {
-                        Log.e(TAG, "操作太频繁");
-                    }
-                } else {
-                    checkPermission();
-                    if (mStreamer.startStream()) {
-                        mShootingText.setText(STOP_STRING);
-                        mShootingText.postInvalidate();
-                        recording = true;
-
-                        mStreamer.setEnableReverb(true);
-                        mStreamer.setReverbLevel(4);
-                    } else {
-                        Log.e(TAG, "操作太频繁");
-                    }
-                }
-
-            }
-        });
-        if (startAuto) {
-            mShootingText.setEnabled(false);
-        }
-
-        mDeleteView = findViewById(R.id.backoff);
-        mDeleteView.setOnClickListener(mObserverButton);
-        mDeleteView.setEnabled(true);
-
-        mSwitchCameraView = findViewById(R.id.switch_cam);
-        mSwitchCameraView.setOnClickListener(mObserverButton);
-        mSwitchCameraView.setEnabled(true);
-
-        mFlashView = findViewById(R.id.flash);
-        mFlashView.setOnClickListener(mObserverButton);
-        mFlashView.setEnabled(true);
-
-        chronometer = (Chronometer) this.findViewById(R.id.chronometer);
-        mDebugInfoTextView = (TextView) this.findViewById(R.id.debuginfo);
-    }
-
-    private void beginInfoUploadTimer() {
-        if (printDebugInfo && timer == null) {
-            timer = new Timer();
-            timer.schedule(new TimerTask() {
-                @Override
-                public void run() {
-                    updateDebugInfo();
-                    runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            mDebugInfoTextView.setText(mDebugInfo);
-                        }
-                    });
-                }
-            }, 100, 3000);
-        }
-    }
-
-    //update debug info
-    private void updateDebugInfo() {
-        if (mStreamer == null) return;
-        mDebugInfo = String.format("RtmpHostIP()=%s DroppedFrameCount()=%d \n " +
-                        "ConnectTime()=%d DnsParseTime()=%d \n " +
-                        "UploadedKB()=%d EncodedFrames()=%d \n" +
-                        "CurrentBitrate=%f Version()=%s",
-                mStreamer.getRtmpHostIP(), mStreamer.getDroppedFrameCount(),
-                mStreamer.getConnectTime(), mStreamer.getDnsParseTime(),
-                mStreamer.getUploadedKBytes(), mStreamer.getEncodedFrames(),
-                mStreamer.getCurrentBitrate(), mStreamer.getVersion());
-    }
-
-
-    private void showChooseFilter() {
-        AlertDialog alertDialog;
-        alertDialog = new AlertDialog.Builder(this).setTitle("请选择美颜滤镜").setSingleChoiceItems(
-                new String[]{"BEAUTY_SOFT", "SKIN_WHITEN", "BEAUTY_ILLUSION", "DENOISE", "DEMOFILTER", "SPLIT_E/P_FILTER", "GROUP_FILTER"}, -1, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        if (which < 4) {
-                            mStreamer.setBeautyFilter(which + 16);
-                        } else if (which == 4) {
-
-                        } else if (which == 5) {
-                            mStreamer.setBeautyFilter(new DEMOFILTER(), RecorderConstants.FILTER_USAGE_ENCODE);
-                            mStreamer.setBeautyFilter(new DEMOFILTER2(), RecorderConstants.FILTER_USAGE_PREVIEW);
-                        } else if (which == 6) {
-                            mStreamer.setBeautyFilter(new GroupFilterDemo());
-                        }
-                        dialog.dismiss();
-                    }
-                })
-                .create();
-        alertDialog.setCancelable(false);
-        alertDialog.show();
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        //可以在这里做权限检查,若没有audio和camera权限,进一步引导用户做权限设置
-        checkPermission();
-        mStreamer.onResume();
-        mAcitivityResumed = true;
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        mStreamer.onPause();
-        mAcitivityResumed = false;
-    }
-
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        switch (keyCode) {
-            case KeyEvent.KEYCODE_BACK:
-                new AlertDialog.Builder(CameraActivityBeauty.this).setCancelable(true)
-                        .setTitle("结束直播?")
-                        .setNegativeButton("取消", new DialogInterface.OnClickListener() {
-
-                            @Override
-                            public void onClick(DialogInterface arg0, int arg1) {
-
-                            }
-                        })
-                        .setPositiveButton("确定", new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface arg0, int arg1) {
-                                mStreamer.stopStream(true);
-                                chronometer.stop();
-                                recording = false;
-                                CameraActivityBeauty.this.finish();
-                            }
-                        }).show();
-                break;
-
-            default:
-                break;
-        }
-        return true;
-    }
-
-    //推流失败,需要退出重新启动推流,建议做log输出,方便快速定位问题
-    public StreamStatusEventHandler.OnStatusErrorListener mOnStatusErrorListener = new StreamStatusEventHandler.OnStatusErrorListener() {
-        @Override
-        public void onError(int what, int arg1, int arg2, String msg) {
-            switch (what) {
-                case RecorderConstants.KSYVIDEO_ENCODED_FRAMES_FAILED:
-                    //视频编码失败,发生在软解,会停止推流
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_ENCODED_FRAMES_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_CODEC_OPEN_FAILED:
-                    //编码器初始化失败,发生在推流开始时
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CODEC_OPEN_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_CONNECT_FAILED:
-                    //打开编码器的输入输出文件失败,发生在推流开始时,会停止推流
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CONNECT_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_DNS_PARSE_FAILED:
-                    //打开编码器的输入输出文件失败,发生在推流开始时,会停止推流
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CONNECT_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_RTMP_PUBLISH_FAILED:
-                    //打开编码器的输入输出文件失败,发生在推流开始时,会停止推流
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CONNECT_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_CONNECT_BREAK:
-                    //写入一个音视频文件失败
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CONNECT_BREAK");
-                    break;
-                case RecorderConstants.KSYVIDEO_AUDIO_INIT_FAILED:
-                    //软编,音频初始化失败
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_AUDIO_INIT_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_AUDIO_COVERT_FAILED:
-                    //软编,音频转码失败
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_AUDIO_COVERT_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_OPEN_CAMERA_FAIL:
-                    //openCamera失败
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_OPEN_CAMERA_FAIL");
-                    break;
-                case RecorderConstants.KSYVIDEO_CAMERA_PARAMS_ERROR:
-                    //获取不到camera参数,android 6.0 以下没有camera权限时可能发生
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CAMERA_PARAMS_ERROR");
-                    break;
-                case RecorderConstants.KSYVIDEO_AUDIO_START_FAILED:
-                    //audio startRecord 失败
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_AUDIO_START_FAILED");
-                    break;
-                default:
-                    break;
-            }
-        }
-    };
-
-    public StreamStatusEventHandler.OnStatusInfoListener mOnStatusInfoListener = new StreamStatusEventHandler.OnStatusInfoListener() {
-        @Override
-        public void onInfo(int what, int arg1, int arg2, String msg) {
-            switch (what) {
-                case RecorderConstants.KSYVIDEO_OPEN_STREAM_SUCC:
-                    //推流成功
-                    Log.d("TAG", "KSYVIDEO_OPEN_STREAM_SUCC");
-//                    mHandler.obtainMessage(what, "start stream succ")
-//                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_FRAME_DATA_SEND_SLOW:
-                    //网络状况不佳
-//                    if (mHandler != null) {
-//                        mHandler.obtainMessage(what, "network not good").sendToTarget();
-//                    }
-                    break;
-                case RecorderConstants.KSYVIDEO_EST_BW_RAISE:
-                    //码率上调
-                    Log.d("TAG", "KSYVIDEO_EST_BW_RAISE");
-                    break;
-                case RecorderConstants.KSYVIDEO_EST_BW_DROP:
-                    //码率下调
-                    Log.d("TAG", "KSYVIDEO_EST_BW_DROP");
-                    break;
-                case RecorderConstants.KSYVIDEO_INIT_DONE:
-                    //video preview init done
-                    Log.d("TAG", "KSYVIDEO_INIT_DONE");
-                    break;
-                case RecorderConstants.KSYVIDEO_PIP_EXCEPTION:
-                    Log.d("TAG", "KSYVIDEO_PIP_EXCEPTION");
-//                    mHandler.obtainMessage(what, "pip exception")
-//                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_RENDER_EXCEPTION:
-                    Log.d("TAG", "KSYVIDEO_RENDER_EXCEPTION");
-//                    mHandler.obtainMessage(what, "renderer exception")
-//                            .sendToTarget();
-                    break;
-                default:
-                    break;
-
-            }
-        }
-    };
-
-    public OnStatusListener mOnErrorListener = new OnStatusListener() {
-        @Override
-        public void onStatus(int what, int arg1, int arg2, String msg) {
-            // msg may be null
-            switch (what) {
-                case RecorderConstants.KSYVIDEO_OPEN_STREAM_SUCC:
-                    // 推流成功
-                    Log.d("TAG", "KSYVIDEO_OPEN_STREAM_SUCC");
-                    mHandler.obtainMessage(what, "start stream succ")
-                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_ENCODED_FRAMES_FAILED:
-                    //编码失败
-                    Log.e(TAG, "---------KSYVIDEO_ENCODED_FRAMES_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_WLD_UPLOAD:
-                    break;
-                case RecorderConstants.KSYVIDEO_FRAME_DATA_SEND_SLOW:
-                    //网络状况不佳
-                    if (mHandler != null) {
-                        mHandler.obtainMessage(what, "network not good").sendToTarget();
-                    }
-                    break;
-                case RecorderConstants.KSYVIDEO_EST_BW_DROP:
-                    //编码码率下降状态通知
-                    break;
-                case RecorderConstants.KSYVIDEO_EST_BW_RAISE:
-                    //编码码率上升状态通知
-                    break;
-                case RecorderConstants.KSYVIDEO_AUDIO_INIT_FAILED:
-                    Log.e("CameraActivity", "init audio failed");
-                    //音频录制初始化失败回调
-                    break;
-                case RecorderConstants.KSYVIDEO_INIT_DONE:
-                    mHandler.obtainMessage(what, "init done")
-                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_PIP_EXCEPTION:
-                    mHandler.obtainMessage(what, "pip exception")
-                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_RENDER_EXCEPTION:
-                    mHandler.obtainMessage(what, "renderer exception")
-                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_AUDIO_START_FAILED:
-                    Log.e("CameraActivity", "-------audio start failed");
-                    break;
-                case RecorderConstants.KSYVIDEO_CAMERA_PARAMS_ERROR:
-                    Log.e("CameraActivity", "-------camera param is null");
-                    break;
-                case RecorderConstants.KSYVIDEO_OPEN_CAMERA_FAIL:
-                    Log.e("CameraActivity", "-------open camera failed");
-                    break;
-                default:
-                    if (msg != null) {
-                        // 可以在这里处理断网重连的逻辑
-                        if (TextUtils.isEmpty(mUrl)) {
-                            mStreamer
-                                    .updateUrl("rtmp://test.uplive.ksyun.com/live/androidtest");
-                        } else {
-                            mStreamer.updateUrl(mUrl);
-                        }
-                        if (!executorService.isShutdown()) {
-                            executorService.submit(new Runnable() {
-
-                                @Override
-                                public void run() {
-                                    boolean needReconnect = true;
-                                    try {
-                                        while (needReconnect) {
-                                            Thread.sleep(3000);
-                                            //只在Activity对用户可见时重连
-                                            if (mAcitivityResumed) {
-                                                if (mStreamer.startStream()) {
-                                                    recording = true;
-                                                    needReconnect = false;
-                                                }
-                                            }
-                                        }
-                                    } catch (InterruptedException e) {
-                                        e.printStackTrace();
-                                    }
-                                }
-
-                            });
-                        }
-                    }
-                    if (mHandler != null) {
-                        mHandler.obtainMessage(what, msg).sendToTarget();
-                    }
-            }
-        }
-
-    };
-
-    private OnLogEventListener mOnLogListener = new OnLogEventListener() {
-        @Override
-        public void onLogEvent(StringBuffer singleLogContent) {
-            Log.d(TAG, "***onLogEvent : " + singleLogContent.toString());
-        }
-    };
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        //新的状态回调机制
-        StreamStatusEventHandler.getInstance().removeStatusErrorListener(mOnStatusErrorListener);
-        StreamStatusEventHandler.getInstance().removeStatusInfoListener(mOnStatusInfoListener);
-        mStreamer.onDestroy();
-        executorService.shutdownNow();
-        if (mHandler != null) {
-            mHandler.removeCallbacksAndMessages(null);
-            mHandler = null;
-        }
-        if (timer != null) {
-            timer.cancel();
-        }
-    }
-
-    private boolean clearState() {
-        if (clearBackoff()) {
-            return true;
-        }
-        return false;
-    }
-
-    private long lastClickTime = 0;
-
-    private void onSwitchCamClick() {
-        long curTime = System.currentTimeMillis();
-        if (curTime - lastClickTime < 1000) {
-            return;
-        }
-        lastClickTime = curTime;
-
-        if (clearState()) {
-            return;
-        }
-        mStreamer.switchCamera();
-
-    }
-
-    private void onFlashClick() {
-        if (mStreamer.isFrontCamera())
-            isFlashOpened = true;
-
-        if (isFlashOpened) {
-            mStreamer.toggleTorch(false);
-            isFlashOpened = false;
-        } else {
-            mStreamer.toggleTorch(true);
-            isFlashOpened = true;
-        }
-    }
-
-    private boolean clearBackoff() {
-        if (mDeleteView.isSelected()) {
-            mDeleteView.setSelected(false);
-            return true;
-        }
-        return false;
-    }
-
-    private void onBackoffClick() {
-
-        new AlertDialog.Builder(CameraActivityBeauty.this).setCancelable(true)
-                .setTitle("结束直播?")
-                .setNegativeButton("取消", new DialogInterface.OnClickListener() {
-
-                    @Override
-                    public void onClick(DialogInterface arg0, int arg1) {
-
-                    }
-                })
-                .setPositiveButton("确定", new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface arg0, int arg1) {
-                        mStreamer.stopStream(true);
-                        chronometer.stop();
-                        recording = false;
-                        CameraActivityBeauty.this.finish();
-                    }
-                }).show();
-    }
-
-    private class ButtonObserver implements View.OnClickListener {
-        @Override
-        public void onClick(View view) {
-            switch (view.getId()) {
-                case R.id.switch_cam:
-                    onSwitchCamClick();
-                    break;
-                case R.id.backoff:
-                    onBackoffClick();
-                    break;
-                case R.id.flash:
-                    onFlashClick();
-                    break;
-                default:
-                    break;
-            }
-        }
-    }
-
-    private boolean checkPermission() {
-        try {
-            int pRecordAudio = PermissionChecker.checkCallingOrSelfPermission(this, "android.permission.RECORD_AUDIO");
-            int pCamera = PermissionChecker.checkCallingOrSelfPermission(this, "android.permission.CAMERA");
-
-            if (pRecordAudio != PackageManager.PERMISSION_GRANTED) {
-                Log.e(TAG, "do not have AudioRecord permission, please check");
-                Toast.makeText(this, "do not have AudioRecord permission, please check", Toast.LENGTH_LONG).show();
-                return false;
-            }
-            if (pCamera != PackageManager.PERMISSION_GRANTED) {
-                Log.e(TAG, "do not have CAMERA permission, please check");
-                Toast.makeText(this, "do not have CAMERA permission, please check", Toast.LENGTH_LONG).show();
-                return false;
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return true;
-    }
-
-}
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/CameraActivityOther.java b/LiveDemo/app/src/main/java/com/ksyun/live/demo/CameraActivityOther.java
deleted file mode 100644
index 4ced036..0000000
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/CameraActivityOther.java
+++ /dev/null
@@ -1,752 +0,0 @@
-package com.ksyun.live.demo;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageManager;
-import android.opengl.GLSurfaceView;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.os.SystemClock;
-import android.support.v4.content.PermissionChecker;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.CheckBox;
-import android.widget.Chronometer;
-import android.widget.CompoundButton;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.ksy.recordlib.service.core.KSYStreamer;
-import com.ksy.recordlib.service.core.KSYStreamerConfig;
-import com.ksy.recordlib.service.stats.OnLogEventListener;
-import com.ksy.recordlib.service.stats.StreamStatusEventHandler;
-import com.ksy.recordlib.service.streamer.OnPreviewFrameListener;
-import com.ksy.recordlib.service.streamer.OnStatusListener;
-import com.ksy.recordlib.service.streamer.RecorderConstants;
-import com.ksy.recordlib.service.util.audio.OnAudioRawDataListener;
-
-import java.util.Arrays;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-public class CameraActivityOther extends Activity {
-
-    private static final String TAG = "CameraActivityOther";
-
-    private GLSurfaceView mCameraPreview;
-
-    private KSYStreamer mStreamer;
-    private Handler mHandler;
-
-    private final ButtonObserver mObserverButton = new ButtonObserver();
-
-    private Chronometer chronometer;
-    private View mDeleteView;
-    private View mSwitchCameraView;
-    private View mFlashView;
-
-    private CheckBox mFrontCameraMirror;
-    private CheckBox mSoftPreviewFrame;
-
-    private TextView mShootingText;
-    private boolean recording = false;
-    private boolean isFlashOpened = false;
-    private boolean startAuto = false;
-    private boolean landscape = false;
-    private boolean printDebugInfo = false;
-    private long lastPipClickTime = 0;
-    private String mUrl, mDebugInfo = "";
-    private static final String START_STRING = "开始直播";
-    private static final String STOP_STRING = "停止直播";
-    private TextView mUrlTextView, mDebugInfoTextView;
-    private volatile boolean mAcitivityResumed = false;
-    private KSYStreamerConfig.ENCODE_METHOD encode_method = KSYStreamerConfig.ENCODE_METHOD.SOFTWARE;
-    public final static String URL = "url";
-    public final static String FRAME_RATE = "framerate";
-    public final static String VIDEO_BITRATE = "video_bitrate";
-    public final static String AUDIO_BITRATE = "audio_bitrate";
-    public final static String VIDEO_RESOLUTION = "video_resolution";
-    public final static String LANDSCAPE = "landscape";
-    public final static String ENCDODE_METHOD = "ENCDODE_METHOD";
-    public final static String START_ATUO = "start_auto";
-    public final static String MANUAL_FOCUS = "manual_focus";
-    public static final String SHOW_DEBUGINFO = "SHOW_DEBUGINFO";
-
-    Timer timer;
-    ExecutorService executorService = Executors.newSingleThreadExecutor();
-
-    private int frameCount;
-
-    public static void startActivity(Context context, int fromType,
-                                     String rtmpUrl, int frameRate, int videoBitrate, int audioBitrate,
-                                     int videoResolution, boolean isLandscape, KSYStreamerConfig.ENCODE_METHOD encodeMethod, boolean startAuto,
-                                     boolean manualFocus, boolean showDebugInfo,int audiohz) {
-        Intent intent = new Intent(context, CameraActivityOther.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        intent.putExtra("type", fromType);
-        intent.putExtra(URL, rtmpUrl);
-        intent.putExtra(FRAME_RATE, frameRate);
-        intent.putExtra(VIDEO_BITRATE, videoBitrate);
-        intent.putExtra(AUDIO_BITRATE, audioBitrate);
-        intent.putExtra(VIDEO_RESOLUTION, videoResolution);
-        intent.putExtra(LANDSCAPE, isLandscape);
-        intent.putExtra(ENCDODE_METHOD, encodeMethod);
-        intent.putExtra(START_ATUO, startAuto);
-        intent.putExtra(MANUAL_FOCUS, manualFocus);
-        intent.putExtra(SHOW_DEBUGINFO, showDebugInfo);
-        intent.putExtra("audiohz",audiohz);
-        context.startActivity(intent);
-    }
-
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-
-        setContentView(R.layout.camera_activity_other);
-        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
-                WindowManager.LayoutParams.FLAG_FULLSCREEN);
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-
-        mCameraPreview = (GLSurfaceView) findViewById(R.id.camera_preview);
-        mUrlTextView = (TextView) findViewById(R.id.url);
-        mFrontCameraMirror = (CheckBox) findViewById(R.id.front_camera_mirror);
-        mSoftPreviewFrame = (CheckBox) findViewById(R.id.camer_preview_frame);
-
-        KSYStreamerConfig.Builder builder = new KSYStreamerConfig.Builder();
-        mHandler = new Handler() {
-
-            @Override
-            public void handleMessage(Message msg) {
-                if (msg != null && msg.obj != null) {
-                    String content = msg.obj.toString();
-                    switch (msg.what) {
-                        case RecorderConstants.KSYVIDEO_ENCODED_FRAMES_FAILED:
-                        case RecorderConstants.KSYVIDEO_CODEC_OPEN_FAILED:
-                        case RecorderConstants.KSYVIDEO_CONNECT_FAILED:
-                        case RecorderConstants.KSYVIDEO_DNS_PARSE_FAILED:
-                        case RecorderConstants.KSYVIDEO_RTMP_PUBLISH_FAILED:
-                        case RecorderConstants.KSYVIDEO_CONNECT_BREAK:
-                        case RecorderConstants.KSYVIDEO_AUDIO_INIT_FAILED:
-                        case RecorderConstants.KSYVIDEO_OPEN_CAMERA_FAIL:
-                        case RecorderConstants.KSYVIDEO_CAMERA_PARAMS_ERROR:
-                        case RecorderConstants.KSYVIDEO_AUDIO_START_FAILED:
-                            Toast.makeText(CameraActivityOther.this, content,
-                                    Toast.LENGTH_LONG).show();
-                            chronometer.stop();
-                            mShootingText.setText(START_STRING);
-                            mShootingText.postInvalidate();
-                            break;
-                        case RecorderConstants.KSYVIDEO_OPEN_STREAM_SUCC:
-                            chronometer.setBase(SystemClock.elapsedRealtime());
-                            // 开始计时
-                            chronometer.start();
-                            mShootingText.setText(STOP_STRING);
-                            mShootingText.postInvalidate();
-                            beginInfoUploadTimer();
-                            break;
-                        case RecorderConstants.KSYVIDEO_INIT_DONE:
-                            if (mShootingText != null)
-                                mShootingText.setEnabled(true);
-                            Toast.makeText(getApplicationContext(), "初始化完成", Toast.LENGTH_SHORT).show();
-                            checkPermission();
-                            if (startAuto && mStreamer.startStream()) {
-                                mShootingText.setText(STOP_STRING);
-                                mShootingText.postInvalidate();
-                                recording = true;
-                            }
-                            break;
-                        default:
-                            Toast.makeText(CameraActivityOther.this, content,
-                                    Toast.LENGTH_SHORT).show();
-                    }
-                }
-            }
-
-        };
-
-        Bundle bundle = getIntent().getExtras();
-        if (bundle != null) {
-            String url = bundle.getString(URL);
-            if (!TextUtils.isEmpty(url)) {
-                builder.setmUrl(url);
-                mUrl = url;
-                mUrlTextView.setText(mUrl);
-            }
-
-            int frameRate = bundle.getInt(FRAME_RATE, 0);
-            if (frameRate > 0) {
-                builder.setFrameRate(frameRate);
-            }
-            int audiohz = bundle.getInt("audiohz",0);
-            builder.setSampleAudioRateInHz(audiohz);
-
-            int videoBitrate = bundle.getInt(VIDEO_BITRATE, 0);
-            if (videoBitrate > 0) {
-                //设置最高码率，即目标码率
-                builder.setMaxAverageVideoBitrate(videoBitrate);
-                //设置最低码率
-                builder.setMinAverageVideoBitrate(videoBitrate * 2 / 8);
-                //设置初始码率
-                builder.setInitAverageVideoBitrate(videoBitrate * 5 / 8);
-            }
-
-            int audioBitrate = bundle.getInt(AUDIO_BITRATE, 0);
-            if (audioBitrate > 0) {
-                builder.setAudioBitrate(audioBitrate);
-            }
-
-            int videoResolution = bundle.getInt(VIDEO_RESOLUTION, 0);
-            builder.setVideoResolution(videoResolution);
-
-            encode_method = (KSYStreamerConfig.ENCODE_METHOD) bundle.get(ENCDODE_METHOD);
-            builder.setEncodeMethod(encode_method);
-
-            builder.setSampleAudioRateInHz(44100);
-            builder.setEnableStreamStatModule(true);
-
-            landscape = bundle.getBoolean(LANDSCAPE, false);
-            builder.setDefaultLandscape(landscape);
-
-            if (landscape) {
-                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-            } else {
-                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-            }
-            startAuto = bundle.getBoolean(START_ATUO, false);
-            //静态设置前置镜像
-            builder.setFrontCameraMirror(true);
-            boolean focus_manual = bundle.getBoolean(MANUAL_FOCUS, false);
-            builder.setManualFocus(focus_manual);
-            printDebugInfo = bundle.getBoolean(SHOW_DEBUGINFO, false);
-
-            builder.setIsSlightBeauty(false);
-            builder.setAutoAdjustBitrate(false);
-        }
-
-        //可以在这里做权限检查,若没有audio和camera权限,进一步引导用户做权限设置
-        checkPermission();
-        mStreamer = new KSYStreamer(this);
-        mStreamer.setConfig(builder.build());
-        mStreamer.setDisplayPreview(mCameraPreview);
-        //老的状态回调机制
-        mStreamer.setOnStatusListener(mOnErrorListener);
-
-        //新的状态回调机制
-        StreamStatusEventHandler.getInstance().addOnStatusErrorListener(mOnStatusErrorListener);
-        StreamStatusEventHandler.getInstance().addOnStatusInfoListener(mOnStatusInfoListener);
-
-        mStreamer.setOnLogListener(mOnLogListener);
-        mStreamer.setOnAudioRawDataListener(mOnAudioRawDataListener);
-        mStreamer.enableDebugLog(true);
-        mStreamer.setBeautyFilter(RecorderConstants.FILTER_BEAUTY_DENOISE);
-
-        mSoftPreviewFrame.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                if (isChecked) {
-                    mStreamer.setOnPreviewFrameListener(new OnPreviewFrameListener() {
-                        @Override
-                        public void onPreviewFrame(byte[] data, int width, int height, boolean isRecording) {
-                            frameCount++;
-                            if (isRecording) {
-                                Arrays.fill(data, width * height, data.length, (byte) 128);
-                            }
-                            if (frameCount % 60 == 0) {
-                                Log.e(TAG, "setOnPreviewFrameListener" + isRecording);
-                            }
-                        }
-                    });
-                }
-            }
-        });
-
-        mFrontCameraMirror.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                mStreamer.setEnableCameraMirror(isChecked);
-                Toast.makeText(CameraActivityOther.this, isChecked+"", Toast.LENGTH_SHORT).show();
-            }
-        });
-
-        mShootingText = (TextView) findViewById(R.id.click_to_shoot);
-        mShootingText.setClickable(true);
-        mShootingText.setOnClickListener(new View.OnClickListener() {
-
-            @Override
-            public void onClick(View arg0) {
-                if (recording) {
-                    if (mStreamer.stopStream()) {
-                        chronometer.stop();
-                        mShootingText.setText(START_STRING);
-                        mShootingText.postInvalidate();
-                        recording = false;
-                    } else {
-                        Log.e(TAG, "操作太频繁");
-                    }
-                } else {
-                    checkPermission();
-                    if (mStreamer.startStream()) {
-                        mShootingText.setText(STOP_STRING);
-                        mShootingText.postInvalidate();
-                        recording = true;
-
-                        mStreamer.setEnableReverb(true);
-                        mStreamer.setReverbLevel(4);
-                    } else {
-                        Log.e(TAG, "操作太频繁");
-                    }
-                }
-
-            }
-        });
-
-        if (startAuto) {
-            mShootingText.setEnabled(false);
-        }
-
-        mDeleteView = findViewById(R.id.backoff);
-        mDeleteView.setOnClickListener(mObserverButton);
-        mDeleteView.setEnabled(true);
-
-        mSwitchCameraView = findViewById(R.id.switch_cam);
-        mSwitchCameraView.setOnClickListener(mObserverButton);
-        mSwitchCameraView.setEnabled(true);
-
-        mFlashView = findViewById(R.id.flash);
-        mFlashView.setOnClickListener(mObserverButton);
-        mFlashView.setEnabled(true);
-
-        chronometer = (Chronometer) this.findViewById(R.id.chronometer);
-        mDebugInfoTextView = (TextView) this.findViewById(R.id.debuginfo);
-    }
-
-    private void beginInfoUploadTimer() {
-        if (printDebugInfo && timer == null) {
-            timer = new Timer();
-            timer.schedule(new TimerTask() {
-                @Override
-                public void run() {
-                    updateDebugInfo();
-                    runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            mDebugInfoTextView.setText(mDebugInfo);
-                        }
-                    });
-                }
-            }, 100, 3000);
-        }
-    }
-
-    //update debug info
-    private void updateDebugInfo() {
-        if (mStreamer == null) return;
-        mDebugInfo = String.format("RtmpHostIP()=%s DroppedFrameCount()=%d \n " +
-                        "ConnectTime()=%d DnsParseTime()=%d \n " +
-                        "UploadedKB()=%d EncodedFrames()=%d \n" +
-                        "CurrentBitrate=%f Version()=%s",
-                mStreamer.getRtmpHostIP(), mStreamer.getDroppedFrameCount(),
-                mStreamer.getConnectTime(), mStreamer.getDnsParseTime(),
-                mStreamer.getUploadedKBytes(), mStreamer.getEncodedFrames(),
-                mStreamer.getCurrentBitrate(), mStreamer.getVersion());
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        //可以在这里做权限检查,若没有audio和camera权限,进一步引导用户做权限设置
-        checkPermission();
-        mStreamer.onResume();
-        mAcitivityResumed = true;
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        mStreamer.onPause();
-        mAcitivityResumed = false;
-    }
-
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        switch (keyCode) {
-            case KeyEvent.KEYCODE_BACK:
-                new AlertDialog.Builder(CameraActivityOther.this).setCancelable(true)
-                        .setTitle("结束直播?")
-                        .setNegativeButton("取消", new DialogInterface.OnClickListener() {
-
-                            @Override
-                            public void onClick(DialogInterface arg0, int arg1) {
-
-                            }
-                        })
-                        .setPositiveButton("确定", new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface arg0, int arg1) {
-                                mStreamer.stopStream(true);
-                                chronometer.stop();
-                                recording = false;
-                                CameraActivityOther.this.finish();
-                            }
-                        }).show();
-                break;
-
-            default:
-                break;
-        }
-        return true;
-    }
-
-    //推流失败,需要退出重新启动推流,建议做log输出,方便快速定位问题
-    public StreamStatusEventHandler.OnStatusErrorListener mOnStatusErrorListener = new StreamStatusEventHandler.OnStatusErrorListener() {
-        @Override
-        public void onError(int what, int arg1, int arg2, String msg) {
-            switch (what) {
-                case RecorderConstants.KSYVIDEO_ENCODED_FRAMES_FAILED:
-                    //视频编码失败,发生在软解,会停止推流
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_ENCODED_FRAMES_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_CODEC_OPEN_FAILED:
-                    //编码器初始化失败,发生在推流开始时
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CODEC_OPEN_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_CONNECT_FAILED:
-                    //打开编码器的输入输出文件失败,发生在推流开始时,会停止推流
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CONNECT_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_DNS_PARSE_FAILED:
-                    //打开编码器的输入输出文件失败,发生在推流开始时,会停止推流
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CONNECT_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_RTMP_PUBLISH_FAILED:
-                    //打开编码器的输入输出文件失败,发生在推流开始时,会停止推流
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CONNECT_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_CONNECT_BREAK:
-                    //写入一个音视频文件失败
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CONNECT_BREAK");
-                    break;
-                case RecorderConstants.KSYVIDEO_AUDIO_INIT_FAILED:
-                    //软编,音频初始化失败
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_AUDIO_INIT_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_AUDIO_COVERT_FAILED:
-                    //软编,音频转码失败
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_AUDIO_COVERT_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_OPEN_CAMERA_FAIL:
-                    //openCamera失败
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_OPEN_CAMERA_FAIL");
-                    break;
-                case RecorderConstants.KSYVIDEO_CAMERA_PARAMS_ERROR:
-                    //获取不到camera参数,android 6.0 以下没有camera权限时可能发生
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CAMERA_PARAMS_ERROR");
-                    break;
-                case RecorderConstants.KSYVIDEO_AUDIO_START_FAILED:
-                    //audio startRecord 失败
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_AUDIO_START_FAILED");
-                    break;
-                default:
-                    break;
-            }
-
-//            if (mHandler != null) {
-//                mHandler.obtainMessage(what, msg).sendToTarget();
-//            }
-        }
-    };
-
-    public StreamStatusEventHandler.OnStatusInfoListener mOnStatusInfoListener = new StreamStatusEventHandler.OnStatusInfoListener() {
-        @Override
-        public void onInfo(int what, int arg1, int arg2, String msg) {
-            switch (what) {
-                case RecorderConstants.KSYVIDEO_OPEN_STREAM_SUCC:
-                    //推流成功
-                    Log.d("TAG", "KSYVIDEO_OPEN_STREAM_SUCC");
-//                    mHandler.obtainMessage(what, "start stream succ")
-//                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_FRAME_DATA_SEND_SLOW:
-                    //网络状况不佳
-//                    if (mHandler != null) {
-//                        mHandler.obtainMessage(what, "network not good").sendToTarget();
-//                    }
-                    break;
-                case RecorderConstants.KSYVIDEO_EST_BW_RAISE:
-                    //码率上调
-                    Log.d("TAG", "KSYVIDEO_EST_BW_RAISE");
-                    break;
-                case RecorderConstants.KSYVIDEO_EST_BW_DROP:
-                    //码率下调
-                    Log.d("TAG", "KSYVIDEO_EST_BW_DROP");
-                    break;
-                case RecorderConstants.KSYVIDEO_INIT_DONE:
-                    //video preview init done
-                    Log.d("TAG", "KSYVIDEO_INIT_DONE");
-                    break;
-                case RecorderConstants.KSYVIDEO_PIP_EXCEPTION:
-                    Log.d("TAG", "KSYVIDEO_PIP_EXCEPTION");
-//                    mHandler.obtainMessage(what, "pip exception")
-//                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_RENDER_EXCEPTION:
-                    Log.d("TAG", "KSYVIDEO_RENDER_EXCEPTION");
-//                    mHandler.obtainMessage(what, "renderer exception")
-//                            .sendToTarget();
-                    break;
-                default:
-                    break;
-
-            }
-        }
-    };
-
-    public OnStatusListener mOnErrorListener = new OnStatusListener() {
-        @Override
-        public void onStatus(int what, int arg1, int arg2, String msg) {
-            // msg may be null
-            switch (what) {
-                case RecorderConstants.KSYVIDEO_OPEN_STREAM_SUCC:
-                    // 推流成功
-                    Log.d("TAG", "KSYVIDEO_OPEN_STREAM_SUCC");
-                    mHandler.obtainMessage(what, "start stream succ")
-                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_ENCODED_FRAMES_FAILED:
-                    //编码失败
-                    Log.e(TAG, "---------KSYVIDEO_ENCODED_FRAMES_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_WLD_UPLOAD:
-                    break;
-                case RecorderConstants.KSYVIDEO_FRAME_DATA_SEND_SLOW:
-                    //网络状况不佳
-                    if (mHandler != null) {
-                        mHandler.obtainMessage(what, "network not good").sendToTarget();
-                    }
-                    break;
-                case RecorderConstants.KSYVIDEO_EST_BW_DROP:
-                    //编码码率下降状态通知
-                    break;
-                case RecorderConstants.KSYVIDEO_EST_BW_RAISE:
-                    //编码码率上升状态通知
-                    break;
-                case RecorderConstants.KSYVIDEO_AUDIO_INIT_FAILED:
-                    Log.e("CameraActivity", "init audio failed");
-                    //音频录制初始化失败回调
-                    break;
-                case RecorderConstants.KSYVIDEO_INIT_DONE:
-                    mHandler.obtainMessage(what, "init done")
-                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_PIP_EXCEPTION:
-                    mHandler.obtainMessage(what, "pip exception")
-                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_RENDER_EXCEPTION:
-                    mHandler.obtainMessage(what, "renderer exception")
-                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_AUDIO_START_FAILED:
-                    Log.e("CameraActivity", "-------audio start failed");
-                    break;
-                case RecorderConstants.KSYVIDEO_CAMERA_PARAMS_ERROR:
-                    Log.e("CameraActivity", "-------camera param is null");
-                    break;
-                case RecorderConstants.KSYVIDEO_OPEN_CAMERA_FAIL:
-                    Log.e("CameraActivity", "-------open camera failed");
-                    break;
-                default:
-                    if (msg != null) {
-                        // 可以在这里处理断网重连的逻辑
-                        if (TextUtils.isEmpty(mUrl)) {
-                            mStreamer
-                                    .updateUrl("rtmp://test.uplive.ksyun.com/live/androidtest");
-                        } else {
-                            mStreamer.updateUrl(mUrl);
-                        }
-                        if (!executorService.isShutdown()) {
-                            executorService.submit(new Runnable() {
-
-                                @Override
-                                public void run() {
-                                    boolean needReconnect = true;
-                                    try {
-                                        while (needReconnect) {
-                                            Thread.sleep(3000);
-                                            //只在Activity对用户可见时重连
-                                            if (mAcitivityResumed) {
-                                                if (mStreamer.startStream()) {
-                                                    recording = true;
-                                                    needReconnect = false;
-                                                }
-                                            }
-                                        }
-                                    } catch (InterruptedException e) {
-                                        e.printStackTrace();
-                                    }
-                                }
-
-                            });
-                        }
-                    }
-                    if (mHandler != null) {
-                        mHandler.obtainMessage(what, msg).sendToTarget();
-                    }
-            }
-        }
-
-    };
-
-    private OnLogEventListener mOnLogListener = new OnLogEventListener() {
-        @Override
-        public void onLogEvent(StringBuffer singleLogContent) {
-            Log.d(TAG, "***onLogEvent : " + singleLogContent.toString());
-        }
-    };
-
-    private OnAudioRawDataListener mOnAudioRawDataListener = new OnAudioRawDataListener() {
-        @Override
-        public short[] OnAudioRawData(short[] data, int count) {
-            //audio pcm data
-            return data;
-        }
-    };
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        //新的状态回调机制
-        StreamStatusEventHandler.getInstance().removeStatusErrorListener(mOnStatusErrorListener);
-        StreamStatusEventHandler.getInstance().removeStatusInfoListener(mOnStatusInfoListener);
-
-        mStreamer.onDestroy();
-        executorService.shutdownNow();
-        if (mHandler != null) {
-            mHandler.removeCallbacksAndMessages(null);
-            mHandler = null;
-        }
-        if (timer != null) {
-            timer.cancel();
-        }
-    }
-
-    private boolean clearState() {
-        if (clearBackoff()) {
-            return true;
-        }
-        return false;
-    }
-
-    private long lastClickTime = 0;
-
-    private void onSwitchCamClick() {
-        long curTime = System.currentTimeMillis();
-        if (curTime - lastClickTime < 1000) {
-            return;
-        }
-        lastClickTime = curTime;
-
-        if (clearState()) {
-            return;
-        }
-        mStreamer.switchCamera();
-
-    }
-
-    private void onFlashClick() {
-        if (mStreamer.isFrontCamera())
-            isFlashOpened = true;
-
-        if (isFlashOpened) {
-            mStreamer.toggleTorch(false);
-            isFlashOpened = false;
-        } else {
-            mStreamer.toggleTorch(true);
-            isFlashOpened = true;
-        }
-    }
-
-    private boolean clearBackoff() {
-        if (mDeleteView.isSelected()) {
-            mDeleteView.setSelected(false);
-            return true;
-        }
-        return false;
-    }
-
-    private void onBackoffClick() {
-
-        new AlertDialog.Builder(CameraActivityOther.this).setCancelable(true)
-                .setTitle("结束直播?")
-                .setNegativeButton("取消", new DialogInterface.OnClickListener() {
-
-                    @Override
-                    public void onClick(DialogInterface arg0, int arg1) {
-
-                    }
-                })
-                .setPositiveButton("确定", new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface arg0, int arg1) {
-                        mStreamer.stopStream(true);
-                        chronometer.stop();
-                        recording = false;
-                        CameraActivityOther.this.finish();
-                    }
-                }).show();
-    }
-
-    private class ButtonObserver implements View.OnClickListener {
-        @Override
-        public void onClick(View view) {
-            switch (view.getId()) {
-                case R.id.switch_cam:
-                    onSwitchCamClick();
-                    break;
-                case R.id.backoff:
-                    onBackoffClick();
-                    break;
-                case R.id.flash:
-                    onFlashClick();
-                    break;
-                default:
-                    break;
-            }
-        }
-    }
-
-    private boolean checkPermission() {
-        try {
-            int pRecordAudio = PermissionChecker.checkCallingOrSelfPermission(this, "android.permission.RECORD_AUDIO");
-            int pCamera = PermissionChecker.checkCallingOrSelfPermission(this, "android.permission.CAMERA");
-
-            if (pRecordAudio != PackageManager.PERMISSION_GRANTED) {
-                Log.e(TAG, "do not have AudioRecord permission, please check");
-                Toast.makeText(this, "do not have AudioRecord permission, please check", Toast.LENGTH_LONG).show();
-                return false;
-            }
-            if (pCamera != PackageManager.PERMISSION_GRANTED) {
-                Log.e(TAG, "do not have CAMERA permission, please check");
-                Toast.makeText(this, "do not have CAMERA permission, please check", Toast.LENGTH_LONG).show();
-                return false;
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return true;
-    }
-
-}
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/CameraActivityPip.java b/LiveDemo/app/src/main/java/com/ksyun/live/demo/CameraActivityPip.java
deleted file mode 100644
index 0d9c929..0000000
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/CameraActivityPip.java
+++ /dev/null
@@ -1,1066 +0,0 @@
-package com.ksyun.live.demo;
-
-import android.Manifest;
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageManager;
-import android.database.Cursor;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.drawable.ColorDrawable;
-import android.net.Uri;
-import android.opengl.GLSurfaceView;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.os.SystemClock;
-import android.provider.MediaStore;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.PermissionChecker;
-import android.support.v7.app.ActionBar;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.AdapterView;
-import android.widget.CheckBox;
-import android.widget.Chronometer;
-import android.widget.CompoundButton;
-import android.widget.ListView;
-import android.widget.PopupWindow;
-import android.widget.SimpleAdapter;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.ksy.recordlib.service.core.KSYStreamer;
-import com.ksy.recordlib.service.core.KSYStreamerConfig;
-import com.ksy.recordlib.service.hardware.ksyfilter.KSYImageFilter;
-import com.ksy.recordlib.service.stats.OnLogEventListener;
-import com.ksy.recordlib.service.stats.StreamStatusEventHandler;
-import com.ksy.recordlib.service.streamer.OnStatusListener;
-import com.ksy.recordlib.service.streamer.RecorderConstants;
-import com.ksyun.media.player.IMediaPlayer;
-import com.ksyun.media.player.KSYMediaPlayer;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-public class CameraActivityPip extends Activity {
-
-    private static final String TAG = "CameraActivityPip";
-
-    private ArrayList<HashMap<String,String>> videolist;
-    private ArrayList<HashMap<String,String>> imagelist;
-    private PopupWindow videopop;
-    private ListView videopoplist;
-    private PopupWindow pop;
-    private ListView piplist;
-
-    private GLSurfaceView mCameraPreview;
-
-    private KSYStreamer mStreamer;
-
-    private KSYMediaPlayer mKsyMediaPlayer;
-
-    private Handler mHandler;
-
-    Bitmap mPipBitmap;
-    private final ButtonObserver mObserverButton = new ButtonObserver();
-
-    private Chronometer chronometer;
-    private View mDeleteView;
-    private View mSwitchCameraView;
-    private View mFlashView;
-    private CheckBox enable_beauty;
-    private TextView mPip;
-    private TextView mPicturePip;
-    private TextView mShootingText;
-    private boolean recording = false;
-    private boolean isFlashOpened = false;
-    private boolean startAuto = false;
-    private boolean landscape = false;
-    private boolean printDebugInfo = false;
-    private boolean mPipMode = false;
-    private boolean mPicPipMode = false;
-    private long lastPipClickTime = 0;
-    private float pipVolume = 0.6f;
-    private float bgmVolume = 0.6f;
-    private String mUrl, mDebugInfo = "";
-    private String mPipPath = "/sdcard/test.mp4";
-    private String mPicture = null;
-    private static final String START_STRING = "开始直播";
-    private static final String STOP_STRING = "停止直播";
-    private TextView mUrlTextView, mDebugInfoTextView;
-    private volatile boolean mAcitivityResumed = false;
-    private KSYStreamerConfig.ENCODE_METHOD encode_method = KSYStreamerConfig.ENCODE_METHOD.SOFTWARE;
-    public final static String URL = "url";
-    public final static String FRAME_RATE = "framerate";
-    public final static String VIDEO_BITRATE = "video_bitrate";
-    public final static String AUDIO_BITRATE = "audio_bitrate";
-    public final static String VIDEO_RESOLUTION = "video_resolution";
-    public final static String EncodeWithHEVC = "encode_with_hevc";
-    public final static String LANDSCAPE = "landscape";
-    public final static String ENCDODE_METHOD = "ENCDODE_METHOD";
-    public final static String START_ATUO = "start_auto";
-    public final static String MANUAL_FOCUS = "manual_focus";
-    public static final String SHOW_DEBUGINFO = "SHOW_DEBUGINFO";
-
-    Timer timer;
-    ExecutorService executorService = Executors.newSingleThreadExecutor();
-
-    public static void startActivity(Context context, int fromType,
-                                     String rtmpUrl, int frameRate, int videoBitrate, int audioBitrate,
-                                     int videoResolution, boolean isLandscape, KSYStreamerConfig.ENCODE_METHOD encodeMethod, boolean startAuto,
-                                     boolean manualFocus, boolean showDebugInfo,int audiohz) {
-        Intent intent = new Intent(context, CameraActivityPip.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        intent.putExtra("type", fromType);
-        intent.putExtra(URL, rtmpUrl);
-        intent.putExtra(FRAME_RATE, frameRate);
-        intent.putExtra(VIDEO_BITRATE, videoBitrate);
-        intent.putExtra(AUDIO_BITRATE, audioBitrate);
-        intent.putExtra(VIDEO_RESOLUTION, videoResolution);
-        intent.putExtra(LANDSCAPE, isLandscape);
-        intent.putExtra(ENCDODE_METHOD, encodeMethod);
-        intent.putExtra(START_ATUO, startAuto);
-        intent.putExtra(MANUAL_FOCUS, manualFocus);
-        intent.putExtra(SHOW_DEBUGINFO, showDebugInfo);
-        intent.putExtra("audiohz",audiohz);
-        context.startActivity(intent);
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-
-        setContentView(R.layout.camera_activity_pip);
-        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
-                WindowManager.LayoutParams.FLAG_FULLSCREEN);
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-
-        mCameraPreview = (GLSurfaceView) findViewById(R.id.camera_preview);
-        mUrlTextView = (TextView) findViewById(R.id.url);
-        enable_beauty = (CheckBox) findViewById(R.id.click_to_switch_beauty);
-        mPip = (TextView) findViewById(R.id.pip);
-        mPip.setClickable(true);
-        mPicturePip = (TextView) findViewById(R.id.picture_pip);
-        mPicturePip.setClickable(true);
-
-        KSYStreamerConfig.Builder builder = new KSYStreamerConfig.Builder();
-        mHandler = new Handler() {
-
-            @Override
-            public void handleMessage(Message msg) {
-                if (msg != null && msg.obj != null) {
-                    String content = msg.obj.toString();
-                    switch (msg.what) {
-                        case RecorderConstants.KSYVIDEO_ENCODED_FRAMES_FAILED:
-                        case RecorderConstants.KSYVIDEO_CODEC_OPEN_FAILED:
-                        case RecorderConstants.KSYVIDEO_CONNECT_FAILED:
-                        case RecorderConstants.KSYVIDEO_DNS_PARSE_FAILED:
-                        case RecorderConstants.KSYVIDEO_RTMP_PUBLISH_FAILED:
-                        case RecorderConstants.KSYVIDEO_CONNECT_BREAK:
-                        case RecorderConstants.KSYVIDEO_AUDIO_INIT_FAILED:
-                        case RecorderConstants.KSYVIDEO_OPEN_CAMERA_FAIL:
-                        case RecorderConstants.KSYVIDEO_CAMERA_PARAMS_ERROR:
-                        case RecorderConstants.KSYVIDEO_AUDIO_START_FAILED:
-                            Toast.makeText(CameraActivityPip.this, content,
-                                    Toast.LENGTH_LONG).show();
-                            chronometer.stop();
-                            mShootingText.setText(START_STRING);
-                            mShootingText.postInvalidate();
-                            break;
-                        case RecorderConstants.KSYVIDEO_OPEN_STREAM_SUCC:
-                            chronometer.setBase(SystemClock.elapsedRealtime());
-                            // 开始计时
-                            chronometer.start();
-                            mShootingText.setText(STOP_STRING);
-                            mShootingText.postInvalidate();
-                            beginInfoUploadTimer();
-                            break;
-                        case RecorderConstants.KSYVIDEO_INIT_DONE:
-                            if (mShootingText != null)
-                                mShootingText.setEnabled(true);
-                            Toast.makeText(getApplicationContext(), "初始化完成", Toast.LENGTH_SHORT).show();
-                            checkPermission();
-                            if (startAuto && mStreamer.startStream()) {
-                                mShootingText.setText(STOP_STRING);
-                                mShootingText.postInvalidate();
-                                recording = true;
-                            }
-                            break;
-                        default:
-                            Toast.makeText(CameraActivityPip.this, content,
-                                    Toast.LENGTH_SHORT).show();
-                    }
-                }
-            }
-
-        };
-
-        Bundle bundle = getIntent().getExtras();
-        if (bundle != null) {
-            String url = bundle.getString(URL);
-            if (!TextUtils.isEmpty(url)) {
-                builder.setmUrl(url);
-                mUrl = url;
-                mUrlTextView.setText(mUrl);
-            }
-
-            int audiohz = bundle.getInt("audiohz",0);
-            builder.setSampleAudioRateInHz(audiohz);
-            int frameRate = bundle.getInt(FRAME_RATE, 0);
-            if (frameRate > 0) {
-                builder.setFrameRate(frameRate);
-            }
-
-            int videoBitrate = bundle.getInt(VIDEO_BITRATE, 0);
-            if (videoBitrate > 0) {
-                //设置最高码率，即目标码率
-                builder.setMaxAverageVideoBitrate(videoBitrate);
-                //设置最低码率
-                builder.setMinAverageVideoBitrate(videoBitrate * 2 / 8);
-                //设置初始码率
-                builder.setInitAverageVideoBitrate(videoBitrate * 5 / 8);
-            }
-
-            int audioBitrate = bundle.getInt(AUDIO_BITRATE, 0);
-            if (audioBitrate > 0) {
-                builder.setAudioBitrate(audioBitrate);
-            }
-
-            int videoResolution = bundle.getInt(VIDEO_RESOLUTION, 0);
-            builder.setVideoResolution(videoResolution);
-
-            encode_method = (KSYStreamerConfig.ENCODE_METHOD) bundle.get(ENCDODE_METHOD);
-            builder.setEncodeMethod(encode_method);
-
-            builder.setSampleAudioRateInHz(44100);
-            builder.setEnableStreamStatModule(true);
-
-            landscape = bundle.getBoolean(LANDSCAPE, false);
-            builder.setDefaultLandscape(landscape);
-
-            if (landscape) {
-                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-            } else {
-                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-            }
-            startAuto = bundle.getBoolean(START_ATUO, false);
-            printDebugInfo = bundle.getBoolean(SHOW_DEBUGINFO, false);
-
-            builder.setIsSlightBeauty(false);
-            builder.setAutoAdjustBitrate(false);
-        }
-
-        //可以在这里做权限检查,若没有audio和camera权限,进一步引导用户做权限设置
-        checkPermission();
-        mStreamer = new KSYStreamer(this);
-        mStreamer.setConfig(builder.build());
-        mStreamer.setDisplayPreview(mCameraPreview);
-        //老的状态回调机制
-        mStreamer.setOnStatusListener(mOnErrorListener);
-
-        //新的状态回调机制
-        StreamStatusEventHandler.getInstance().addOnStatusErrorListener(mOnStatusErrorListener);
-        StreamStatusEventHandler.getInstance().addOnStatusInfoListener(mOnStatusInfoListener);
-
-        mStreamer.setOnLogListener(mOnLogListener);
-        mStreamer.enableDebugLog(true);
-        mStreamer.setBeautyFilter(RecorderConstants.FILTER_BEAUTY_DENOISE);
-
-        enable_beauty.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                if (isChecked) {
-                    if (encode_method == KSYStreamerConfig.ENCODE_METHOD.SOFTWARE) {
-                        mStreamer.setBeautyFilter(RecorderConstants.FILTER_BEAUTY_DENOISE);
-                    } else {
-                        showChooseFilter();
-                    }
-                } else {
-                    if (encode_method == KSYStreamerConfig.ENCODE_METHOD.SOFTWARE) {
-                        mStreamer.setBeautyFilter(RecorderConstants.FILTER_BEAUTY_DISABLE);
-                    } else {
-                        mStreamer.setBeautyFilter(new KSYImageFilter());
-                    }
-                }
-            }
-        });
-
-
-        LayoutInflater inflater = LayoutInflater.from(this);
-        View view = inflater.inflate(R.layout.pippopwindow,null);
-        pop = new PopupWindow(view, ActionBar.LayoutParams.MATCH_PARENT, 600,false);
-
-        ColorDrawable cd = new ColorDrawable(0xa0000000);
-        pop.setBackgroundDrawable(cd);
-        pop.setFocusable(true);
-
-        LayoutInflater videoinflater = LayoutInflater.from(this);
-        View videoview = inflater.inflate(R.layout.videopopwindow,null);
-        videopop = new PopupWindow(videoview, ActionBar.LayoutParams.MATCH_PARENT, 600,false);
-
-        ColorDrawable videocd = new ColorDrawable(0xa0000000);
-        videopop.setBackgroundDrawable(videocd);
-        videopop.setFocusable(true);
-
-        videolist= gitVideo();
-        videopoplist = (ListView)videoview.findViewById(R.id.list_video);
-        SimpleAdapter adapter2 = new SimpleAdapter(this,videolist,R.layout.listlayout,new String[]{"data"},new int[]{R.id.list_text} );
-        videopoplist.setAdapter(adapter2);
-        videopoplist.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
-                mPipPath = videolist.get(i).get("data");
-                Toast.makeText(CameraActivityPip.this, mPicture, Toast.LENGTH_SHORT).show();
-                pop.dismiss();
-                showVideo();
-            }
-        });
-        mPip.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-
-                long curTime = System.currentTimeMillis();
-                if (curTime - lastPipClickTime < 1000) {
-                    return;
-                }
-                lastPipClickTime = curTime;
-                if (mPicPipMode) {
-                    mStreamer.hidePipBitmap();
-                    if (mPipBitmap != null) {
-                        mPipBitmap.recycle();
-                        mPipBitmap = null;
-                    }
-                    mPicPipMode = false;
-                    mPicturePip.setText(CameraActivityPip.this.getResources().getString(R.string.picture_pip));
-                    mPicturePip.postInvalidate();
-                }
-
-                if (!mPipMode) {
-                    if(videopop.isShowing()){
-                        videopop.dismiss();
-                    }else{
-                        videopop.showAtLocation(view.getRootView(), Gravity.BOTTOM|Gravity.CENTER_HORIZONTAL, 0, 0);
-                    }
-                } else {
-                    if (mKsyMediaPlayer != null) {
-                        mKsyMediaPlayer.stop();
-                        mKsyMediaPlayer.release();
-                        mStreamer.stopPlayer();
-                        mKsyMediaPlayer = null;
-                    }
-                    mPipMode = false;
-                    mPip.setText(CameraActivityPip.this.getResources().getString(R.string.pip));
-                    mPip.postInvalidate();
-                }
-            }
-        });
-
-        imagelist= getImages();
-        piplist = (ListView)view.findViewById(R.id.list_pop);
-        SimpleAdapter adapter = new SimpleAdapter(this,imagelist,R.layout.listlayout,new String[]{"data"},new int[]{R.id.list_text} );
-        piplist.setAdapter(adapter);
-        piplist.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
-                mPicture = imagelist.get(i).get("data");
-                Toast.makeText(CameraActivityPip.this, mPicture, Toast.LENGTH_SHORT).show();
-                pop.dismiss();
-                showPicture();
-            }
-        });
-
-        mPicturePip.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-
-                long curTime = System.currentTimeMillis();
-                if (curTime - lastPipClickTime < 1000) {
-                    return;
-                }
-                lastPipClickTime = curTime;
-                if (mPipMode) {
-                    if (mKsyMediaPlayer != null) {
-                        mKsyMediaPlayer.stop();
-                        mKsyMediaPlayer.release();
-                        mStreamer.stopPlayer();
-                        mKsyMediaPlayer = null;
-                    }
-                    mPipMode = false;
-                    mPip.setText(CameraActivityPip.this.getResources().getString(R.string.pip));
-                    mPip.postInvalidate();
-                }
-                if (!mPicPipMode) {
-                    if(pop.isShowing()){
-                        pop.dismiss();
-                    }else{
-                        pop.showAtLocation(view.getRootView(), Gravity.BOTTOM|Gravity.CENTER_HORIZONTAL, 0, 0);
-                    }
-
-                } else {
-                    mStreamer.hidePipBitmap();
-                    if (mPipBitmap != null) {
-                        mPipBitmap.recycle();
-                        mPipBitmap = null;
-                    }
-                    mPicPipMode = false;
-                    mPicturePip.setText(CameraActivityPip.this.getResources().getString(R.string.picture_pip));
-                    mPicturePip.postInvalidate();
-                }
-
-
-            }
-        });
-
-        mShootingText = (TextView) findViewById(R.id.click_to_shoot);
-        mShootingText.setClickable(true);
-        mShootingText.setOnClickListener(new View.OnClickListener() {
-
-            @Override
-            public void onClick(View arg0) {
-                if (recording) {
-                    if (mStreamer.stopStream()) {
-                        chronometer.stop();
-                        mShootingText.setText(START_STRING);
-                        mShootingText.postInvalidate();
-                        recording = false;
-                    } else {
-                        Log.e(TAG, "操作太频繁");
-                    }
-                } else {
-                    checkPermission();
-                    if (mStreamer.startStream()) {
-                        mShootingText.setText(STOP_STRING);
-                        mShootingText.postInvalidate();
-                        recording = true;
-
-                        mStreamer.setEnableReverb(true);
-                        mStreamer.setReverbLevel(4);
-                    } else {
-                        Log.e(TAG, "操作太频繁");
-                    }
-                }
-
-            }
-        });
-        if (startAuto) {
-            mShootingText.setEnabled(false);
-        }
-
-        mDeleteView = findViewById(R.id.backoff);
-        mDeleteView.setOnClickListener(mObserverButton);
-        mDeleteView.setEnabled(true);
-
-        mSwitchCameraView = findViewById(R.id.switch_cam);
-        mSwitchCameraView.setOnClickListener(mObserverButton);
-        mSwitchCameraView.setEnabled(true);
-
-        mFlashView = findViewById(R.id.flash);
-        mFlashView.setOnClickListener(mObserverButton);
-        mFlashView.setEnabled(true);
-
-        chronometer = (Chronometer) this.findViewById(R.id.chronometer);
-        mDebugInfoTextView = (TextView) this.findViewById(R.id.debuginfo);
-
-        for(HashMap<String,String> map:imagelist){
-            Log.e("ImageList",map.get("data"));
-        }
-    }
-
-    private void showVideo() {
-        mKsyMediaPlayer = new KSYMediaPlayer.Builder(CameraActivityPip.this).build();
-        mKsyMediaPlayer.setOnBufferingUpdateListener(mOnBufferingUpdateListener);
-        mKsyMediaPlayer.setOnCompletionListener(mOnCompletionListener);
-        mKsyMediaPlayer.setOnInfoListener(mOnInfoListener);
-        mKsyMediaPlayer.setOnErrorListener(mOnPlayerErrorListener);
-        mKsyMediaPlayer.setOnSeekCompleteListener(mOnSeekCompletedListener);
-        mKsyMediaPlayer.setScreenOnWhilePlaying(true);
-        mKsyMediaPlayer.setBufferTimeMax(5);
-        mKsyMediaPlayer.setLooping(true);
-        mKsyMediaPlayer.setVolume(pipVolume, pipVolume);
-        mKsyMediaPlayer.setPlayerMute(0);
-        mStreamer.setPipPlayer(mKsyMediaPlayer);
-        mStreamer.setHeadsetPlugged(true);
-        mStreamer.setPipLocation(0.6f, 0.6f, 0.4f, 0.4f);
-        mStreamer.startPlayer(mPipPath);
-        mPipMode = true;
-        mPip.setText(CameraActivityPip.this.getResources().getString(R.string.stop_pip));
-        mPip.postInvalidate();
-    }
-
-    public void showPicture(){
-
-        executorService.submit(new Runnable() {
-            @Override
-            public void run() {
-                mPipBitmap = BitmapFactory.decodeFile(mPicture);
-                mStreamer.showPipBitmap(mPipBitmap, 0.6f, 0.6f, 0.4f, 0.4f);
-                mPicPipMode = true;
-                mPicturePip.setText(CameraActivityPip.this.getResources().getString(R.string.stop_picture_pip));
-                mPicturePip.postInvalidate();
-            }
-        });
-    }
-
-    public ArrayList<HashMap<String,String>> gitVideo(){
-
-        int permission = ActivityCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE);
-        if (permission != PackageManager.PERMISSION_GRANTED) {
-            // We don't have permission so prompt the user
-            ActivityCompat.requestPermissions(
-                    this,
-                    new String[]{"android.permission.READ_EXTERNAL_STORAGE"},//需要请求的所有权限，这是个数组String[]
-                    1//请求码
-            );
-        }
-        ArrayList<HashMap<String,String>> videolist = new ArrayList<HashMap<String,String>>();
-        String[] mediaColumns = {MediaStore.Video.Media.DATA};
-        Cursor cursor = managedQuery(MediaStore.Video.Media.EXTERNAL_CONTENT_URI,
-                mediaColumns, null, null, null);
-
-        if(cursor==null){
-            Toast.makeText(CameraActivityPip.this, "没有找到任何文件", Toast.LENGTH_SHORT).show();
-            return null;
-        }
-
-        if(cursor.moveToFirst()){
-            do{
-                HashMap<String,String> map = new HashMap<String,String>();
-                map.put("data",cursor.getString(cursor
-                        .getColumnIndexOrThrow(MediaStore.Video.Media.DATA)));
-                videolist.add(map);
-            }while(cursor.moveToNext());
-        }
-        return videolist;
-    }
-
-
-    public ArrayList<HashMap<String, String>> getImages() {
-        Uri uri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
-        ContentResolver contentResolver = getContentResolver();
-        String[] projection = {MediaStore.Images.Media.DATA };
-        String selection = MediaStore.Images.Media.MIME_TYPE + "=? or "+ MediaStore.Images.Media.MIME_TYPE + "=?";
-        String[] selectionArgs = { "image/jpeg" , "image/png" };
-        String sortOrder = MediaStore.Images.Media.DATE_MODIFIED + " desc";
-        Cursor cursor = contentResolver.query(uri, projection, selection,
-                selectionArgs, sortOrder);
-        ArrayList<HashMap<String, String>> imageList = new ArrayList<HashMap<String, String>>();
-        if (cursor != null) {
-            HashMap<String, String> imageMap = null;
-            cursor.moveToFirst();
-            while (cursor.moveToNext()) {
-                imageMap = new HashMap<String, String>();
-                imageMap.put("data", cursor.getString(cursor
-                        .getColumnIndex(MediaStore.Images.Media.DATA)));
-                imageList.add(imageMap);
-            }
-            cursor.close();
-        }
-        return imageList;
-    }
-
-
-    private void beginInfoUploadTimer() {
-        if (printDebugInfo && timer == null) {
-            timer = new Timer();
-            timer.schedule(new TimerTask() {
-                @Override
-                public void run() {
-                    updateDebugInfo();
-                    runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            mDebugInfoTextView.setText(mDebugInfo);
-                        }
-                    });
-                }
-            }, 100, 3000);
-        }
-    }
-
-    //update debug info
-    private void updateDebugInfo() {
-        if (mStreamer == null) return;
-        mDebugInfo = String.format("RtmpHostIP()=%s DroppedFrameCount()=%d \n " +
-                        "ConnectTime()=%d DnsParseTime()=%d \n " +
-                        "UploadedKB()=%d EncodedFrames()=%d \n" +
-                        "CurrentBitrate=%f Version()=%s",
-                mStreamer.getRtmpHostIP(), mStreamer.getDroppedFrameCount(),
-                mStreamer.getConnectTime(), mStreamer.getDnsParseTime(),
-                mStreamer.getUploadedKBytes(), mStreamer.getEncodedFrames(),
-                mStreamer.getCurrentBitrate(), mStreamer.getVersion());
-    }
-
-    private void showChooseFilter() {
-        AlertDialog alertDialog;
-        alertDialog = new AlertDialog.Builder(this).setTitle("请选择美颜滤镜").setSingleChoiceItems(
-                new String[]{"BEAUTY_SOFT", "SKIN_WHITEN", "BEAUTY_ILLUSION", "DENOISE", "DEMOFILTER", "SPLIT_E/P_FILTER", "GROUP_FILTER"}, -1, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        if (which < 4) {
-                            mStreamer.setBeautyFilter(which + 16);
-                        } else if (which == 4) {
-
-                        } else if (which == 5) {
-                            mStreamer.setBeautyFilter(new DEMOFILTER(), RecorderConstants.FILTER_USAGE_ENCODE);
-                            mStreamer.setBeautyFilter(new DEMOFILTER2(), RecorderConstants.FILTER_USAGE_PREVIEW);
-                        } else if (which == 6) {
-                            mStreamer.setBeautyFilter(new GroupFilterDemo());
-                        }
-                        dialog.dismiss();
-                    }
-                })
-                .create();
-        alertDialog.setCancelable(false);
-        alertDialog.show();
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        //可以在这里做权限检查,若没有audio和camera权限,进一步引导用户做权限设置
-        checkPermission();
-        if (mKsyMediaPlayer != null) {
-            mKsyMediaPlayer.start();
-        }
-        mStreamer.onResume();
-        mAcitivityResumed = true;
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        if (mKsyMediaPlayer != null) {
-            mKsyMediaPlayer.pause();
-        }
-        mStreamer.onPause();
-        mAcitivityResumed = false;
-    }
-
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        switch (keyCode) {
-            case KeyEvent.KEYCODE_BACK:
-                new AlertDialog.Builder(CameraActivityPip.this).setCancelable(true)
-                        .setTitle("结束直播?")
-                        .setNegativeButton("取消", new DialogInterface.OnClickListener() {
-
-                            @Override
-                            public void onClick(DialogInterface arg0, int arg1) {
-
-                            }
-                        })
-                        .setPositiveButton("确定", new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface arg0, int arg1) {
-                                mStreamer.stopStream(true);
-                                chronometer.stop();
-                                recording = false;
-                                CameraActivityPip.this.finish();
-                            }
-                        }).show();
-                break;
-
-            default:
-                break;
-        }
-        return true;
-    }
-
-    //推流失败,需要退出重新启动推流,建议做log输出,方便快速定位问题
-    public StreamStatusEventHandler.OnStatusErrorListener mOnStatusErrorListener = new StreamStatusEventHandler.OnStatusErrorListener() {
-        @Override
-        public void onError(int what, int arg1, int arg2, String msg) {
-            switch (what) {
-                case RecorderConstants.KSYVIDEO_ENCODED_FRAMES_FAILED:
-                    //视频编码失败,发生在软解,会停止推流
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_ENCODED_FRAMES_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_CODEC_OPEN_FAILED:
-                    //编码器初始化失败,发生在推流开始时
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CODEC_OPEN_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_CONNECT_FAILED:
-                    //打开编码器的输入输出文件失败,发生在推流开始时,会停止推流
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CONNECT_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_DNS_PARSE_FAILED:
-                    //打开编码器的输入输出文件失败,发生在推流开始时,会停止推流
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CONNECT_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_RTMP_PUBLISH_FAILED:
-                    //打开编码器的输入输出文件失败,发生在推流开始时,会停止推流
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CONNECT_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_CONNECT_BREAK:
-                    //写入一个音视频文件失败
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CONNECT_BREAK");
-                    break;
-                case RecorderConstants.KSYVIDEO_AUDIO_INIT_FAILED:
-                    //软编,音频初始化失败
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_AUDIO_INIT_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_AUDIO_COVERT_FAILED:
-                    //软编,音频转码失败
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_AUDIO_COVERT_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_OPEN_CAMERA_FAIL:
-                    //openCamera失败
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_OPEN_CAMERA_FAIL");
-                    break;
-                case RecorderConstants.KSYVIDEO_CAMERA_PARAMS_ERROR:
-                    //获取不到camera参数,android 6.0 以下没有camera权限时可能发生
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CAMERA_PARAMS_ERROR");
-                    break;
-                case RecorderConstants.KSYVIDEO_AUDIO_START_FAILED:
-                    //audio startRecord 失败
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_AUDIO_START_FAILED");
-                    break;
-                default:
-                    break;
-            }
-
-//            if (mHandler != null) {
-//                mHandler.obtainMessage(what, msg).sendToTarget();
-//            }
-        }
-    };
-
-    public StreamStatusEventHandler.OnStatusInfoListener mOnStatusInfoListener = new StreamStatusEventHandler.OnStatusInfoListener() {
-        @Override
-        public void onInfo(int what, int arg1, int arg2, String msg) {
-            switch (what) {
-                case RecorderConstants.KSYVIDEO_OPEN_STREAM_SUCC:
-                    //推流成功
-                    Log.d("TAG", "KSYVIDEO_OPEN_STREAM_SUCC");
-//                    mHandler.obtainMessage(what, "start stream succ")
-//                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_FRAME_DATA_SEND_SLOW:
-                    //网络状况不佳
-//                    if (mHandler != null) {
-//                        mHandler.obtainMessage(what, "network not good").sendToTarget();
-//                    }
-                    break;
-                case RecorderConstants.KSYVIDEO_EST_BW_RAISE:
-                    //码率上调
-                    Log.d("TAG", "KSYVIDEO_EST_BW_RAISE");
-                    break;
-                case RecorderConstants.KSYVIDEO_EST_BW_DROP:
-                    //码率下调
-                    Log.d("TAG", "KSYVIDEO_EST_BW_DROP");
-                    break;
-                case RecorderConstants.KSYVIDEO_INIT_DONE:
-                    //video preview init done
-                    Log.d("TAG", "KSYVIDEO_INIT_DONE");
-                    break;
-                case RecorderConstants.KSYVIDEO_PIP_EXCEPTION:
-                    Log.d("TAG", "KSYVIDEO_PIP_EXCEPTION");
-//                    mHandler.obtainMessage(what, "pip exception")
-//                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_RENDER_EXCEPTION:
-                    Log.d("TAG", "KSYVIDEO_RENDER_EXCEPTION");
-//                    mHandler.obtainMessage(what, "renderer exception")
-//                            .sendToTarget();
-                    break;
-                default:
-                    break;
-
-            }
-        }
-    };
-
-    public OnStatusListener mOnErrorListener = new OnStatusListener() {
-        @Override
-        public void onStatus(int what, int arg1, int arg2, String msg) {
-            // msg may be null
-            switch (what) {
-                case RecorderConstants.KSYVIDEO_OPEN_STREAM_SUCC:
-                    // 推流成功
-                    Log.d("TAG", "KSYVIDEO_OPEN_STREAM_SUCC");
-                    mHandler.obtainMessage(what, "start stream succ")
-                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_ENCODED_FRAMES_FAILED:
-                    //编码失败
-                    Log.e(TAG, "---------KSYVIDEO_ENCODED_FRAMES_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_WLD_UPLOAD:
-                    break;
-                case RecorderConstants.KSYVIDEO_FRAME_DATA_SEND_SLOW:
-                    //网络状况不佳
-                    if (mHandler != null) {
-                        mHandler.obtainMessage(what, "network not good").sendToTarget();
-                    }
-                    break;
-                case RecorderConstants.KSYVIDEO_EST_BW_DROP:
-                    //编码码率下降状态通知
-                    break;
-                case RecorderConstants.KSYVIDEO_EST_BW_RAISE:
-                    //编码码率上升状态通知
-                    break;
-                case RecorderConstants.KSYVIDEO_AUDIO_INIT_FAILED:
-                    Log.e("CameraActivity", "init audio failed");
-                    //音频录制初始化失败回调
-                    break;
-                case RecorderConstants.KSYVIDEO_INIT_DONE:
-                    mHandler.obtainMessage(what, "init done")
-                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_PIP_EXCEPTION:
-                    mHandler.obtainMessage(what, "pip exception")
-                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_RENDER_EXCEPTION:
-                    mHandler.obtainMessage(what, "renderer exception")
-                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_AUDIO_START_FAILED:
-                    Log.e("CameraActivity", "-------audio start failed");
-                    break;
-                case RecorderConstants.KSYVIDEO_CAMERA_PARAMS_ERROR:
-                    Log.e("CameraActivity", "-------camera param is null");
-                    break;
-                case RecorderConstants.KSYVIDEO_OPEN_CAMERA_FAIL:
-                    Log.e("CameraActivity", "-------open camera failed");
-                    break;
-                default:
-                    if (msg != null) {
-                        // 可以在这里处理断网重连的逻辑
-                        if (TextUtils.isEmpty(mUrl)) {
-                            mStreamer
-                                    .updateUrl("rtmp://test.uplive.ksyun.com/live/androidtest");
-                        } else {
-                            mStreamer.updateUrl(mUrl);
-                        }
-                        if (!executorService.isShutdown()) {
-                            executorService.submit(new Runnable() {
-
-                                @Override
-                                public void run() {
-                                    boolean needReconnect = true;
-                                    try {
-                                        while (needReconnect) {
-                                            Thread.sleep(3000);
-                                            //只在Activity对用户可见时重连
-                                            if (mAcitivityResumed) {
-                                                if (mStreamer.startStream()) {
-                                                    recording = true;
-                                                    needReconnect = false;
-                                                }
-                                            }
-                                        }
-                                    } catch (InterruptedException e) {
-                                        e.printStackTrace();
-                                    }
-                                }
-
-                            });
-                        }
-                    }
-                    if (mHandler != null) {
-                        mHandler.obtainMessage(what, msg).sendToTarget();
-                    }
-            }
-        }
-
-    };
-
-    private OnLogEventListener mOnLogListener = new OnLogEventListener() {
-        @Override
-        public void onLogEvent(StringBuffer singleLogContent) {
-            Log.d(TAG, "***onLogEvent : " + singleLogContent.toString());
-        }
-    };
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        //新的状态回调机制
-        StreamStatusEventHandler.getInstance().removeStatusErrorListener(mOnStatusErrorListener);
-        StreamStatusEventHandler.getInstance().removeStatusInfoListener(mOnStatusInfoListener);
-
-        if (mKsyMediaPlayer != null) {
-            mKsyMediaPlayer.release();
-            mKsyMediaPlayer = null;
-        }
-        mStreamer.onDestroy();
-        executorService.shutdownNow();
-        if (mHandler != null) {
-            mHandler.removeCallbacksAndMessages(null);
-            mHandler = null;
-        }
-        if (timer != null) {
-            timer.cancel();
-        }
-    }
-
-    private boolean clearState() {
-        if (clearBackoff()) {
-            return true;
-        }
-        return false;
-    }
-
-    private long lastClickTime = 0;
-
-    private void onSwitchCamClick() {
-        long curTime = System.currentTimeMillis();
-        if (curTime - lastClickTime < 1000) {
-            return;
-        }
-        lastClickTime = curTime;
-
-        if (clearState()) {
-            return;
-        }
-        mStreamer.switchCamera();
-
-    }
-
-    private void onFlashClick() {
-        if (mStreamer.isFrontCamera())
-            isFlashOpened = true;
-
-        if (isFlashOpened) {
-            mStreamer.toggleTorch(false);
-            isFlashOpened = false;
-        } else {
-            mStreamer.toggleTorch(true);
-            isFlashOpened = true;
-        }
-    }
-
-    private boolean clearBackoff() {
-        if (mDeleteView.isSelected()) {
-            mDeleteView.setSelected(false);
-            return true;
-        }
-        return false;
-    }
-
-    private void onBackoffClick() {
-
-        new AlertDialog.Builder(CameraActivityPip.this).setCancelable(true)
-                .setTitle("结束直播?")
-                .setNegativeButton("取消", new DialogInterface.OnClickListener() {
-
-                    @Override
-                    public void onClick(DialogInterface arg0, int arg1) {
-
-                    }
-                })
-                .setPositiveButton("确定", new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface arg0, int arg1) {
-                        mStreamer.stopStream(true);
-                        chronometer.stop();
-                        recording = false;
-                        CameraActivityPip.this.finish();
-                    }
-                }).show();
-    }
-
-    private class ButtonObserver implements View.OnClickListener {
-        @Override
-        public void onClick(View view) {
-            switch (view.getId()) {
-                case R.id.switch_cam:
-                    onSwitchCamClick();
-                    break;
-                case R.id.backoff:
-                    onBackoffClick();
-                    break;
-                case R.id.flash:
-                    onFlashClick();
-                    break;
-                default:
-                    break;
-            }
-        }
-    }
-
-    private IMediaPlayer.OnBufferingUpdateListener mOnBufferingUpdateListener = new IMediaPlayer.OnBufferingUpdateListener() {
-        @Override
-        public void onBufferingUpdate(IMediaPlayer mp, int percent) {
-            long duration = mKsyMediaPlayer.getDuration();
-            long progress = duration * percent / 100;
-        }
-    };
-
-    private IMediaPlayer.OnSeekCompleteListener mOnSeekCompletedListener = new IMediaPlayer.OnSeekCompleteListener() {
-        @Override
-        public void onSeekComplete(IMediaPlayer mp) {
-            Log.d(TAG, "onSeekComplete...............");
-        }
-    };
-
-    private IMediaPlayer.OnCompletionListener mOnCompletionListener = new IMediaPlayer.OnCompletionListener() {
-        @Override
-        public void onCompletion(IMediaPlayer mp) {
-
-        }
-    };
-
-    private IMediaPlayer.OnErrorListener mOnPlayerErrorListener = new IMediaPlayer.OnErrorListener() {
-        @Override
-        public boolean onError(IMediaPlayer mp, int what, int extra) {
-            switch (what) {
-                case KSYMediaPlayer.MEDIA_ERROR_UNKNOWN:
-                    Log.e(TAG, "OnErrorListener, Error Unknown:" + what + ",extra:" + extra);
-                    break;
-                default:
-                    Log.e(TAG, "OnErrorListener, Error:" + what + ",extra:" + extra);
-            }
-
-            return false;
-        }
-    };
-
-    public IMediaPlayer.OnInfoListener mOnInfoListener = new IMediaPlayer.OnInfoListener() {
-        @Override
-        public boolean onInfo(IMediaPlayer iMediaPlayer, int i, int i1) {
-            Log.d(TAG, "onInfo, what:" + i + ",extra:" + i1);
-            return false;
-        }
-    };
-
-    private boolean checkPermission() {
-        try {
-            int pRecordAudio = PermissionChecker.checkCallingOrSelfPermission(this, "android.permission.RECORD_AUDIO");
-            int pCamera = PermissionChecker.checkCallingOrSelfPermission(this, "android.permission.CAMERA");
-
-            if (pRecordAudio != PackageManager.PERMISSION_GRANTED) {
-                Log.e(TAG, "do not have AudioRecord permission, please check");
-                Toast.makeText(this, "do not have AudioRecord permission, please check", Toast.LENGTH_LONG).show();
-                return false;
-            }
-            if (pCamera != PackageManager.PERMISSION_GRANTED) {
-                Log.e(TAG, "do not have CAMERA permission, please check");
-                Toast.makeText(this, "do not have CAMERA permission, please check", Toast.LENGTH_LONG).show();
-                return false;
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return true;
-    }
-
-}
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/CameraActivityWaterLogo.java b/LiveDemo/app/src/main/java/com/ksyun/live/demo/CameraActivityWaterLogo.java
deleted file mode 100644
index 8198203..0000000
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/CameraActivityWaterLogo.java
+++ /dev/null
@@ -1,739 +0,0 @@
-package com.ksyun.live.demo;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageManager;
-import android.graphics.Color;
-import android.opengl.GLSurfaceView;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.os.SystemClock;
-import android.support.v4.content.PermissionChecker;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.CheckBox;
-import android.widget.Chronometer;
-import android.widget.CompoundButton;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.ksy.recordlib.service.core.KSYStreamer;
-import com.ksy.recordlib.service.core.KSYStreamerConfig;
-import com.ksy.recordlib.service.stats.OnLogEventListener;
-import com.ksy.recordlib.service.stats.StreamStatusEventHandler;
-import com.ksy.recordlib.service.streamer.OnStatusListener;
-import com.ksy.recordlib.service.streamer.RecorderConstants;
-
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-public class CameraActivityWaterLogo extends Activity {
-
-    private static final String TAG = "CameraActivityWaterLogo";
-
-    private GLSurfaceView mCameraPreview;
-
-    private KSYStreamer mStreamer;
-
-    private Handler mHandler;
-    private final ButtonObserver mObserverButton = new ButtonObserver();
-
-    private Chronometer chronometer;
-    private View mDeleteView;
-    private View mSwitchCameraView;
-    private View mFlashView;
-
-    private CheckBox mWaterMark;
-    private TextView mShootingText;
-    private boolean recording = false;
-    private boolean isFlashOpened = false;
-    private boolean startAuto = false;
-    private boolean showWaterMark = false;
-    private boolean landscape = false;
-    private boolean printDebugInfo = false;
-
-    private String mUrl, mDebugInfo = "";
-    private String mLogoPath = "/sdcard/test.png";
-    private static final String START_STRING = "开始直播";
-    private static final String STOP_STRING = "停止直播";
-    private TextView mUrlTextView, mDebugInfoTextView;
-    private volatile boolean mAcitivityResumed = false;
-    private KSYStreamerConfig.ENCODE_METHOD encode_method = KSYStreamerConfig.ENCODE_METHOD.SOFTWARE;
-    public final static String URL = "url";
-    public final static String FRAME_RATE = "framerate";
-    public final static String VIDEO_BITRATE = "video_bitrate";
-    public final static String AUDIO_BITRATE = "audio_bitrate";
-    public final static String VIDEO_RESOLUTION = "video_resolution";
-    public final static String LANDSCAPE = "landscape";
-    public final static String ENCDODE_METHOD = "ENCDODE_METHOD";
-    public final static String START_ATUO = "start_auto";
-    public final static String MANUAL_FOCUS = "manual_focus";
-    public static final String SHOW_DEBUGINFO = "SHOW_DEBUGINFO";
-
-    Timer timer;
-    ExecutorService executorService = Executors.newSingleThreadExecutor();
-
-    public static void startActivity(Context context, int fromType,
-                                     String rtmpUrl, int frameRate, int videoBitrate, int audioBitrate,
-                                     int videoResolution, boolean isLandscape, KSYStreamerConfig.ENCODE_METHOD encodeMethod, boolean startAuto,
-                                     boolean manualFocus, boolean showDebugInfo,int audiohz) {
-        Intent intent = new Intent(context, CameraActivityWaterLogo.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        intent.putExtra("type", fromType);
-        intent.putExtra(URL, rtmpUrl);
-        intent.putExtra(FRAME_RATE, frameRate);
-        intent.putExtra(VIDEO_BITRATE, videoBitrate);
-        intent.putExtra(AUDIO_BITRATE, audioBitrate);
-        intent.putExtra(VIDEO_RESOLUTION, videoResolution);
-        intent.putExtra(LANDSCAPE, isLandscape);
-        intent.putExtra(ENCDODE_METHOD, encodeMethod);
-        intent.putExtra(START_ATUO, startAuto);
-        intent.putExtra(MANUAL_FOCUS, manualFocus);
-        intent.putExtra(SHOW_DEBUGINFO, showDebugInfo);
-        intent.putExtra("audiohz",audiohz);
-        context.startActivity(intent);
-    }
-
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-
-        setContentView(R.layout.camera_activity_waterlogo);
-        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
-                WindowManager.LayoutParams.FLAG_FULLSCREEN);
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-
-        mCameraPreview = (GLSurfaceView) findViewById(R.id.camera_preview);
-        mUrlTextView = (TextView) findViewById(R.id.url);
-        mWaterMark = (CheckBox) findViewById(R.id.watermark);
-        showWaterMark = mWaterMark.isChecked();
-
-        KSYStreamerConfig.Builder builder = new KSYStreamerConfig.Builder();
-        mHandler = new Handler() {
-
-            @Override
-            public void handleMessage(Message msg) {
-                if (msg != null && msg.obj != null) {
-                    String content = msg.obj.toString();
-                    switch (msg.what) {
-                        case RecorderConstants.KSYVIDEO_ENCODED_FRAMES_FAILED:
-                        case RecorderConstants.KSYVIDEO_CODEC_OPEN_FAILED:
-                        case RecorderConstants.KSYVIDEO_CONNECT_FAILED:
-                        case RecorderConstants.KSYVIDEO_DNS_PARSE_FAILED:
-                        case RecorderConstants.KSYVIDEO_RTMP_PUBLISH_FAILED:
-                        case RecorderConstants.KSYVIDEO_CONNECT_BREAK:
-                        case RecorderConstants.KSYVIDEO_AUDIO_INIT_FAILED:
-                        case RecorderConstants.KSYVIDEO_OPEN_CAMERA_FAIL:
-                        case RecorderConstants.KSYVIDEO_CAMERA_PARAMS_ERROR:
-                        case RecorderConstants.KSYVIDEO_AUDIO_START_FAILED:
-                            Toast.makeText(CameraActivityWaterLogo.this, content,
-                                    Toast.LENGTH_LONG).show();
-                            chronometer.stop();
-                            mShootingText.setText(START_STRING);
-                            mShootingText.postInvalidate();
-                            break;
-                        case RecorderConstants.KSYVIDEO_OPEN_STREAM_SUCC:
-                            chronometer.setBase(SystemClock.elapsedRealtime());
-                            // 开始计时
-                            chronometer.start();
-                            mShootingText.setText(STOP_STRING);
-                            mShootingText.postInvalidate();
-                            beginInfoUploadTimer();
-                            break;
-                        case RecorderConstants.KSYVIDEO_INIT_DONE:
-                            if (mShootingText != null)
-                                mShootingText.setEnabled(true);
-                            Toast.makeText(getApplicationContext(), "初始化完成", Toast.LENGTH_SHORT).show();
-                            checkPermission();
-                            if (startAuto && mStreamer.startStream()) {
-                                mShootingText.setText(STOP_STRING);
-                                mShootingText.postInvalidate();
-                                recording = true;
-                            }
-                            break;
-                        default:
-                            Toast.makeText(CameraActivityWaterLogo.this, content,
-                                    Toast.LENGTH_SHORT).show();
-                    }
-                }
-            }
-
-        };
-
-        Bundle bundle = getIntent().getExtras();
-        if (bundle != null) {
-            String url = bundle.getString(URL);
-            if (!TextUtils.isEmpty(url)) {
-                builder.setmUrl(url);
-                mUrl = url;
-                mUrlTextView.setText(mUrl);
-            }
-
-            int audiohz = bundle.getInt("audiohz",0);
-            builder.setSampleAudioRateInHz(audiohz);
-
-            int frameRate = bundle.getInt(FRAME_RATE, 0);
-            if (frameRate > 0) {
-                builder.setFrameRate(frameRate);
-            }
-
-            int videoBitrate = bundle.getInt(VIDEO_BITRATE, 0);
-            if (videoBitrate > 0) {
-                //设置最高码率，即目标码率
-                builder.setMaxAverageVideoBitrate(videoBitrate);
-                //设置最低码率
-                builder.setMinAverageVideoBitrate(videoBitrate * 2 / 8);
-                //设置初始码率
-                builder.setInitAverageVideoBitrate(videoBitrate * 5 / 8);
-            }
-
-            int audioBitrate = bundle.getInt(AUDIO_BITRATE, 0);
-            if (audioBitrate > 0) {
-                builder.setAudioBitrate(audioBitrate);
-            }
-
-            int videoResolution = bundle.getInt(VIDEO_RESOLUTION, 0);
-            builder.setVideoResolution(videoResolution);
-
-            encode_method = (KSYStreamerConfig.ENCODE_METHOD) bundle.get(ENCDODE_METHOD);
-            builder.setEncodeMethod(encode_method);
-
-            builder.setSampleAudioRateInHz(44100);
-            builder.setEnableStreamStatModule(true);
-
-            landscape = bundle.getBoolean(LANDSCAPE, false);
-            builder.setDefaultLandscape(landscape);
-
-            if (landscape) {
-                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-            } else {
-                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-            }
-            startAuto = bundle.getBoolean(START_ATUO, false);
-
-            boolean focus_manual = bundle.getBoolean(MANUAL_FOCUS, false);
-            builder.setManualFocus(focus_manual);
-            printDebugInfo = bundle.getBoolean(SHOW_DEBUGINFO, false);
-
-            builder.setIsSlightBeauty(false);
-            builder.setAutoAdjustBitrate(false);
-        }
-
-        //可以在这里做权限检查,若没有audio和camera权限,进一步引导用户做权限设置
-        checkPermission();
-        mStreamer = new KSYStreamer(this);
-        mStreamer.setConfig(builder.build());
-        mStreamer.setDisplayPreview(mCameraPreview);
-        //老的状态回调机制
-        mStreamer.setOnStatusListener(mOnErrorListener);
-
-        //新的状态回调机制
-        StreamStatusEventHandler.getInstance().addOnStatusErrorListener(mOnStatusErrorListener);
-        StreamStatusEventHandler.getInstance().addOnStatusInfoListener(mOnStatusInfoListener);
-
-        mStreamer.setOnLogListener(mOnLogListener);
-        mStreamer.enableDebugLog(true);
-        if (showWaterMark) {
-            showWaterMark();
-        }
-
-        mWaterMark.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                if (isChecked)
-                    showWaterMark();
-                else
-                    hideWaterMark();
-            }
-        });
-
-        mShootingText = (TextView) findViewById(R.id.click_to_shoot);
-        mShootingText.setClickable(true);
-        mShootingText.setOnClickListener(new View.OnClickListener() {
-
-            @Override
-            public void onClick(View arg0) {
-                if (recording) {
-                    if (mStreamer.stopStream()) {
-                        chronometer.stop();
-                        mShootingText.setText(START_STRING);
-                        mShootingText.postInvalidate();
-                        recording = false;
-                    } else {
-                        Log.e(TAG, "操作太频繁");
-                    }
-                } else {
-                    checkPermission();
-                    if (mStreamer.startStream()) {
-                        mShootingText.setText(STOP_STRING);
-                        mShootingText.postInvalidate();
-                        recording = true;
-
-                        mStreamer.setEnableReverb(true);
-                        mStreamer.setReverbLevel(4);
-                    } else {
-                        Log.e(TAG, "操作太频繁");
-                    }
-                }
-
-            }
-        });
-
-        if (startAuto) {
-            mShootingText.setEnabled(false);
-        }
-
-        mDeleteView = findViewById(R.id.backoff);
-        mDeleteView.setOnClickListener(mObserverButton);
-        mDeleteView.setEnabled(true);
-
-        mSwitchCameraView = findViewById(R.id.switch_cam);
-        mSwitchCameraView.setOnClickListener(mObserverButton);
-        mSwitchCameraView.setEnabled(true);
-
-        mFlashView = findViewById(R.id.flash);
-        mFlashView.setOnClickListener(mObserverButton);
-        mFlashView.setEnabled(true);
-
-        chronometer = (Chronometer) this.findViewById(R.id.chronometer);
-        mDebugInfoTextView = (TextView) this.findViewById(R.id.debuginfo);
-    }
-
-    private void beginInfoUploadTimer() {
-        if (printDebugInfo && timer == null) {
-            timer = new Timer();
-            timer.schedule(new TimerTask() {
-                @Override
-                public void run() {
-                    updateDebugInfo();
-                    runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            mDebugInfoTextView.setText(mDebugInfo);
-                        }
-                    });
-                }
-            }, 100, 3000);
-        }
-    }
-
-    //update debug info
-    private void updateDebugInfo() {
-        if (mStreamer == null) return;
-        mDebugInfo = String.format("RtmpHostIP()=%s DroppedFrameCount()=%d \n " +
-                        "ConnectTime()=%d DnsParseTime()=%d \n " +
-                        "UploadedKB()=%d EncodedFrames()=%d \n" +
-                        "CurrentBitrate=%f Version()=%s",
-                mStreamer.getRtmpHostIP(), mStreamer.getDroppedFrameCount(),
-                mStreamer.getConnectTime(), mStreamer.getDnsParseTime(),
-                mStreamer.getUploadedKBytes(), mStreamer.getEncodedFrames(),
-                mStreamer.getCurrentBitrate(), mStreamer.getVersion());
-    }
-
-    //show watermark in specific location
-    private void showWaterMark() {
-        if (!landscape) {
-            mStreamer.showWaterMarkLogo(mLogoPath, 0.08f, 0.06f, 0.27f, 0.15f, 0.8f);
-            mStreamer.showWaterMarkTime(0.02f, 0.015f, 0.4f, Color.RED, 1.0f);
-        } else {
-            mStreamer.showWaterMarkLogo(mLogoPath, 0.06f, 0.08f, 0.15f, 0.27f, 0.8f);
-            mStreamer.showWaterMarkTime(0.015f, 0.02f, 0.25f, Color.RED, 1.0f);
-        }
-    }
-
-    private void hideWaterMark() {
-        mStreamer.hideWaterMarkLogo();
-        mStreamer.hideWaterMarkTime();
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        //可以在这里做权限检查,若没有audio和camera权限,进一步引导用户做权限设置
-        checkPermission();
-        mStreamer.onResume();
-        mAcitivityResumed = true;
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        mStreamer.onPause();
-        mAcitivityResumed = false;
-    }
-
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        switch (keyCode) {
-            case KeyEvent.KEYCODE_BACK:
-                new AlertDialog.Builder(CameraActivityWaterLogo.this).setCancelable(true)
-                        .setTitle("结束直播?")
-                        .setNegativeButton("取消", new DialogInterface.OnClickListener() {
-
-                            @Override
-                            public void onClick(DialogInterface arg0, int arg1) {
-
-                            }
-                        })
-                        .setPositiveButton("确定", new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface arg0, int arg1) {
-                                mStreamer.stopStream(true);
-                                chronometer.stop();
-                                recording = false;
-                                CameraActivityWaterLogo.this.finish();
-                            }
-                        }).show();
-                break;
-
-            default:
-                break;
-        }
-        return true;
-    }
-
-    //推流失败,需要退出重新启动推流,建议做log输出,方便快速定位问题
-    public StreamStatusEventHandler.OnStatusErrorListener mOnStatusErrorListener = new StreamStatusEventHandler.OnStatusErrorListener() {
-        @Override
-        public void onError(int what, int arg1, int arg2, String msg) {
-            switch (what) {
-                case RecorderConstants.KSYVIDEO_ENCODED_FRAMES_FAILED:
-                    //视频编码失败,发生在软解,会停止推流
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_ENCODED_FRAMES_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_CODEC_OPEN_FAILED:
-                    //编码器初始化失败,发生在推流开始时
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CODEC_OPEN_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_CONNECT_FAILED:
-                    //打开编码器的输入输出文件失败,发生在推流开始时,会停止推流
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CONNECT_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_DNS_PARSE_FAILED:
-                    //打开编码器的输入输出文件失败,发生在推流开始时,会停止推流
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CONNECT_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_RTMP_PUBLISH_FAILED:
-                    //打开编码器的输入输出文件失败,发生在推流开始时,会停止推流
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CONNECT_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_CONNECT_BREAK:
-                    //写入一个音视频文件失败
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CONNECT_BREAK");
-                    break;
-                case RecorderConstants.KSYVIDEO_AUDIO_INIT_FAILED:
-                    //软编,音频初始化失败
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_AUDIO_INIT_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_AUDIO_COVERT_FAILED:
-                    //软编,音频转码失败
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_AUDIO_COVERT_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_OPEN_CAMERA_FAIL:
-                    //openCamera失败
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_OPEN_CAMERA_FAIL");
-                    break;
-                case RecorderConstants.KSYVIDEO_CAMERA_PARAMS_ERROR:
-                    //获取不到camera参数,android 6.0 以下没有camera权限时可能发生
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_CAMERA_PARAMS_ERROR");
-                    break;
-                case RecorderConstants.KSYVIDEO_AUDIO_START_FAILED:
-                    //audio startRecord 失败
-                    Log.e(TAG, "the streaming stopped because KSYVIDEO_AUDIO_START_FAILED");
-                    break;
-                default:
-                    break;
-            }
-
-//            if (mHandler != null) {
-//                mHandler.obtainMessage(what, msg).sendToTarget();
-//            }
-        }
-    };
-
-    public StreamStatusEventHandler.OnStatusInfoListener mOnStatusInfoListener = new StreamStatusEventHandler.OnStatusInfoListener() {
-        @Override
-        public void onInfo(int what, int arg1, int arg2, String msg) {
-            switch (what) {
-                case RecorderConstants.KSYVIDEO_OPEN_STREAM_SUCC:
-                    //推流成功
-                    Log.d("TAG", "KSYVIDEO_OPEN_STREAM_SUCC");
-//                    mHandler.obtainMessage(what, "start stream succ")
-//                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_FRAME_DATA_SEND_SLOW:
-                    //网络状况不佳
-//                    if (mHandler != null) {
-//                        mHandler.obtainMessage(what, "network not good").sendToTarget();
-//                    }
-                    break;
-                case RecorderConstants.KSYVIDEO_EST_BW_RAISE:
-                    //码率上调
-                    Log.d("TAG", "KSYVIDEO_EST_BW_RAISE");
-                    break;
-                case RecorderConstants.KSYVIDEO_EST_BW_DROP:
-                    //码率下调
-                    Log.d("TAG", "KSYVIDEO_EST_BW_DROP");
-                    break;
-                case RecorderConstants.KSYVIDEO_INIT_DONE:
-                    //video preview init done
-                    Log.d("TAG", "KSYVIDEO_INIT_DONE");
-                    break;
-                case RecorderConstants.KSYVIDEO_PIP_EXCEPTION:
-                    Log.d("TAG", "KSYVIDEO_PIP_EXCEPTION");
-//                    mHandler.obtainMessage(what, "pip exception")
-//                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_RENDER_EXCEPTION:
-                    Log.d("TAG", "KSYVIDEO_RENDER_EXCEPTION");
-//                    mHandler.obtainMessage(what, "renderer exception")
-//                            .sendToTarget();
-                    break;
-                default:
-                    break;
-
-            }
-        }
-    };
-
-    public OnStatusListener mOnErrorListener = new OnStatusListener() {
-        @Override
-        public void onStatus(int what, int arg1, int arg2, String msg) {
-            // msg may be null
-            switch (what) {
-                case RecorderConstants.KSYVIDEO_OPEN_STREAM_SUCC:
-                    // 推流成功
-                    Log.d("TAG", "KSYVIDEO_OPEN_STREAM_SUCC");
-                    mHandler.obtainMessage(what, "start stream succ")
-                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_ENCODED_FRAMES_FAILED:
-                    //编码失败
-                    Log.e(TAG, "---------KSYVIDEO_ENCODED_FRAMES_FAILED");
-                    break;
-                case RecorderConstants.KSYVIDEO_WLD_UPLOAD:
-                    break;
-                case RecorderConstants.KSYVIDEO_FRAME_DATA_SEND_SLOW:
-                    //网络状况不佳
-                    if (mHandler != null) {
-                        mHandler.obtainMessage(what, "network not good").sendToTarget();
-                    }
-                    break;
-                case RecorderConstants.KSYVIDEO_EST_BW_DROP:
-                    //编码码率下降状态通知
-                    break;
-                case RecorderConstants.KSYVIDEO_EST_BW_RAISE:
-                    //编码码率上升状态通知
-                    break;
-                case RecorderConstants.KSYVIDEO_AUDIO_INIT_FAILED:
-                    Log.e("CameraActivity", "init audio failed");
-                    //音频录制初始化失败回调
-                    break;
-                case RecorderConstants.KSYVIDEO_INIT_DONE:
-                    mHandler.obtainMessage(what, "init done")
-                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_PIP_EXCEPTION:
-                    mHandler.obtainMessage(what, "pip exception")
-                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_RENDER_EXCEPTION:
-                    mHandler.obtainMessage(what, "renderer exception")
-                            .sendToTarget();
-                    break;
-                case RecorderConstants.KSYVIDEO_AUDIO_START_FAILED:
-                    Log.e("CameraActivity", "-------audio start failed");
-                    break;
-                case RecorderConstants.KSYVIDEO_CAMERA_PARAMS_ERROR:
-                    Log.e("CameraActivity", "-------camera param is null");
-                    break;
-                case RecorderConstants.KSYVIDEO_OPEN_CAMERA_FAIL:
-                    Log.e("CameraActivity", "-------open camera failed");
-                    break;
-                default:
-                    if (msg != null) {
-                        // 可以在这里处理断网重连的逻辑
-                        if (TextUtils.isEmpty(mUrl)) {
-                            mStreamer
-                                    .updateUrl("rtmp://test.uplive.ksyun.com/live/androidtest");
-                        } else {
-                            mStreamer.updateUrl(mUrl);
-                        }
-                        if (!executorService.isShutdown()) {
-                            executorService.submit(new Runnable() {
-
-                                @Override
-                                public void run() {
-                                    boolean needReconnect = true;
-                                    try {
-                                        while (needReconnect) {
-                                            Thread.sleep(3000);
-                                            //只在Activity对用户可见时重连
-                                            if (mAcitivityResumed) {
-                                                if (mStreamer.startStream()) {
-                                                    recording = true;
-                                                    needReconnect = false;
-                                                }
-                                            }
-                                        }
-                                    } catch (InterruptedException e) {
-                                        e.printStackTrace();
-                                    }
-                                }
-
-                            });
-                        }
-                    }
-                    if (mHandler != null) {
-                        mHandler.obtainMessage(what, msg).sendToTarget();
-                    }
-            }
-        }
-
-    };
-
-    private OnLogEventListener mOnLogListener = new OnLogEventListener() {
-        @Override
-        public void onLogEvent(StringBuffer singleLogContent) {
-            Log.d(TAG, "***onLogEvent : " + singleLogContent.toString());
-        }
-    };
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        //新的状态回调机制
-        StreamStatusEventHandler.getInstance().removeStatusErrorListener(mOnStatusErrorListener);
-        StreamStatusEventHandler.getInstance().removeStatusInfoListener(mOnStatusInfoListener);
-
-        mStreamer.onDestroy();
-        executorService.shutdownNow();
-        if (mHandler != null) {
-            mHandler.removeCallbacksAndMessages(null);
-            mHandler = null;
-        }
-        if (timer != null) {
-            timer.cancel();
-        }
-    }
-
-    private boolean clearState() {
-        if (clearBackoff()) {
-            return true;
-        }
-        return false;
-    }
-
-    private long lastClickTime = 0;
-
-    private void onSwitchCamClick() {
-        long curTime = System.currentTimeMillis();
-        if (curTime - lastClickTime < 1000) {
-            return;
-        }
-        lastClickTime = curTime;
-
-        if (clearState()) {
-            return;
-        }
-        mStreamer.switchCamera();
-
-    }
-
-    private void onFlashClick() {
-        if (mStreamer.isFrontCamera())
-            isFlashOpened = true;
-
-        if (isFlashOpened) {
-            mStreamer.toggleTorch(false);
-            isFlashOpened = false;
-        } else {
-            mStreamer.toggleTorch(true);
-            isFlashOpened = true;
-        }
-    }
-
-    private boolean clearBackoff() {
-        if (mDeleteView.isSelected()) {
-            mDeleteView.setSelected(false);
-            return true;
-        }
-        return false;
-    }
-
-    private void onBackoffClick() {
-
-        new AlertDialog.Builder(CameraActivityWaterLogo.this).setCancelable(true)
-                .setTitle("结束直播?")
-                .setNegativeButton("取消", new DialogInterface.OnClickListener() {
-
-                    @Override
-                    public void onClick(DialogInterface arg0, int arg1) {
-
-                    }
-                })
-                .setPositiveButton("确定", new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface arg0, int arg1) {
-                        mStreamer.stopStream(true);
-                        chronometer.stop();
-                        recording = false;
-                        CameraActivityWaterLogo.this.finish();
-                    }
-                }).show();
-    }
-
-    private class ButtonObserver implements View.OnClickListener {
-        @Override
-        public void onClick(View view) {
-            switch (view.getId()) {
-                case R.id.switch_cam:
-                    onSwitchCamClick();
-                    break;
-                case R.id.backoff:
-                    onBackoffClick();
-                    break;
-                case R.id.flash:
-                    onFlashClick();
-                    break;
-                default:
-                    break;
-            }
-        }
-    }
-
-    private boolean checkPermission() {
-        try {
-            int pRecordAudio = PermissionChecker.checkCallingOrSelfPermission(this, "android.permission.RECORD_AUDIO");
-            int pCamera = PermissionChecker.checkCallingOrSelfPermission(this, "android.permission.CAMERA");
-
-            if (pRecordAudio != PackageManager.PERMISSION_GRANTED) {
-                Log.e(TAG, "do not have AudioRecord permission, please check");
-                Toast.makeText(this, "do not have AudioRecord permission, please check", Toast.LENGTH_LONG).show();
-                return false;
-            }
-            if (pCamera != PackageManager.PERMISSION_GRANTED) {
-                Log.e(TAG, "do not have CAMERA permission, please check");
-                Toast.makeText(this, "do not have CAMERA permission, please check", Toast.LENGTH_LONG).show();
-                return false;
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return true;
-    }
-
-}
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/DEMOFILTER.java b/LiveDemo/app/src/main/java/com/ksyun/live/demo/DEMOFILTER.java
deleted file mode 100644
index d2a5a8f..0000000
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/DEMOFILTER.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.ksyun.live.demo;
-
-
-import com.ksy.recordlib.service.hardware.ksyfilter.KSYImageFilter;
-
-/**
- * Created by hansentian on 4/8/16.
- */
-public class DEMOFILTER extends KSYImageFilter {
-    // Fragment shader that attempts to produce a high contrast image
-    private static final String FRAGMENT_SHADER =
-            "#extension GL_OES_EGL_image_external : require\n" +
-                    "precision mediump float;\n" +
-                    "varying vec2 vTextureCoord;\n" +
-                    "uniform  float greenplus;\n" +
-                    "uniform samplerExternalOES sTexture;\n" +
-                    "void main() {\n" +
-                    "    vec4 tc = texture2D(sTexture, vTextureCoord);\n" +
-                    "    float color = ((tc.r  + tc.g + tc.b ) / 3.0) ;\n" +
-                    "    gl_FragColor = vec4(color, color + greenplus, color, 1.0);\n" +
-                    "}\n";
-
-    public DEMOFILTER() {
-        super(NO_FILTER_VERTEX_SHADER, FRAGMENT_SHADER);
-    }
-
-    private int greenplusLocation = -1;
-
-    public void onInitialized() {
-        greenplusLocation = getUniformLocation("greenplus");
-        setFloat(greenplusLocation, 0.3f);
-    }
-
-}
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/DEMOFILTER2.java b/LiveDemo/app/src/main/java/com/ksyun/live/demo/DEMOFILTER2.java
deleted file mode 100644
index 53af2c2..0000000
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/DEMOFILTER2.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.ksyun.live.demo;
-
-
-import com.ksy.recordlib.service.hardware.ksyfilter.KSYImageFilter;
-
-/**
- * Created by hansentian on 4/8/28.
- */
-public class DEMOFILTER2 extends KSYImageFilter {
-    // Fragment shader that attempts to produce a high contrast image
-    private static final String FRAGMENT_SHADER =
-            "#extension GL_OES_EGL_image_external : require\n" +
-                    "precision mediump float;\n" +
-                    "varying vec2 vTextureCoord;\n" +
-                    "uniform  float greenplus;\n" +
-                    "uniform samplerExternalOES sTexture;\n" +
-                    "void main() {\n" +
-                    "    vec4 tc = texture2D(sTexture, vTextureCoord);\n" +
-                    "    float color = ((tc.r  + tc.g + tc.b ) / 3.0) ;\n" +
-                    "    gl_FragColor = vec4(color, color + greenplus, color, 1.0);\n" +
-                    "}\n";
-
-    public DEMOFILTER2() {
-        super(NO_FILTER_VERTEX_SHADER, FRAGMENT_SHADER);
-    }
-
-    private int greenplusLocation = -1;
-
-    public void onInitialized() {
-        greenplusLocation = getUniformLocation("greenplus");
-        setFloat(greenplusLocation, -0.3f);
-    }
-
-}
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/DEMOFILTER3.java b/LiveDemo/app/src/main/java/com/ksyun/live/demo/DEMOFILTER3.java
deleted file mode 100644
index 6c77673..0000000
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/DEMOFILTER3.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.ksyun.live.demo;
-
-
-import com.ksy.recordlib.service.hardware.ksyfilter.KSYImageFilter;
-
-/**
- * Created by hansentian on 4/8/28.
- */
-public class DEMOFILTER3 extends KSYImageFilter {
-    // Fragment shader that attempts to produce a high contrast image
-    private static final String FRAGMENT_SHADER =
-            "#extension GL_OES_EGL_image_external : require\n" +
-                    "precision mediump float;\n" +
-                    "varying vec2 vTextureCoord;\n" +
-                    "uniform  float greenplus;\n" +
-                    "uniform sampler2D sTexture;\n" +
-                    "void main() {\n" +
-                    "    vec4 tc = texture2D(sTexture, vTextureCoord);\n" +
-                    "    float color = ((tc.r  + tc.g + tc.b ) / 3.0) ;\n" +
-                    "    gl_FragColor = vec4(color+ greenplus, color , color, 1.0);\n" +
-                    "}\n";
-
-    public DEMOFILTER3() {
-        super(NO_TRANSFORMER_VERTEX_SHADER, FRAGMENT_SHADER);
-    }
-
-    private int greenplusLocation = -1;
-
-    public void onInitialized() {
-        greenplusLocation = getUniformLocation("greenplus");
-        setFloat(greenplusLocation, -0.3f);
-    }
-
-}
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/DEMOFILTER4.java b/LiveDemo/app/src/main/java/com/ksyun/live/demo/DEMOFILTER4.java
deleted file mode 100644
index 7410b2a..0000000
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/DEMOFILTER4.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.ksyun.live.demo;
-
-
-import com.ksy.recordlib.service.hardware.ksyfilter.KSYImageFilter;
-
-/**
- * Created by hansentian on 4/8/28.
- */
-public class DEMOFILTER4 extends KSYImageFilter {
-    // Fragment shader that attempts to produce a high contrast image
-    private static final String FRAGMENT_SHADER =
-            "#extension GL_OES_EGL_image_external : require\n" +
-                    "precision mediump float;\n" +
-                    "varying vec2 vTextureCoord;\n" +
-                    "uniform  float greenplus;\n" +
-                    "uniform sampler2D sTexture;\n" +
-                    "void main() {\n" +
-                    "    vec4 tc = texture2D(sTexture, vTextureCoord);\n" +
-                    "    float color = ((tc.r  + tc.g + tc.b ) / 3.0) ;\n" +
-                    "    gl_FragColor = vec4(color+ greenplus, color + greenplus, color, 1.0);\n" +
-                    "}\n";
-
-    public DEMOFILTER4() {
-        super(NO_TRANSFORMER_VERTEX_SHADER, FRAGMENT_SHADER);
-    }
-
-    private int greenplusLocation = -1;
-
-    public void onInitialized() {
-        greenplusLocation = getUniformLocation("greenplus");
-        setFloat(greenplusLocation, +0.5f);
-    }
-
-}
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/GroupFilterDemo.java b/LiveDemo/app/src/main/java/com/ksyun/live/demo/GroupFilterDemo.java
deleted file mode 100644
index 504ddcf..0000000
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/GroupFilterDemo.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.ksyun.live.demo;
-
-import com.ksy.recordlib.service.hardware.filter.KSYImageGroupFilter;
-import com.ksy.recordlib.service.hardware.ksyfilter.KSYImageFilter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by hansentian on 5/5/16.
- */
-public class GroupFilterDemo extends KSYImageGroupFilter {
-    public GroupFilterDemo() {
-        super(initFilters());
-    }
-
-    private static List<KSYImageFilter> initFilters() {
-        List<KSYImageFilter> filters = new ArrayList<>();
-        filters.add(new DEMOFILTER2());
-        filters.add(new DEMOFILTER3());
-        filters.add(new DEMOFILTER4());
-
-        return filters;
-    }
-}
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/Settings.java b/LiveDemo/app/src/main/java/com/ksyun/live/demo/Settings.java
deleted file mode 100644
index eba5da7..0000000
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/Settings.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ksyun.live.demo;
-
-/**
- * Created by liubohua on 16/8/5.
- */
-public class Settings {
-    public static final String RESOLUTION360= "360P";
-    public static final String RESOLUTION480= "480P";
-    public static final String RESOLUTION540= "540P";
-    public static final String RESOLUTION720= "720P";
-    public static final String ENCODE_HW = "hard";
-    public static final String ENCODE_SW = "soft";
-    public static final String ORIENTATION1 = "orientation1";
-    public static final String ORIENTATION2 = "orientation2";
-    public static final String AUDIORATEINHZ44100 = "44100";
-    public static final String AUDIORATEINHZ32000 = "32000";
-    public static final String AUDIORATEINHZ22050 = "22050";
-
-
-}
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/StreamActivity.java b/LiveDemo/app/src/main/java/com/ksyun/live/demo/StreamActivity.java
deleted file mode 100644
index 374e030..0000000
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/StreamActivity.java
+++ /dev/null
@@ -1,410 +0,0 @@
-package com.ksyun.live.demo;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.graphics.drawable.ColorDrawable;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.PopupWindow;
-import android.widget.RadioButton;
-import android.widget.RadioGroup;
-import android.widget.Spinner;
-
-import com.ksy.recordlib.service.core.KSYStreamerConfig;
-import com.ksy.recordlib.service.streamer.RecorderConstants;
-
-public class StreamActivity extends AppCompatActivity implements View.OnClickListener,RadioGroup.OnCheckedChangeListener{
-    private Spinner spinner_resolution;
-    private String[] strs = {Settings.RESOLUTION360,Settings.RESOLUTION480,Settings.RESOLUTION540,Settings.RESOLUTION720};
-
-    private Spinner spinner_audiorateinhz;
-
-    private String[] strs2 = {Settings.AUDIORATEINHZ44100,Settings.AUDIORATEINHZ32000,Settings.AUDIORATEINHZ22050};
-
-    private EditText edit_rtmpurl;
-    private EditText edit_frameRatePicker;
-    private EditText edit_videoBitratePicker;
-    private EditText edit_audioBitratePicker;
-
-    private Button btn_videoBitrate;
-    private Button btn_audioBitrate;
-    private Button btn_start;
-    private Button btn_beauty;
-    private Button btn_pip;
-    private Button btn_audio;
-    private Button btn_water;
-    private Button btn_mix;
-    private Button btn_other;
-
-    private RadioGroup group_orientation;
-    private RadioGroup group_encode;
-    private RadioButton radio_orientationbutton1;
-    private RadioButton radio_orientationbutton2;
-    private RadioButton radio_encode_hw;
-    private RadioButton radio_encode_sw;
-
-    private String resolution;
-    private String rtmpurl;
-    private String frameRatePicker;
-    private String videoBitratePicker;
-    private String audioBitratePicker;
-    private String encode;
-    private String orientation;
-    private String audiorateinhz;
-
-
-    private SharedPreferences settings;
-    private SharedPreferences.Editor editor;
-
-
-    private int[] location = new int[2];
-    private PopupWindow pop;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_stream);
-
-        LayoutInflater inflater = LayoutInflater.from(this);
-        View view = inflater.inflate(R.layout.popupwindow,null);
-        pop = new PopupWindow(view, ActionBar.LayoutParams.MATCH_PARENT, 600,false);
-
-        ColorDrawable cd = new ColorDrawable(0xb0000000);
-        pop.setBackgroundDrawable(cd);
-        pop.setFocusable(true);
-
-        spinner_resolution = (Spinner)findViewById(R.id.spinner_resolution);
-        spinner_audiorateinhz = (Spinner)findViewById(R.id.spinner_audiorateinhz);
-
-        edit_audioBitratePicker = (EditText)findViewById(R.id.edit_audioBitratePicker);
-        edit_rtmpurl = (EditText)findViewById(R.id.edit_rtmpurl);
-        edit_frameRatePicker = (EditText)findViewById(R.id.edit_frameRatePicker);
-        edit_videoBitratePicker = (EditText) findViewById(R.id.edit_videoBitratePicker);
-
-        btn_videoBitrate = (Button)findViewById(R.id.btn_videoBitrate);
-        btn_audioBitrate = (Button)findViewById(R.id.btn_audioBitrate);
-        btn_start = (Button)findViewById(R.id.btn_start);
-        btn_beauty = (Button)view.findViewById(R.id.btn_beauty);
-        btn_pip = (Button)view.findViewById(R.id.btn_pip);
-        btn_audio = (Button)view.findViewById(R.id.btn_audio);
-        btn_water = (Button)view.findViewById(R.id.btn_water);
-        btn_mix = (Button)view.findViewById(R.id.btn_mix);
-        btn_other = (Button)view.findViewById(R.id.btn_other);
-
-
-        group_encode = (RadioGroup)findViewById(R.id.group_encode);
-        group_orientation = (RadioGroup)findViewById(R.id.group_orientation);
-        radio_encode_hw = (RadioButton)findViewById(R.id.radio_encode_hw);
-        radio_encode_sw = (RadioButton)findViewById(R.id.radio_encode_sw);
-        radio_orientationbutton1 = (RadioButton)findViewById(R.id.radio_orientationbutton1);
-        radio_orientationbutton2 = (RadioButton)findViewById(R.id.radio_orientationbutton2);
-
-
-        settings = getSharedPreferences("SETTINGS", Context.MODE_PRIVATE);
-        editor = settings.edit();
-
-        resolution = settings.getString("resolution","信息为空");
-        rtmpurl = settings.getString("rtmpurl","信息为空");
-        frameRatePicker = settings.getString("frameRatePicker","信息为空");
-        videoBitratePicker = settings.getString("videoBitratePicker","信息为空");
-        audioBitratePicker = settings.getString("audioBitratePicker","信息为空");
-        encode = settings.getString("encode","信息为空");
-        orientation = settings.getString("orientation","信息为空");
-        audiorateinhz = settings.getString("audiorateinhz","信息为空");
-
-
-        btn_audioBitrate.setOnClickListener(this);
-        btn_videoBitrate.setOnClickListener(this);
-        btn_start.setOnClickListener(this);
-        btn_beauty.setOnClickListener(this);
-        btn_pip.setOnClickListener(this);
-        btn_audio.setOnClickListener(this);
-        btn_mix.setOnClickListener(this);
-        btn_water.setOnClickListener(this);
-        btn_other.setOnClickListener(this);
-
-        group_encode.setOnCheckedChangeListener(this);
-        group_orientation.setOnCheckedChangeListener(this);
-
-        ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,R.layout.support_simple_spinner_dropdown_item,strs);
-        spinner_resolution.setAdapter(adapter);
-        spinner_resolution.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
-                resolution = strs[i];
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> adapterView) {
-
-            }
-        });
-        ArrayAdapter<String> adapter2 = new ArrayAdapter<String>(this,R.layout.support_simple_spinner_dropdown_item,strs2);
-        spinner_audiorateinhz.setAdapter(adapter2);
-        spinner_audiorateinhz.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
-                audiorateinhz = strs2[i];
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> adapterView) {
-
-            }
-        });
-
-        initSetting(resolution,rtmpurl,frameRatePicker,videoBitratePicker,audioBitratePicker,encode,orientation,audiorateinhz);
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        rtmpurl = edit_rtmpurl.getText().toString();
-        frameRatePicker = edit_frameRatePicker.getText().toString();
-        videoBitratePicker = edit_videoBitratePicker.getText().toString();
-        audioBitratePicker = edit_audioBitratePicker.getText().toString();
-
-        editor.putString("rtmpurl",rtmpurl);
-        editor.putString("resolution",resolution);
-        editor.putString("frameRatePicker",frameRatePicker);
-        editor.putString("videoBitratePicker",videoBitratePicker);
-        editor.putString("audioBitratePicker",audioBitratePicker);
-        editor.putString("encode",encode);
-        editor.putString("orientation",orientation);
-        editor.putString("audiorateinhz",audiorateinhz);
-        editor.commit();
-    }
-
-    private void initSetting(String resolution, String rtmpurl, String frameRatePicker, String videoBitratePicker,
-                             String audioBitratePicker, String encode, String orientation, String audiorateinhz) {
-        if (resolution.equals(Settings.RESOLUTION360)){
-            spinner_resolution.setSelection(0);
-        }else if(resolution.equals(Settings.RESOLUTION480)){
-            spinner_resolution.setSelection(1);
-        }else if(resolution.equals(Settings.RESOLUTION540)){
-            spinner_resolution.setSelection(2);
-        }else if(resolution.equals(Settings.RESOLUTION720)){
-            spinner_resolution.setSelection(3);
-        }else{
-            spinner_resolution.setSelection(3);
-            this.resolution = Settings.RESOLUTION720;
-        }
-
-        if (audiorateinhz.equals(Settings.AUDIORATEINHZ44100)){
-            spinner_audiorateinhz.setSelection(0);
-        }else if(audiorateinhz.equals(Settings.AUDIORATEINHZ32000)){
-            spinner_audiorateinhz.setSelection(1);
-        }else if(audiorateinhz.equals(Settings.AUDIORATEINHZ22050)){
-            spinner_audiorateinhz.setSelection(2);
-        }else{
-            spinner_audiorateinhz.setSelection(0);
-            this.audiorateinhz = Settings.AUDIORATEINHZ44100;
-        }
-
-        if(!rtmpurl.equals("信息为空")){
-            edit_rtmpurl.setText(rtmpurl);
-        }
-        if(!frameRatePicker.equals("信息为空")){
-            edit_frameRatePicker.setText(frameRatePicker);
-        }
-        if(!videoBitratePicker.equals("信息为空")){
-            edit_videoBitratePicker.setText(videoBitratePicker);
-        }
-        if(!audioBitratePicker.equals("信息为空")){
-            edit_audioBitratePicker.setText(audioBitratePicker);
-        }
-
-        if(encode.equals(Settings.ENCODE_HW)){
-            group_encode.check(radio_encode_hw.getId());
-        }else if(encode.equals(Settings.ENCODE_SW)){
-            group_encode.check(radio_encode_sw.getId());
-        }else{
-            group_encode.check(radio_encode_hw.getId());
-            this.encode = Settings.ENCODE_HW;
-            editor.putString("encode",encode);
-        }
-
-        if(orientation.equals(Settings.ORIENTATION1)){
-            group_orientation.check(radio_orientationbutton1.getId());
-        }else if(encode.equals(Settings.ORIENTATION2)){
-            group_orientation.check(radio_orientationbutton2.getId());
-        }else{
-            group_orientation.check(radio_orientationbutton2.getId());
-            this.orientation = Settings.ORIENTATION2;
-            editor.putString("orientation",orientation);
-        }
-    }
-    @Override
-    public void onClick(View view) {
-
-        int frameRate = 0;
-        int videoBitRate = 0;
-        int audioBitRate = 0;
-        int videoResolution = 0;
-        int audiohz = 0;
-        boolean encodeWithHEVC = false;
-        boolean landscape = false;
-        boolean startAuto = false;
-        boolean isFrontCameraMirror = false;
-        KSYStreamerConfig.ENCODE_METHOD encode_method = KSYStreamerConfig.ENCODE_METHOD.SOFTWARE;
-        if (!TextUtils.isEmpty(edit_rtmpurl.getText())
-                && edit_rtmpurl.getText().toString().startsWith("rtmp")) {
-            if (!TextUtils.isEmpty(edit_frameRatePicker.getText().toString())) {
-                frameRate = Integer.parseInt(edit_frameRatePicker.getText().toString());
-            }
-
-            if (!TextUtils.isEmpty(edit_videoBitratePicker.getText().toString())) {
-                videoBitRate = Integer.parseInt(edit_videoBitratePicker.getText().toString());
-            }
-
-            if (!TextUtils.isEmpty(edit_audioBitratePicker.getText().toString())) {
-                audioBitRate = Integer.parseInt(edit_audioBitratePicker.getText().toString());
-            }
-
-            if (resolution.equals(Settings.RESOLUTION360)) {
-                videoResolution = RecorderConstants.VIDEO_RESOLUTION_360P;
-            } else if (resolution.equals(Settings.RESOLUTION480)) {
-                videoResolution = RecorderConstants.VIDEO_RESOLUTION_480P;
-            } else if (resolution.equals(Settings.RESOLUTION540)) {
-                videoResolution = RecorderConstants.VIDEO_RESOLUTION_540P;
-            } else {
-                videoResolution = RecorderConstants.VIDEO_RESOLUTION_720P;
-            }
-            encodeWithHEVC = false;
-            if (encode.equals(Settings.ENCODE_HW)) {
-                encode_method = KSYStreamerConfig.ENCODE_METHOD.HARDWARE;
-            } else {
-                encode_method = KSYStreamerConfig.ENCODE_METHOD.SOFTWARE;
-            }
-
-            if (orientation.equals(Settings.ORIENTATION1)) {
-                landscape = true;
-            } else {
-                landscape = false;
-            }
-            audiohz = Integer.parseInt(audiorateinhz);
-
-        }
-
-
-        switch (view.getId()){
-            case R.id.btn_videoBitrate:
-                if(resolution.equals(Settings.RESOLUTION360)){
-                    edit_videoBitratePicker.setText("400");
-                }else if(resolution.equals(Settings.RESOLUTION480)){
-                    edit_videoBitratePicker.setText("600");
-                }else if(resolution.equals(Settings.RESOLUTION540)){
-                    edit_videoBitratePicker.setText("700");
-                }else if(resolution.equals(Settings.RESOLUTION720)){
-                    edit_videoBitratePicker.setText("1000");
-                }
-                break;
-            case R.id.btn_audioBitrate:
-                if(encode.equals(Settings.ENCODE_HW)){
-                    edit_audioBitratePicker.setText("48");
-                }else if(encode.equals(Settings.ENCODE_SW)){
-                    if (audiorateinhz.equals(Settings.AUDIORATEINHZ44100)){
-                        edit_audioBitratePicker.setText("32");
-                    }else if(audiorateinhz.equals(Settings.AUDIORATEINHZ32000)){
-                        edit_audioBitratePicker.setText("24");
-                    }else if(audiorateinhz.equals(Settings.AUDIORATEINHZ22050)){
-                        edit_audioBitratePicker.setText("16");
-                    }
-                }
-                break;
-            case R.id.btn_start:
-                rtmpurl = edit_rtmpurl.getText().toString();
-                frameRatePicker = edit_frameRatePicker.getText().toString();
-                videoBitratePicker = edit_videoBitratePicker.getText().toString();
-                audioBitratePicker = edit_audioBitratePicker.getText().toString();
-                editor.putString("rtmpurl",rtmpurl);
-                editor.putString("resolution",resolution);
-                editor.putString("frameRatePicker",frameRatePicker);
-                editor.putString("videoBitratePicker",videoBitratePicker);
-                editor.putString("audioBitratePicker",audioBitratePicker);
-                editor.putString("encode",encode);
-                editor.putString("orientation",orientation);
-                editor.putString("audiorateinhz",audiorateinhz);
-                editor.commit();
-                Log.v("MainSettings",rtmpurl);
-                Log.v("MainSettings",resolution);
-                Log.v("MainSettings",frameRatePicker);
-                Log.v("MainSettings",videoBitratePicker);
-                Log.v("MainSettings",encode);
-                Log.v("MainSettings",audioBitratePicker);
-                Log.v("MainSettings",orientation);
-                Log.v("MainSettings",audiorateinhz);
-
-                if(pop.isShowing()){
-                    pop.dismiss();
-                }else{
-                    view.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
-                    int popupWidth = view.getMeasuredWidth();
-                    view.getLocationOnScreen(location);
-                    pop.showAtLocation(view, Gravity.NO_GRAVITY,(location[0] + view.getWidth() / 2) - popupWidth / 2, location[1] - 600);
-                }
-                btn_start.setText("直播");
-                break;
-            case R.id.btn_beauty:
-                CameraActivityBeauty.startActivity(getApplicationContext(), 0, edit_rtmpurl.getText().toString(),
-                        frameRate, videoBitRate, audioBitRate, videoResolution, landscape, encode_method, startAuto, true, true,audiohz);
-                break;
-            case R.id.btn_pip:
-                CameraActivityPip.startActivity(getApplicationContext(), 0, edit_rtmpurl.getText().toString(),
-                        frameRate, videoBitRate, audioBitRate, videoResolution, landscape, encode_method, startAuto, true, true,audiohz);
-                break;
-            case R.id.btn_audio:
-                CameraActivityAudioEffect.startActivity(getApplicationContext(), 0, edit_rtmpurl.getText().toString(),
-                        frameRate, videoBitRate, audioBitRate, videoResolution, landscape, encode_method, startAuto, true, true,audiohz);
-                break;
-            case R.id.btn_water:
-                CameraActivityWaterLogo.startActivity(getApplicationContext(), 0, rtmpurl,
-                        frameRate, videoBitRate, audioBitRate, videoResolution, landscape, encode_method, startAuto,true, true,audiohz);
-                break;
-            case R.id.btn_mix:
-                CameraActivityAudioMix.startActivity(getApplicationContext(), 0, edit_rtmpurl.getText().toString(),
-                        frameRate, videoBitRate, audioBitRate, videoResolution, landscape, encode_method, startAuto, true, true,audiohz);
-
-                break;
-            case R.id.btn_other:
-                CameraActivityOther.startActivity(getApplicationContext(), 0, edit_rtmpurl.getText().toString(),
-                        frameRate, videoBitRate, audioBitRate, videoResolution, landscape, encode_method, startAuto,true, true,audiohz);
-                break;
-            default:
-                break;
-        }
-    }
-
-    @Override
-    public void onCheckedChanged(RadioGroup radioGroup, int i) {
-        switch(i){
-            case R.id.radio_encode_hw:
-                encode = Settings.ENCODE_HW;
-                spinner_audiorateinhz.setSelection(0);
-                spinner_audiorateinhz.setEnabled(false);
-                break;
-            case R.id.radio_encode_sw:
-                spinner_audiorateinhz.setEnabled(true);
-                encode = Settings.ENCODE_SW;
-                break;
-            case R.id.radio_orientationbutton1:
-                orientation = Settings.ORIENTATION1;
-                break;
-            case R.id.radio_orientationbutton2:
-                orientation = Settings.ORIENTATION2;
-                break;
-            default:
-                break;
-        }
-    }
-}
diff --git a/LiveDemo/app/src/main/java/com/ksyun/live/demo/activity/SpinnerHelper.java b/LiveDemo/app/src/main/java/com/ksyun/live/demo/activity/SpinnerHelper.java
deleted file mode 100755
index d1a8988..0000000
--- a/LiveDemo/app/src/main/java/com/ksyun/live/demo/activity/SpinnerHelper.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.ksyun.live.demo.activity;
-
-import android.app.Activity;
-import android.util.SparseArray;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.Spinner;
-
-import com.ksyun.live.demo.R;
-
-
-/**
- * Created by hzqiujiadi on 16/6/24.
- * hzqiujiadi ashqalcn@gmail.com
- */
-public class SpinnerHelper {
-
-    private Activity activity;
-    private SparseArray<String> data;
-    private ClickHandler clickHandler;
-    private int defaultKey;
-
-    public interface ClickHandler{
-        void onSpinnerClicked(int index, int key, String value);
-    }
-
-    public SpinnerHelper(Activity activity) {
-        this.activity = activity;
-    }
-
-    public SpinnerHelper setDefault(int key){
-        defaultKey = key;
-        return this;
-    }
-
-    public SpinnerHelper setData(SparseArray<String> data){
-        this.data = data;
-        return this;
-    }
-
-    public SpinnerHelper setClickHandler(ClickHandler clickHandler){
-        this.clickHandler = clickHandler;
-        return this;
-    }
-
-    public void init(int id){
-        if (data == null){
-            return;
-        }
-
-        Spinner spinner = (Spinner) activity.findViewById(id);
-        ArrayAdapter<String> adapter = new ArrayAdapter<>(activity, R.layout.simple_spinner_item);
-        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        for (int i = 0; i < data.size(); i++){
-            String value = data.valueAt(i);
-            adapter.add(value);
-        }
-
-        spinner.setAdapter(adapter);
-        int index = data.indexOfKey(defaultKey);
-        index = index == -1 ? 0 : index;
-        spinner.setSelection(index);
-        spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-                int key = data.keyAt(position);
-                String value = data.valueAt(position);
-                if (clickHandler != null){
-                    clickHandler.onSpinnerClicked(position,key,value);
-                }
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> parent) {
-
-            }
-        });
-    }
-
-    public static SpinnerHelper with(Activity activity){
-        return new SpinnerHelper(activity);
-    }
-}
diff --git a/LiveDemo/app/src/main/res/layout/camera_activity_audio_effect.xml b/LiveDemo/app/src/main/res/layout/camera_activity_audio_effect.xml
deleted file mode 100644
index 3f52436..0000000
--- a/LiveDemo/app/src/main/res/layout/camera_activity_audio_effect.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/root"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/recorder_bg_new" >
-
-    <com.ksy.recordlib.service.view.CameraGLSurfaceView
-        android:id="@+id/camera_preview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentTop="true" />
-
-    <include
-        android:id="@+id/actionbar"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/global_actionbar_height"
-        android:layout_gravity="top"
-        layout="@layout/camera_titlebar" />
-
-    <EditText
-        android:id="@+id/url"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/actionbar"
-        android:gravity="center"
-        android:textColor="@color/font_color_35"
-        android:textSize="@dimen/font_size_38px" />
-
-    <TextView
-        android:id="@+id/debuginfo"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/url"
-        android:gravity="left"
-        android:textColor="@color/font_color_41"
-        android:textSize="@dimen/font_size_22px" />
-
-    <include
-        android:id="@+id/bar_bottom"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        layout="@layout/camera_bottombar_audio_effect" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/LiveDemo/app/src/main/res/layout/camera_activity_audio_mix.xml b/LiveDemo/app/src/main/res/layout/camera_activity_audio_mix.xml
deleted file mode 100644
index c467c1b..0000000
--- a/LiveDemo/app/src/main/res/layout/camera_activity_audio_mix.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/root"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/recorder_bg_new" >
-
-    <com.ksy.recordlib.service.view.CameraGLSurfaceView
-        android:id="@+id/camera_preview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentTop="true" />
-
-    <include
-        android:id="@+id/actionbar"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/global_actionbar_height"
-        android:layout_gravity="top"
-        layout="@layout/camera_titlebar" />
-
-    <EditText
-        android:id="@+id/url"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/actionbar"
-        android:gravity="center"
-        android:textColor="@color/font_color_35"
-        android:textSize="@dimen/font_size_38px" />
-
-    <TextView
-        android:id="@+id/debuginfo"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/url"
-        android:gravity="left"
-        android:textColor="@color/font_color_41"
-        android:textSize="@dimen/font_size_22px" />
-
-    <include
-        android:id="@+id/bar_bottom"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        layout="@layout/camera_bottombar_audio_mix" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/LiveDemo/app/src/main/res/layout/camera_activity_beauty.xml b/LiveDemo/app/src/main/res/layout/camera_activity_beauty.xml
deleted file mode 100644
index 3faf7ba..0000000
--- a/LiveDemo/app/src/main/res/layout/camera_activity_beauty.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/root"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/recorder_bg_new" >
-
-    <com.ksy.recordlib.service.view.CameraGLSurfaceView
-        android:id="@+id/camera_preview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentTop="true" />
-
-    <include
-        android:id="@+id/actionbar"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/global_actionbar_height"
-        android:layout_gravity="top"
-        layout="@layout/camera_titlebar" />
-
-    <EditText
-        android:id="@+id/url"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/actionbar"
-        android:gravity="center"
-        android:textColor="@color/font_color_35"
-        android:textSize="@dimen/font_size_38px" />
-
-    <TextView
-        android:id="@+id/debuginfo"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/url"
-        android:gravity="left"
-        android:textColor="@color/font_color_41"
-        android:textSize="@dimen/font_size_22px" />
-
-    <include
-        android:id="@+id/bar_bottom"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        layout="@layout/camera_bottombar_beauty" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/LiveDemo/app/src/main/res/layout/camera_activity_other.xml b/LiveDemo/app/src/main/res/layout/camera_activity_other.xml
deleted file mode 100644
index 34a9bdb..0000000
--- a/LiveDemo/app/src/main/res/layout/camera_activity_other.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/root"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/recorder_bg_new" >
-
-    <com.ksy.recordlib.service.view.CameraGLSurfaceView
-        android:id="@+id/camera_preview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentTop="true" />
-
-    <include
-        android:id="@+id/actionbar"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/global_actionbar_height"
-        android:layout_gravity="top"
-        layout="@layout/camera_titlebar" />
-
-    <EditText
-        android:id="@+id/url"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/actionbar"
-        android:gravity="center"
-        android:textColor="@color/font_color_35"
-        android:textSize="@dimen/font_size_38px" />
-
-    <TextView
-        android:id="@+id/debuginfo"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/url"
-        android:gravity="left"
-        android:textColor="@color/font_color_41"
-        android:textSize="@dimen/font_size_22px" />
-
-    <include
-        android:id="@+id/bar_bottom"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        layout="@layout/camera_bottombar_other" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/LiveDemo/app/src/main/res/layout/camera_activity_pip.xml b/LiveDemo/app/src/main/res/layout/camera_activity_pip.xml
deleted file mode 100644
index 84fec66..0000000
--- a/LiveDemo/app/src/main/res/layout/camera_activity_pip.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/root"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/recorder_bg_new" >
-
-    <com.ksy.recordlib.service.view.CameraGLSurfaceView
-        android:id="@+id/camera_preview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentTop="true" />
-
-    <include
-        android:id="@+id/actionbar"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/global_actionbar_height"
-        android:layout_gravity="top"
-        layout="@layout/camera_titlebar" />
-
-    <EditText
-        android:id="@+id/url"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/actionbar"
-        android:gravity="center"
-        android:textColor="@color/font_color_35"
-        android:textSize="@dimen/font_size_38px" />
-
-    <TextView
-        android:id="@+id/debuginfo"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/url"
-        android:gravity="left"
-        android:textColor="@color/font_color_41"
-        android:textSize="@dimen/font_size_22px" />
-
-    <include
-        android:id="@+id/bar_bottom"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        layout="@layout/camera_bottombar_pip" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/LiveDemo/app/src/main/res/layout/camera_activity_waterlogo.xml b/LiveDemo/app/src/main/res/layout/camera_activity_waterlogo.xml
deleted file mode 100644
index 432a6cb..0000000
--- a/LiveDemo/app/src/main/res/layout/camera_activity_waterlogo.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/root"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/recorder_bg_new" >
-
-    <com.ksy.recordlib.service.view.CameraGLSurfaceView
-        android:id="@+id/camera_preview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentTop="true" />
-
-    <include
-        android:id="@+id/actionbar"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/global_actionbar_height"
-        android:layout_gravity="top"
-        layout="@layout/camera_titlebar" />
-
-    <EditText
-        android:id="@+id/url"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/actionbar"
-        android:gravity="center"
-        android:textColor="@color/font_color_35"
-        android:textSize="@dimen/font_size_38px" />
-
-    <TextView
-        android:id="@+id/debuginfo"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/url"
-        android:gravity="left"
-        android:textColor="@color/font_color_41"
-        android:textSize="@dimen/font_size_22px" />
-
-    <include
-        android:id="@+id/bar_bottom"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        layout="@layout/camera_bottombar_waterlogo" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/LiveDemo/app/src/main/res/layout/camera_bottombar_audio_effect.xml b/LiveDemo/app/src/main/res/layout/camera_bottombar_audio_effect.xml
deleted file mode 100644
index 4cd71d5..0000000
--- a/LiveDemo/app/src/main/res/layout/camera_bottombar_audio_effect.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="#00000000">
-
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:orientation="vertical"
-        android:background="#00000000"
-        android:paddingLeft="5dp">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="10dp"
-            android:orientation="horizontal">
-
-            <CheckBox
-                android:id="@+id/reverb"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginLeft="10dp"
-                android:layout_weight="1"
-                android:background="#11123456"
-                android:checked="false"
-                android:text="混响"
-                android:textColor="@color/font_color_35"
-                android:textSize="@dimen/font_size_28px">
-            </CheckBox>
-
-            <CheckBox
-                android:id="@+id/pitch"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginLeft="10dp"
-                android:layout_weight="1"
-                android:background="#11123456"
-                android:checked="false"
-                android:text="升降调"
-                android:textColor="@color/font_color_35"
-                android:textSize="@dimen/font_size_28px">
-            </CheckBox>
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="10dp"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/backoff"
-                android:layout_width="50dp"
-                android:layout_height="50dp"
-                android:layout_gravity="center_vertical"
-                android:layout_marginRight="10dp"
-                android:background="@drawable/recorder_delete_icon" />
-
-            <TextView
-                android:id="@+id/click_to_shoot"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_weight="1"
-                android:background="#11123456"
-                android:text="@string/click_to_shoot"
-                android:textColor="@color/font_color_35"
-                android:textSize="@dimen/font_size_28px">
-            </TextView>
-        </LinearLayout>
-    </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/LiveDemo/app/src/main/res/layout/camera_bottombar_audio_mix.xml b/LiveDemo/app/src/main/res/layout/camera_bottombar_audio_mix.xml
deleted file mode 100644
index 87591c8..0000000
--- a/LiveDemo/app/src/main/res/layout/camera_bottombar_audio_mix.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="#00000000">
-
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:orientation="vertical"
-        android:background="#00000000"
-        android:paddingLeft="5dp">
-
-
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="10dp"
-            android:orientation="horizontal">
-
-
-            <CheckBox
-                android:id="@+id/mute"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginLeft="10dp"
-                android:layout_weight="1"
-                android:background="#11123456"
-                android:checked="false"
-                android:text="@string/mute"
-                android:textColor="@color/font_color_35"
-                android:textSize="@dimen/font_size_28px">
-            </CheckBox>
-
-            <CheckBox
-                android:id="@+id/bgm"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginLeft="10dp"
-                android:layout_weight="1"
-                android:background="#11123456"
-                android:checked="false"
-                android:text="混音"
-                android:textColor="@color/font_color_35"
-                android:textSize="@dimen/font_size_28px">
-            </CheckBox>
-
-            <CheckBox
-                android:id="@+id/ear_mirror"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginLeft="10dp"
-                android:layout_weight="1"
-                android:background="#11123456"
-                android:checked="false"
-                android:text="@string/ear_mirror"
-                android:textColor="@color/font_color_35"
-                android:textSize="@dimen/font_size_28px">
-            </CheckBox>
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/layout_seek"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="背景音量调节:"
-                android:layout_gravity="center_vertical"/>
-            <SeekBar
-                android:id="@+id/seek_mix"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-        </LinearLayout>
-
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="10dp"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/backoff"
-                android:layout_width="50dp"
-                android:layout_height="50dp"
-                android:layout_gravity="center_vertical"
-                android:layout_marginRight="10dp"
-                android:background="@drawable/recorder_delete_icon" />
-
-            <TextView
-                android:id="@+id/click_to_shoot"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_weight="1"
-                android:background="#11123456"
-                android:text="@string/click_to_shoot"
-                android:textColor="@color/font_color_35"
-                android:textSize="@dimen/font_size_28px">
-            </TextView>
-        </LinearLayout>
-    </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/LiveDemo/app/src/main/res/layout/camera_bottombar_beauty.xml b/LiveDemo/app/src/main/res/layout/camera_bottombar_beauty.xml
deleted file mode 100644
index 01fa2f3..0000000
--- a/LiveDemo/app/src/main/res/layout/camera_bottombar_beauty.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="#00000000">
-
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:orientation="vertical"
-        android:background="#00000000"
-        android:paddingLeft="5dp">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="10dp"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/backoff"
-                android:layout_width="50dp"
-                android:layout_height="50dp"
-                android:layout_gravity="center_vertical"
-                android:layout_marginRight="10dp"
-                android:background="@drawable/recorder_delete_icon" />
-
-            <TextView
-                android:id="@+id/click_to_shoot"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_weight="1"
-                android:background="#11123456"
-                android:text="@string/click_to_shoot"
-                android:textColor="@color/font_color_35"
-                android:textSize="@dimen/font_size_28px">
-            </TextView>
-
-            <CheckBox
-                android:id="@+id/click_to_switch_beauty"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginLeft="10dp"
-                android:layout_weight="1"
-                android:background="#11123456"
-                android:checked="true"
-                android:text="@string/beauty_switcher"
-                android:textColor="@color/font_color_35"
-                android:textSize="@dimen/font_size_28px">
-            </CheckBox>
-        </LinearLayout>
-    </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/LiveDemo/app/src/main/res/layout/camera_bottombar_other.xml b/LiveDemo/app/src/main/res/layout/camera_bottombar_other.xml
deleted file mode 100644
index 0e08af0..0000000
--- a/LiveDemo/app/src/main/res/layout/camera_bottombar_other.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="#00000000">
-
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:orientation="vertical"
-        android:background="#00000000"
-        android:paddingLeft="5dp">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="10dp"
-            android:orientation="horizontal">
-
-            <CheckBox
-                android:id="@+id/front_camera_mirror"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginLeft="10dp"
-                android:layout_weight="1"
-                android:background="#11123456"
-                android:checked="false"
-                android:text="前置镜像"
-                android:textColor="@color/font_color_35"
-                android:textSize="@dimen/font_size_28px">
-            </CheckBox>
-
-            <CheckBox
-                android:id="@+id/camer_preview_frame"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginLeft="10dp"
-                android:layout_weight="1"
-                android:background="#11123456"
-                android:checked="false"
-                android:text="软编预览处理数据"
-                android:textColor="@color/font_color_35"
-                android:textSize="@dimen/font_size_28px">
-            </CheckBox>
-        </LinearLayout>
-
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="10dp"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/backoff"
-                android:layout_width="50dp"
-                android:layout_height="50dp"
-                android:layout_gravity="center_vertical"
-                android:layout_marginRight="10dp"
-                android:background="@drawable/recorder_delete_icon" />
-
-            <TextView
-                android:id="@+id/click_to_shoot"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_weight="1"
-                android:background="#11123456"
-                android:text="@string/click_to_shoot"
-                android:textColor="@color/font_color_35"
-                android:textSize="@dimen/font_size_28px">
-            </TextView>
-        </LinearLayout>
-    </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/LiveDemo/app/src/main/res/layout/camera_bottombar_pip.xml b/LiveDemo/app/src/main/res/layout/camera_bottombar_pip.xml
deleted file mode 100644
index 0d44ec1..0000000
--- a/LiveDemo/app/src/main/res/layout/camera_bottombar_pip.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="#00000000">
-
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:orientation="vertical"
-        android:background="#00000000"
-        android:paddingLeft="5dp">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="10dp"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/backoff"
-                android:layout_width="50dp"
-                android:layout_height="50dp"
-                android:layout_gravity="center_vertical"
-                android:layout_marginRight="10dp"
-                android:background="@drawable/recorder_delete_icon" />
-
-            <TextView
-                android:id="@+id/click_to_shoot"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_weight="1"
-                android:background="#11123456"
-                android:text="@string/click_to_shoot"
-                android:textColor="@color/font_color_35"
-                android:textSize="@dimen/font_size_28px">
-            </TextView>
-
-            <TextView
-                android:id="@+id/picture_pip"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginLeft="10dp"
-                android:layout_weight="1"
-                android:background="#11123456"
-                android:text="@string/picture_pip"
-                android:textColor="@color/font_color_35"
-                android:textSize="@dimen/font_size_28px">
-            </TextView>
-
-            <TextView
-                android:id="@+id/pip"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginLeft="10dp"
-                android:layout_weight="1"
-                android:background="#11123456"
-                android:text="@string/pip"
-                android:textColor="@color/font_color_35"
-                android:textSize="@dimen/font_size_28px">
-            </TextView>
-
-            <CheckBox
-                android:id="@+id/click_to_switch_beauty"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginLeft="10dp"
-                android:layout_weight="1"
-                android:background="#11123456"
-                android:checked="true"
-                android:text="@string/beauty_switcher"
-                android:textColor="@color/font_color_35"
-                android:textSize="@dimen/font_size_28px">
-            </CheckBox>
-        </LinearLayout>
-    </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/LiveDemo/app/src/main/res/layout/camera_bottombar_waterlogo.xml b/LiveDemo/app/src/main/res/layout/camera_bottombar_waterlogo.xml
deleted file mode 100644
index ddd0729..0000000
--- a/LiveDemo/app/src/main/res/layout/camera_bottombar_waterlogo.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="#00000000">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:orientation="vertical"
-        android:background="#00000000"
-        android:paddingLeft="5dp">
-
-        <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="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginLeft="10dp"
-                android:layout_weight="1"
-                android:background="#11123456"
-                android:checked="true"
-                android:text="@string/watermark"
-                android:textColor="@color/font_color_35"
-                android:textSize="@dimen/font_size_28px">
-            </CheckBox>
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="10dp"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/backoff"
-                android:layout_width="50dp"
-                android:layout_height="50dp"
-                android:layout_gravity="center_vertical"
-                android:layout_marginRight="10dp"
-                android:background="@drawable/recorder_delete_icon" />
-
-            <TextView
-                android:id="@+id/click_to_shoot"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_weight="1"
-                android:background="#11123456"
-                android:text="@string/click_to_shoot"
-                android:textColor="@color/font_color_35"
-                android:textSize="@dimen/font_size_28px">
-            </TextView>
-        </LinearLayout>
-    </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/LiveDemo/livelib/src/androidTest/java/com/ksy/livelib/demo/ApplicationTest.java b/LiveDemo/livelib/src/androidTest/java/com/ksy/livelib/demo/ApplicationTest.java
deleted file mode 100644
index cb79637..0000000
--- a/LiveDemo/livelib/src/androidTest/java/com/ksy/livelib/demo/ApplicationTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.ksy.livelib.demo;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}
\ No newline at end of file
diff --git a/LiveDemo/livelib/src/main/res/values/strings.xml b/LiveDemo/livelib/src/main/res/values/strings.xml
deleted file mode 100644
index 3b95e01..0000000
--- a/LiveDemo/livelib/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">livelib</string>
-</resources>
diff --git a/LiveDemo/livelib/src/test/java/com/ksy/livelib/demo/ExampleUnitTest.java b/LiveDemo/livelib/src/test/java/com/ksy/livelib/demo/ExampleUnitTest.java
deleted file mode 100644
index 5d7a3c2..0000000
--- a/LiveDemo/livelib/src/test/java/com/ksy/livelib/demo/ExampleUnitTest.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.ksy.livelib.demo;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * To work on unit tests, switch the Test Artifact in the Build Variants view.
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() throws Exception {
-        assertEquals(4, 2 + 2);
-    }
-}
\ No newline at end of file
diff --git a/LiveDemo/settings.gradle b/LiveDemo/settings.gradle
deleted file mode 100644
index aa3ad0f..0000000
--- a/LiveDemo/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-include ':app', ':livelib'
\ No newline at end of file
diff --git a/libs/arm64-v8a/libDenoise_export.so b/libs/arm64-v8a/libDenoise_export.so
deleted file mode 100755
index 2cc6758..0000000
Binary files a/libs/arm64-v8a/libDenoise_export.so and /dev/null differ
diff --git a/libs/arm64-v8a/libaudio_effect.so b/libs/arm64-v8a/libaudio_effect.so
deleted file mode 100755
index 36483f4..0000000
Binary files a/libs/arm64-v8a/libaudio_effect.so and /dev/null differ
diff --git a/libs/arm64-v8a/libksylive.so b/libs/arm64-v8a/libksylive.so
index 8fd961e..00f1f6f 100755
Binary files a/libs/arm64-v8a/libksylive.so and b/libs/arm64-v8a/libksylive.so differ
diff --git a/libs/arm64-v8a/libreverb.so b/libs/arm64-v8a/libreverb.so
deleted file mode 100755
index fdcb364..0000000
Binary files a/libs/arm64-v8a/libreverb.so and /dev/null differ
diff --git a/libs/armeabi-v7a/libDenoise_export.so b/libs/armeabi-v7a/libDenoise_export.so
deleted file mode 100755
index 11bf426..0000000
Binary files a/libs/armeabi-v7a/libDenoise_export.so and /dev/null differ
diff --git a/libs/armeabi-v7a/libaudio_effect.so b/libs/armeabi-v7a/libaudio_effect.so
deleted file mode 100755
index 3f2938c..0000000
Binary files a/libs/armeabi-v7a/libaudio_effect.so and /dev/null differ
diff --git a/libs/armeabi-v7a/libksylive.so b/libs/armeabi-v7a/libksylive.so
index 81ee47c..9b2a2cf 100755
Binary files a/libs/armeabi-v7a/libksylive.so and b/libs/armeabi-v7a/libksylive.so differ
diff --git a/libs/armeabi-v7a/libreverb.so b/libs/armeabi-v7a/libreverb.so
deleted file mode 100755
index 0cf4c4b..0000000
Binary files a/libs/armeabi-v7a/libreverb.so and /dev/null differ
diff --git a/libs/ksylive3.0.jar b/libs/ksylive3.0.jar
deleted file mode 100644
index 667decc..0000000
Binary files a/libs/ksylive3.0.jar and /dev/null differ
diff --git a/libs/ksylive4.0.jar b/libs/ksylive4.0.jar
new file mode 100644
index 0000000..036fb32
Binary files /dev/null and b/libs/ksylive4.0.jar differ
diff --git a/libs/libksyplayer.jar b/libs/libksyplayer.jar
index 35e3a7f..61183ce 100644
Binary files a/libs/libksyplayer.jar and b/libs/libksyplayer.jar differ
diff --git a/libs/x86/libDenoise_export.so b/libs/x86/libDenoise_export.so
deleted file mode 100755
index 4af8f3f..0000000
Binary files a/libs/x86/libDenoise_export.so and /dev/null differ
diff --git a/libs/x86/libaudio_effect.so b/libs/x86/libaudio_effect.so
deleted file mode 100755
index 397b1ba..0000000
Binary files a/libs/x86/libaudio_effect.so and /dev/null differ
diff --git a/libs/x86/libksylive.so b/libs/x86/libksylive.so
index e2e8b0e..9700f0d 100755
Binary files a/libs/x86/libksylive.so and b/libs/x86/libksylive.so differ
diff --git a/libs/x86/libreverb.so b/libs/x86/libreverb.so
deleted file mode 100755
index 20e95ab..0000000
Binary files a/libs/x86/libreverb.so and /dev/null differ