diff --git a/.gradle/3.3/taskArtifacts/fileHashes.bin b/.gradle/3.3/taskArtifacts/fileHashes.bin
index d911fa5..5d8313c 100644
Binary files a/.gradle/3.3/taskArtifacts/fileHashes.bin and b/.gradle/3.3/taskArtifacts/fileHashes.bin differ
diff --git a/.gradle/3.3/taskArtifacts/fileSnapshots.bin b/.gradle/3.3/taskArtifacts/fileSnapshots.bin
index fc48224..e2423d1 100644
Binary files a/.gradle/3.3/taskArtifacts/fileSnapshots.bin and b/.gradle/3.3/taskArtifacts/fileSnapshots.bin differ
diff --git a/.gradle/3.3/taskArtifacts/taskArtifacts.bin b/.gradle/3.3/taskArtifacts/taskArtifacts.bin
index 3d16c11..dddbbf3 100644
Binary files a/.gradle/3.3/taskArtifacts/taskArtifacts.bin and b/.gradle/3.3/taskArtifacts/taskArtifacts.bin differ
diff --git a/.gradle/3.3/taskArtifacts/taskArtifacts.lock b/.gradle/3.3/taskArtifacts/taskArtifacts.lock
index c9156c0..d0e5495 100644
Binary files a/.gradle/3.3/taskArtifacts/taskArtifacts.lock and b/.gradle/3.3/taskArtifacts/taskArtifacts.lock differ
diff --git a/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin b/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin
index 98f72eb..403d55d 100644
Binary files a/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin and b/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin differ
diff --git a/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
index 8dae71e..0a198dd 100644
Binary files a/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and b/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock differ
diff --git a/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin b/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin
index 0423367..c1c2b17 100644
Binary files a/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin and b/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin differ
diff --git a/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
index 20d36ac..9650bd3 100644
Binary files a/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and b/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock differ
diff --git a/.gradle/3.3/tasks/_libusbcamera_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin b/.gradle/3.3/tasks/_libusbcamera_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin
index a07a7a9..c294965 100644
Binary files a/.gradle/3.3/tasks/_libusbcamera_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin and b/.gradle/3.3/tasks/_libusbcamera_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin differ
diff --git a/.gradle/3.3/tasks/_libusbcamera_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/.gradle/3.3/tasks/_libusbcamera_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
index 9a9df5f..0e49511 100644
Binary files a/.gradle/3.3/tasks/_libusbcamera_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock and b/.gradle/3.3/tasks/_libusbcamera_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock differ
diff --git a/.gradle/3.3/tasks/_libusbcamera_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin b/.gradle/3.3/tasks/_libusbcamera_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin
index 66bf0f4..435081e 100644
Binary files a/.gradle/3.3/tasks/_libusbcamera_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin and b/.gradle/3.3/tasks/_libusbcamera_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin differ
diff --git a/.gradle/3.3/tasks/_libusbcamera_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/.gradle/3.3/tasks/_libusbcamera_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
index 1d4f344..33e1f5c 100644
Binary files a/.gradle/3.3/tasks/_libusbcamera_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock and b/.gradle/3.3/tasks/_libusbcamera_compileReleaseJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock differ
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 9ff4423..5e06449 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,7 @@
       <GradleProjectSettings>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-3.3" />
+        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-4.1" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/libraries/animated_vector_drawable_25_3_1.xml b/.idea/libraries/animated_vector_drawable_25_3_1.xml
deleted file mode 100644
index 8d7505d..0000000
--- a/.idea/libraries/animated_vector_drawable_25_3_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="animated-vector-drawable-25.3.1">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/17dbf24c311d327da7565d7b9b8c7205d2b3f2c6/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/17dbf24c311d327da7565d7b9b8c7205d2b3f2c6/output/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/animated-vector-drawable/25.3.1/animated-vector-drawable-25.3.1-sources.jar!/" />
-      <root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/animated-vector-drawable/25.3.1/animated-vector-drawable-25.3.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/butterknife_annotations_8_8_1.xml b/.idea/libraries/butterknife_annotations_8_8_1.xml
deleted file mode 100644
index e2d12da..0000000
--- a/.idea/libraries/butterknife_annotations_8_8_1.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="butterknife-annotations-8.8.1">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jakewharton/butterknife-annotations/8.8.1/bc373fb6bc7bca3035041b924f158fd2b946ee8d/butterknife-annotations-8.8.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jakewharton/butterknife-annotations/8.8.1/4f68b7085132dfeb48a0473bc589fdee8a3de757/butterknife-annotations-8.8.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/butterknife_compiler_8_8_1.xml b/.idea/libraries/butterknife_compiler_8_8_1.xml
deleted file mode 100644
index b63b0f2..0000000
--- a/.idea/libraries/butterknife_compiler_8_8_1.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="butterknife-compiler-8.8.1">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jakewharton/butterknife-compiler/8.8.1/b2f4505a1babb7b7c11abbbf8ea4c90b18c3aeac/butterknife-compiler-8.8.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.jakewharton/butterknife-compiler/8.8.1/97cf58a258bb347d7b8642f3f4996abd0f6adb6/butterknife-compiler-8.8.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/espresso_idling_resource_2_2_2.xml b/.idea/libraries/espresso_idling_resource_2_2_2.xml
deleted file mode 100644
index 1b2b924..0000000
--- a/.idea/libraries/espresso_idling_resource_2_2_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="espresso-idling-resource-2.2.2">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/5c86e8eab3d72b00394bf9e598645f884c7c63a5/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/5c86e8eab3d72b00394bf9e598645f884c7c63a5/output/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/test/espresso/espresso-idling-resource/2.2.2/espresso-idling-resource-2.2.2-sources.jar!/" />
-      <root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/test/espresso/espresso-idling-resource/2.2.2/espresso-idling-resource-2.2.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/exposed_instrumentation_api_publish_0_5.xml b/.idea/libraries/exposed_instrumentation_api_publish_0_5.xml
deleted file mode 100644
index e94c107..0000000
--- a/.idea/libraries/exposed_instrumentation_api_publish_0_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="exposed-instrumentation-api-publish-0.5">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.android/build-cache/a6ea49c91460d946e46649e01e209781e6cf4b4a/output/res" />
-      <root url="jar://$USER_HOME$/.android/build-cache/a6ea49c91460d946e46649e01e209781e6cf4b4a/output/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/test/exposed-instrumentation-api-publish/0.5/exposed-instrumentation-api-publish-0.5-sources.jar!/" />
-      <root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/test/exposed-instrumentation-api-publish/0.5/exposed-instrumentation-api-publish-0.5-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/support_annotations_25_3_1.xml b/.idea/libraries/support_annotations_25_3_1.xml
deleted file mode 100644
index 21d2ecc..0000000
--- a/.idea/libraries/support_annotations_25_3_1.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="support-annotations-25.3.1">
-    <CLASSES>
-      <root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/support-annotations/25.3.1/support-annotations-25.3.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/support-annotations/25.3.1/support-annotations-25.3.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/support_media_compat_25_3_1.xml b/.idea/libraries/support_media_compat_25_3_1.xml
deleted file mode 100644
index 527d3ea..0000000
--- a/.idea/libraries/support_media_compat_25_3_1.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<component name="libraryTable">
-  <library name="support-media-compat-25.3.1">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.android/build-cache/f1ca6919d3e9176e08e199c56de54351aac5f05a/output/annotations.zip!/" />
-      <root url="jar://$USER_HOME$/.android/build-cache/f1ca6919d3e9176e08e199c56de54351aac5f05a/output/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="file://$USER_HOME$/.android/build-cache/f1ca6919d3e9176e08e199c56de54351aac5f05a/output/res" />
-      <root url="jar://$USER_HOME$/.android/build-cache/f1ca6919d3e9176e08e199c56de54351aac5f05a/output/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/support-media-compat/25.3.1/support-media-compat-25.3.1-sources.jar!/" />
-      <root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/support-media-compat/25.3.1/support-media-compat-25.3.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/support_vector_drawable_25_3_1.xml b/.idea/libraries/support_vector_drawable_25_3_1.xml
deleted file mode 100644
index 404781e..0000000
--- a/.idea/libraries/support_vector_drawable_25_3_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="support-vector-drawable-25.3.1">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.android/build-cache/7a405513524c444d4aa139ab61911f927325318f/output/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.android/build-cache/7a405513524c444d4aa139ab61911f927325318f/output/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/support-vector-drawable/25.3.1/support-vector-drawable-25.3.1-sources.jar!/" />
-      <root url="jar://E:/Environment/android-sdk-windows/extras/android/m2repository/com/android/support/support-vector-drawable/25.3.1/support-vector-drawable-25.3.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7158618..cc72de3 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
@@ -27,17 +24,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/README.md b/README.md
index 1666d56..8f02fb4 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-OkCamera
+AndroidUSBCamera
 ============   
-AndroidUSBCamera is developed based on the [saki4510t/UVCCamera](https://github.com/saki4510t/UVCCamera), the project of USB Camera (UVC equipment) and the use of video data acquisition are highly packaged, and it can help developers using USB Camera devices easily by a few simple APIs. By using AndroidUSBCamera,you can detect and connect to a USB Camera simply.And you also can use it to realize taking picture,recording mp4,switching resolutions and setting  camera's contrast or brightness,etc.
+AndroidUSBCamera is developed based on the [saki4510t/UVCCamera](https://github.com/saki4510t/UVCCamera), the project of USB Camera (UVC equipment) and the use of video data acquisition are highly packaged, and it can help developers using USB Camera devices easily by a few simple APIs. By using AndroidUSBCamera,you can detect and connect to a USB Camera simply.And you also can use it to realize taking picture,recording mp4,switching resolutions ,getting h.264/aac/yuv(nv21) stream and setting  camera's contrast or brightness,supporting 480P、720P、1080P and higher,etc.
 
 [中文文档： AndroidUSBCamera，UVCCamera开发通用库](http://blog.csdn.net/andrexpert/article/details/78324181)  
 
@@ -20,9 +20,9 @@ allprojects {
 ```  
 Step 2. Add the dependency  
 ```java
-dependencies { 
-	    compile 'com.github.jiangdongguo:AndroidUSBCamera:2.0'
-}  
+dependencies {
+	        implementation 'com.github.jiangdongguo:AndroidUSBCamera:2.1.0'
+}
 ```
 ### 2. APIs Introduction  
 (1) In order to using it correctly,the following four steps must be achieved：  
@@ -30,6 +30,11 @@ dependencies {
 mUVCCameraView = (CameraViewInterface) mTextureView;
 mUVCCameraView.setCallback(mCallback);
 mCameraHelper = UVCCameraHelper.getInstance();
+// set default preview size
+ mCameraHelper.setDefaultPreviewSize(1280,720);
+// set default frame format，defalut is UVCCameraHelper.Frame_FORMAT_MPEG
+// if using mpeg can not record mp4,please try yuv(version 2.1.0 do not support)
+// mCameraHelper.setDefaultFrameFormat(UVCCameraHelper.FRAME_FORMAT_YUYV);	
 mCameraHelper.initUSBMonitor(this, mUVCCameraView, mDevConnectListener); 
 ```
    To be attention,mCallback is a object of interface CameraViewInterface.Callback,and it's used to be listenering surfaceView
@@ -92,6 +97,7 @@ private UVCCameraHelper.OnMyDevConnectListener listener = new UVCCameraHelper.On
         }
     };
 ```
+![Connecting gif](https://github.com/jiangdongguo/AndroidUSBCamera/blob/master/gifs/detecting.gif)  
 (2) Capturing JPG Images  
 ```java
  mCameraHelper.capturePicture(picPath, new AbstractUVCCameraHandler.OnCaptureListener() {
@@ -134,15 +140,24 @@ mCameraHelper.getModelValue(UVCCameraHelper.MODE_BRIGHTNESS);
 mCameraHelper.getModelValue(UVCCameraHelper.MODE_CONTRAST);
 ...
 ```
+![Connecting gif](https://github.com/jiangdongguo/AndroidUSBCamera/blob/master/gifs/brightness.gif)
 (5) switch resolutions and camera.  
 ```java
 mCameraHelper.updateResolution(widht, height);
 ```
+![Connecting gif](https://github.com/jiangdongguo/AndroidUSBCamera/blob/master/gifs/2.1.0.gif)  
 At last,remember adding permissions:  
 ```
 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 <uses-permission android:name="android.permission.RECORD_AUDIO" />
 ``` 
+Other Library about Android Camera
+-------
+[OkCamera](https://github.com/jiangdongguo/OkCamera) Android Camera univsersally operation.  
+[AndroidRecordMp4](https://github.com/jiangdongguo/AndroidRecordMp4) Using MediaCodec realize record mp4.  
+[AndroidYuvOsd](https://github.com/jiangdongguo/AndroidYuvOsd) YUV data operation.  
+[Lame4Mp3](https://github.com/jiangdongguo/Lame4Mp3) pcm to mp3 and pcm to aac.  
+
 License
 -------
 
diff --git a/app/src/main/java/com/jiangdg/usbcamera/view/USBCameraActivity.java b/app/src/main/java/com/jiangdg/usbcamera/view/USBCameraActivity.java
index 5f2bd32..16587da 100644
--- a/app/src/main/java/com/jiangdg/usbcamera/view/USBCameraActivity.java
+++ b/app/src/main/java/com/jiangdg/usbcamera/view/USBCameraActivity.java
@@ -139,8 +139,10 @@ public class USBCameraActivity extends AppCompatActivity implements CameraDialog
         mUVCCameraView = (CameraViewInterface) mTextureView;
         mUVCCameraView.setCallback(this);
         mCameraHelper = UVCCameraHelper.getInstance();
+        mCameraHelper.setDefaultFrameFormat(UVCCameraHelper.FRAME_FORMAT_YUYV);
         mCameraHelper.initUSBMonitor(this, mUVCCameraView, listener);
 
+
         mCameraHelper.setOnPreviewFrameListener(new AbstractUVCCameraHandler.OnPreViewResultListener() {
             @Override
             public void onPreviewResult(byte[] nv21Yuv) {
@@ -232,6 +234,7 @@ public class USBCameraActivity extends AppCompatActivity implements CameraDialog
                         Log.i(TAG,"save path：" + path);
                     }
                 });
+
                 break;
             case R.id.menu_recording:
                 if (mCameraHelper == null || !mCameraHelper.isCameraOpened()) {
@@ -240,7 +243,7 @@ public class USBCameraActivity extends AppCompatActivity implements CameraDialog
                 }
                 if (!mCameraHelper.isRecording()) {
                     String videoPath = UVCCameraHelper.ROOT_PATH + System.currentTimeMillis();
-//                    FileUtils.createfile(FileUtils.ROOT_PATH + "test666.h264");
+                    FileUtils.createfile(FileUtils.ROOT_PATH + "test666.h264");
                     RecordParams params = new RecordParams();
                     params.setRecordPath(videoPath);
                     params.setRecordDuration(0);                        // 设置为0，不分割保存
@@ -250,7 +253,7 @@ public class USBCameraActivity extends AppCompatActivity implements CameraDialog
                         public void onEncodeResult(byte[] data, int offset, int length, long timestamp, int type) {
                             // type = 1,h264 video stream
                             if (type == 1) {
-//                                FileUtils.putFileStream(data, offset, length);
+                                FileUtils.putFileStream(data, offset, length);
                             }
                             // type = 0,aac audio stream
                             if(type == 0) {
@@ -266,7 +269,7 @@ public class USBCameraActivity extends AppCompatActivity implements CameraDialog
                     showShortMsg("start record...");
                     mSwitchVoice.setEnabled(false);
                 } else {
-//                    FileUtils.releaseFile();
+                    FileUtils.releaseFile();
                     mCameraHelper.stopRecording();
                     showShortMsg("stop record...");
                     mSwitchVoice.setEnabled(true);
diff --git a/app/src/main/res/layout/activity_usbcamera.xml b/app/src/main/res/layout/activity_usbcamera.xml
index fc839fb..ada9f5b 100644
--- a/app/src/main/res/layout/activity_usbcamera.xml
+++ b/app/src/main/res/layout/activity_usbcamera.xml
@@ -17,38 +17,42 @@
         app:navigationIcon="@null"
         app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
 
-    <com.serenegiant.usb.widget.UVCCameraTextureView
-        android:id="@+id/camera_view"
-        android:layout_below="@id/toolbar"
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true" />
+        android:layout_below="@id/toolbar">
+
+        <com.serenegiant.usb.widget.UVCCameraTextureView
+            android:id="@+id/camera_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"/>
+    </FrameLayout>
 
     <LinearLayout
         android:id="@+id/llayout_contrast"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
+        android:layout_marginBottom="10dp"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
-        android:layout_marginBottom="10dp"
         android:orientation="horizontal">
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_weight="1"
             android:paddingBottom="7dp"
             android:paddingTop="7dp"
-            android:layout_weight="1"
-            android:textColor="@color/colorWhite"
-            android:text="对比度(contrast)" />
+            android:text="对比度(contrast)"
+            android:textColor="@color/colorWhite" />
 
         <SeekBar
             android:id="@+id/seekbar_contrast"
             android:layout_width="0dp"
-            android:layout_weight="2"
-            android:layout_height="match_parent" />
+            android:layout_height="match_parent"
+            android:layout_weight="2" />
     </LinearLayout>
 
     <LinearLayout
@@ -64,17 +68,17 @@
         <TextView
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_weight="1"
             android:paddingBottom="7dp"
             android:paddingTop="7dp"
-            android:layout_weight="1"
             android:text="亮度(brightness)"
             android:textColor="@color/colorWhite" />
 
         <SeekBar
             android:id="@+id/seekbar_brightness"
             android:layout_width="0dp"
-            android:layout_weight="2"
-            android:layout_height="match_parent" />
+            android:layout_height="match_parent"
+            android:layout_weight="2" />
     </LinearLayout>
 
     <Switch
@@ -88,7 +92,7 @@
         android:layout_marginStart="13dp"
         android:layout_marginTop="27dp"
         android:checked="true"
-        android:textColor="@color/colorWhite"
-        android:text="closeVoice" />
+        android:text="closeVoice"
+        android:textColor="@color/colorWhite" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index b8688bd..c967b8b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0'
+        // gradle插件版本
+        classpath 'com.android.tools.build:gradle:2.3.3'
     }
 }
 
diff --git a/build/generated/mockable-android-25.jar b/build/generated/mockable-android-25.jar
deleted file mode 100644
index fc39c90..0000000
Binary files a/build/generated/mockable-android-25.jar and /dev/null differ
diff --git a/gifs/2.1.0.gif b/gifs/2.1.0.gif
new file mode 100644
index 0000000..a7aaf74
Binary files /dev/null and b/gifs/2.1.0.gif differ
diff --git a/libusbcamera/src/main/java/com/jiangdg/usbcamera/UVCCameraHelper.java b/libusbcamera/src/main/java/com/jiangdg/usbcamera/UVCCameraHelper.java
index 7a08bd6..d03d6ab 100644
--- a/libusbcamera/src/main/java/com/jiangdg/usbcamera/UVCCameraHelper.java
+++ b/libusbcamera/src/main/java/com/jiangdg/usbcamera/UVCCameraHelper.java
@@ -32,10 +32,13 @@ public class UVCCameraHelper {
     private static final String TAG = "UVCCameraHelper";
     private int previewWidth = 640;
     private int previewHeight = 480;
-    public static int MODE_BRIGHTNESS = UVCCamera.PU_BRIGHTNESS;
-    public static int MODE_CONTRAST = UVCCamera.PU_CONTRAST;
-    //0-YUYV，1-MJPEG
-    private static final int PREVIEW_FORMAT = 0;
+    // 高分辨率YUV格式帧率较低
+    public static final int FRAME_FORMAT_YUYV = UVCCamera.FRAME_FORMAT_YUYV;
+    // 默认使用MJPEG
+    public static final int FRAME_FORMAT_MJPEG = UVCCamera.FRAME_FORMAT_MJPEG;
+    public static final int MODE_BRIGHTNESS = UVCCamera.PU_BRIGHTNESS;
+    public static final int MODE_CONTRAST = UVCCamera.PU_CONTRAST;
+    private int mFrameFormat = FRAME_FORMAT_MJPEG;
 
     private static UVCCameraHelper mCameraHelper;
     // USB Manager
@@ -44,8 +47,8 @@ public class UVCCameraHelper {
     private UVCCameraHandler mCameraHandler;
     private USBMonitor.UsbControlBlock mCtrlBlock;
 
-    private WeakReference<Activity> mActivityWrf;
-    private WeakReference<CameraViewInterface> mCamViewWrf;
+    private Activity mActivity;
+    private CameraViewInterface mCamView;
 
     private UVCCameraHelper() {
     }
@@ -74,8 +77,8 @@ public class UVCCameraHelper {
     }
 
     public void initUSBMonitor(Activity activity, CameraViewInterface cameraView, final OnMyDevConnectListener listener) {
-        this.mActivityWrf = new WeakReference<>(activity);
-        this.mCamViewWrf = new WeakReference<>(cameraView);
+        this.mActivity = activity;
+        this.mCamView = cameraView;
         mUSBMonitor = new USBMonitor(activity.getApplicationContext(), new USBMonitor.OnDeviceConnectListener() {
 
             // called by checking usb device
@@ -102,7 +105,19 @@ public class UVCCameraHelper {
             public void onConnect(final UsbDevice device, USBMonitor.UsbControlBlock ctrlBlock, boolean createNew) {
                 mCtrlBlock = ctrlBlock;
                 openCamera(ctrlBlock);
-                startPreview(mCamViewWrf.get());
+                new Thread(new Runnable() {
+                    @Override
+                    public void run() {
+                        // 休眠500ms，等待Camera创建完毕
+                        try {
+                            Thread.sleep(500);
+                        } catch (InterruptedException e) {
+                            e.printStackTrace();
+                        }
+                        // 开启预览
+                        startPreview(mCamView);
+                    }
+                }).start();
                 if(listener != null) {
                     listener.onConnectDev(device,true);
                 }
@@ -126,7 +141,7 @@ public class UVCCameraHelper {
     }
 
     public void createUVCCamera() {
-        if (mCamViewWrf.get() == null)
+        if (mCamView == null)
             throw new NullPointerException("CameraViewInterface cannot be null!");
 
         // release resources for initializing camera handler
@@ -135,9 +150,9 @@ public class UVCCameraHelper {
             mCameraHandler = null;
         }
         // initialize camera handler
-//        cameraView.setAspectRatio(previewWidth / (float)previewHeight);
-        mCameraHandler = UVCCameraHandler.createHandler(mActivityWrf.get(), mCamViewWrf.get(), 2,
-                previewWidth, previewHeight, PREVIEW_FORMAT);
+        mCamView.setAspectRatio(previewWidth / (float)previewHeight);
+        mCameraHandler = UVCCameraHandler.createHandler(mActivity, mCamView, 2,
+                previewWidth, previewHeight, mFrameFormat);
     }
 
     public void updateResolution(int width, int height) {
@@ -150,11 +165,23 @@ public class UVCCameraHelper {
             mCameraHandler.release();
             mCameraHandler = null;
         }
-//        cameraView.setAspectRatio(previewWidth / (float)previewHeight);
-        mCameraHandler = UVCCameraHandler.createHandler(mActivityWrf.get(), mCamViewWrf.get(), 2,
-                previewWidth, previewHeight, PREVIEW_FORMAT);
+        mCamView.setAspectRatio(previewWidth / (float)previewHeight);
+        mCameraHandler = UVCCameraHandler.createHandler(mActivity,mCamView, 2,
+                previewWidth, previewHeight, mFrameFormat);
         openCamera(mCtrlBlock);
-        startPreview(mCamViewWrf.get());
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                // 休眠500ms，等待Camera创建完毕
+                try {
+                    Thread.sleep(500);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+                // 开启预览
+                startPreview(mCamView);
+            }
+        }).start();
     }
 
     public void registerUSB() {
@@ -208,7 +235,7 @@ public class UVCCameraHelper {
 
     public List<UsbDevice> getUsbDeviceList() {
         List<DeviceFilter> deviceFilters = DeviceFilter
-                .getDeviceFilters(mActivityWrf.get().getApplicationContext(), R.xml.device_filter);
+                .getDeviceFilters(mActivity.getApplicationContext(), R.xml.device_filter);
         if (mUSBMonitor == null || deviceFilters == null)
             return null;
         return mUSBMonitor.getDeviceList(deviceFilters.get(0));
@@ -247,8 +274,6 @@ public class UVCCameraHelper {
     }
 
     public void release() {
-        mCamViewWrf.clear();
-        mActivityWrf.clear();
         if (mCameraHandler != null) {
             mCameraHandler.release();
             mCameraHandler = null;
@@ -299,4 +324,27 @@ public class UVCCameraHelper {
             return null;
         return mCameraHandler.getSupportedPreviewSizes();
     }
+
+    public void setDefaultPreviewSize(int defaultWidth,int defaultHeight) {
+        if(mUSBMonitor != null) {
+            throw new IllegalStateException("setDefaultPreviewSize should be call before initMonitor");
+        }
+        this.previewWidth = defaultWidth;
+        this.previewHeight = defaultHeight;
+    }
+
+    public void setDefaultFrameFormat(int format) {
+        if(mUSBMonitor != null) {
+            throw new IllegalStateException("setDefaultFrameFormat should be call before initMonitor");
+        }
+        this.mFrameFormat = format;
+    }
+
+    public int getPreviewWidth() {
+        return previewWidth;
+    }
+
+    public int getPreviewHeight() {
+        return previewHeight;
+    }
 }
diff --git a/libusbcamera/src/main/java/com/jiangdg/usbcamera/task/SaveYuvImageTask.java b/libusbcamera/src/main/java/com/jiangdg/usbcamera/task/SaveYuvImageTask.java
deleted file mode 100644
index 567ee19..0000000
--- a/libusbcamera/src/main/java/com/jiangdg/usbcamera/task/SaveYuvImageTask.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.jiangdg.usbcamera.task;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.ImageFormat;
-import android.graphics.Rect;
-import android.graphics.YuvImage;
-import android.os.AsyncTask;
-
-import com.jiangdg.usbcamera.utils.YUVBean;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-/**保存YUV格式（NV21）图片
- *
- * Created by jiangdongguo on 2017-12-25下午9:13:01
- */
-public class SaveYuvImageTask extends AsyncTask<Void, Void, Void> {
-	private static final String TAG = "SaveYuvImageTask";	
-	private YUVBean yuvBean;
-	private Context mContext;
-	//转换结果回调接口
-	private OnSaveYuvResultListener mListener;
-	
-	public interface OnSaveYuvResultListener{
-		void onSaveResult(String savePath);
-	}
-
-	public SaveYuvImageTask(YUVBean yuvBean, OnSaveYuvResultListener mListener) {
-		this.yuvBean = yuvBean;
-		this.mListener = mListener;
-	}
-	
-	@Override
-	protected Void doInBackground(Void... params) {   
-		if (yuvBean == null || yuvBean.getWidth() == 0
-				|| yuvBean.getHeight() == 0 || yuvBean.getYuvData() == null) {
-			return null;
-		}
-		saveYuv2Jpeg(yuvBean.getYuvData(),yuvBean.getWidth(),yuvBean.getHeight());
-		return null;
-	}
-
-	private void saveYuv2Jpeg(byte[] data,int width,int height){
-		YuvImage yuvImage = new YuvImage(data, ImageFormat.NV21, width, height, null);
-		ByteArrayOutputStream bos = new ByteArrayOutputStream(data.length);
-		boolean result = yuvImage.compressToJpeg(new Rect(0, 0, width, height), 100, bos);
-		if(result){
-			byte[] buffer = bos.toByteArray();
-			Bitmap bmp = BitmapFactory.decodeByteArray(buffer, 0, buffer.length);
-	        bmp.recycle();
-			String savPath = yuvBean.getPicPath();
-			File file = new File(savPath);
-			FileOutputStream fos = null;
-			try {
-				fos = new FileOutputStream(file);
-			} catch (FileNotFoundException e) {
-				e.printStackTrace();
-			}
-			bmp.compress(Bitmap.CompressFormat.JPEG, 100, fos);
-			try {
-				fos.flush();
-				fos.close();
-				//传递转换结果给调用者
-				mListener.onSaveResult(savPath);
-			} catch (IOException e) {
-				e.printStackTrace();
-				mListener.onSaveResult(null);
-			}
-		}
-		try {
-			bos.close();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}		
-	}
-}
diff --git a/libusbcamera/src/main/java/com/jiangdg/usbcamera/utils/YUVBean.java b/libusbcamera/src/main/java/com/jiangdg/usbcamera/utils/YUVBean.java
deleted file mode 100644
index ded8df4..0000000
--- a/libusbcamera/src/main/java/com/jiangdg/usbcamera/utils/YUVBean.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.jiangdg.usbcamera.utils;
-
-/** NV21数据类
- *
- * Created by jiangdongguo on 2018/1/26.
- */
-
-public class YUVBean {
-    private int width;
-    private int height;
-    private byte[] yuvData;
-    private String picPath;
-
-    public int getWidth() {
-        return width;
-    }
-
-    public void setWidth(int width) {
-        this.width = width;
-    }
-
-    public int getHeight() {
-        return height;
-    }
-
-    public void setHeight(int height) {
-        this.height = height;
-    }
-
-    public byte[] getYuvData() {
-        return yuvData;
-    }
-
-    public void setYuvData(byte[] yuvData) {
-        this.yuvData = yuvData;
-    }
-
-    public String getPicPath() {
-        return picPath;
-    }
-
-    public void setPicPath(String picPath) {
-        this.picPath = picPath;
-    }
-}
diff --git a/libusbcamera/src/main/java/com/serenegiant/usb/UVCCamera.java b/libusbcamera/src/main/java/com/serenegiant/usb/UVCCamera.java
index 6dd30e2..15a4180 100644
--- a/libusbcamera/src/main/java/com/serenegiant/usb/UVCCamera.java
+++ b/libusbcamera/src/main/java/com/serenegiant/usb/UVCCamera.java
@@ -48,7 +48,7 @@ public class UVCCamera {
 	public static final int DEFAULT_PREVIEW_HEIGHT = 480;
 	public static final int DEFAULT_PREVIEW_MODE = 0;
 	public static final int DEFAULT_PREVIEW_MIN_FPS = 1;
-	public static final int DEFAULT_PREVIEW_MAX_FPS = 30;
+	public static final int DEFAULT_PREVIEW_MAX_FPS = 31;
 	public static final float DEFAULT_BANDWIDTH = 1.0f;
 
 	public static final int FRAME_FORMAT_YUYV = 0;
@@ -58,8 +58,8 @@ public class UVCCamera {
 	public static final int PIXEL_FORMAT_YUV = 1;
 	public static final int PIXEL_FORMAT_RGB565 = 2;
 	public static final int PIXEL_FORMAT_RGBX = 3;
-	public static final int PIXEL_FORMAT_YUV420SP = 4;
-	public static final int PIXEL_FORMAT_NV21 = 5;		// = YVU420SemiPlanar
+	public static final int PIXEL_FORMAT_YUV420SP = 4;	// NV12
+	public static final int PIXEL_FORMAT_NV21 = 5;		// = YVU420SemiPlanar,NV21，但是保存到jpg颜色失真
 
 	//--------------------------------------------------------------------------------
     public static final int	CTRL_SCANNING		= 0x00000001;	// D0:  Scanning Mode
diff --git a/libusbcamera/src/main/java/com/serenegiant/usb/common/AbstractUVCCameraHandler.java b/libusbcamera/src/main/java/com/serenegiant/usb/common/AbstractUVCCameraHandler.java
index 602a702..fd7f7f9 100644
--- a/libusbcamera/src/main/java/com/serenegiant/usb/common/AbstractUVCCameraHandler.java
+++ b/libusbcamera/src/main/java/com/serenegiant/usb/common/AbstractUVCCameraHandler.java
@@ -20,9 +20,6 @@ import android.util.Log;
 import android.view.Surface;
 import android.view.SurfaceHolder;
 
-import com.jiangdg.usbcamera.task.SaveYuvImageTask;
-import com.jiangdg.usbcamera.utils.FileUtils;
-import com.jiangdg.usbcamera.utils.YUVBean;
 import com.serenegiant.usb.IFrameCallback;
 import com.serenegiant.usb.Size;
 import com.serenegiant.usb.USBMonitor;
@@ -533,17 +530,18 @@ public  abstract class AbstractUVCCameraHandler extends Handler {
 			if ((mUVCCamera == null) || mIsPreviewing) return;
 			try {
 				mUVCCamera.setPreviewSize(mWidth, mHeight, 1, 31, mPreviewMode, mBandwidthFactor);
-				// 获取USB Camera预览数据
-				mUVCCamera.setFrameCallback(mIFrameCallback, UVCCamera.PIXEL_FORMAT_NV21);
-
+				// 获取USB Camera预览数据，使用NV21颜色会失真
+				// 无论使用YUV还是MPEG，setFrameCallback的设置效果一致
+//				mUVCCamera.setFrameCallback(mIFrameCallback, UVCCamera.PIXEL_FORMAT_NV21);
+				mUVCCamera.setFrameCallback(mIFrameCallback, UVCCamera.PIXEL_FORMAT_YUV420SP);
 			} catch (final IllegalArgumentException e) {
-//				try {
-//					// fallback to YUV mode
-//					mUVCCamera.setPreviewSize(mWidth, mHeight, 1, 31, UVCCamera.DEFAULT_PREVIEW_MODE, mBandwidthFactor);
-//				} catch (final IllegalArgumentException e1) {
-//					callOnError(e1);
-//					return;
-//				}
+				try {
+					// fallback to YUV mode
+					mUVCCamera.setPreviewSize(mWidth, mHeight, 1, 31, UVCCamera.DEFAULT_PREVIEW_MODE, mBandwidthFactor);
+				} catch (final IllegalArgumentException e1) {
+					callOnError(e1);
+					return;
+				}
 			}
 			if (surface instanceof SurfaceHolder) {
 				mUVCCamera.setPreviewDisplay((SurfaceHolder)surface);
diff --git a/libusbcamera/src/main/java/com/serenegiant/usb/encoder/biz/H264EncodeConsumer.java b/libusbcamera/src/main/java/com/serenegiant/usb/encoder/biz/H264EncodeConsumer.java
index 01f860d..9310ce1 100644
--- a/libusbcamera/src/main/java/com/serenegiant/usb/encoder/biz/H264EncodeConsumer.java
+++ b/libusbcamera/src/main/java/com/serenegiant/usb/encoder/biz/H264EncodeConsumer.java
@@ -1,10 +1,6 @@
 package com.serenegiant.usb.encoder.biz;
 
-import java.io.BufferedOutputStream;
-import java.io.IOException;
-import java.lang.ref.WeakReference;
-import java.nio.ByteBuffer;
-
+import android.annotation.SuppressLint;
 import android.media.MediaCodec;
 import android.media.MediaCodecInfo;
 import android.media.MediaCodecList;
@@ -14,7 +10,13 @@ import android.os.Bundle;
 import android.os.Environment;
 import android.util.Log;
 
-/** 对YUV视频流进行编码
+import java.io.BufferedOutputStream;
+import java.io.IOException;
+import java.lang.ref.WeakReference;
+import java.nio.ByteBuffer;
+
+/**
+ * 对YUV视频流进行编码
  * Created by jiangdongguo on 2017/5/6.
  */
 
@@ -33,19 +35,19 @@ public class H264EncodeConsumer extends Thread {
     private boolean isExit = false;
     private boolean isEncoderStart = false;
 
-	private MediaFormat mFormat;
+    private MediaFormat mFormat;
     private static String path = Environment.getExternalStorageDirectory().getAbsolutePath() + "/test2.h264";
     private BufferedOutputStream outputStream;
     final int millisPerframe = 1000 / 20;
     long lastPush = 0;
     private OnH264EncodeResultListener listener;
-    private int mWidth ;
-    private int mHeight ;
+    private int mWidth;
+    private int mHeight;
     private MediaFormat newFormat;
     private WeakReference<Mp4MediaMuxer> mMuxerRef;
     private boolean isAddKeyFrame = false;
 
-    public interface OnH264EncodeResultListener{
+    public interface OnH264EncodeResultListener {
         void onEncodeResult(byte[] data, int offset,
                             int length, long timestamp);
     }
@@ -54,17 +56,13 @@ public class H264EncodeConsumer extends Thread {
         this.listener = listener;
     }
 
-    public H264EncodeConsumer(){
-
-    }
-
-    public H264EncodeConsumer(int width,int height){
+    public H264EncodeConsumer(int width, int height) {
         this.mWidth = width;
         this.mHeight = height;
     }
 
-    public synchronized void setTmpuMuxer(Mp4MediaMuxer mMuxer){
-        this.mMuxerRef =  new WeakReference<>(mMuxer);
+    public synchronized void setTmpuMuxer(Mp4MediaMuxer mMuxer) {
+        this.mMuxerRef = new WeakReference<>(mMuxer);
         Mp4MediaMuxer muxer = mMuxerRef.get();
         if (muxer != null && newFormat != null) {
             muxer.addTrack(newFormat, true);
@@ -74,13 +72,10 @@ public class H264EncodeConsumer extends Thread {
     private ByteBuffer[] inputBuffers;
     private ByteBuffer[] outputBuffers;
 
-    public void setRawYuv(byte[] yuvData,int width,int height){
-        if (! isEncoderStart)
+    public void setRawYuv(byte[] yuvData, int width, int height) {
+        if (!isEncoderStart)
             return;
-        // 根据编码器支持转换颜色空间格式
-        // 即 nv21 ---> YUV420sp(21)
-        //    nv21 ---> YUV420p (19)
-        if(mWidth != width || mHeight != height){
+        if (mWidth != width || mHeight != height) {
             mWidth = width;
             mHeight = height;
             return;
@@ -96,7 +91,8 @@ public class H264EncodeConsumer extends Thread {
                     Thread.sleep(time / 2);
             }
             // 将数据写入编码器
-            feedMediaCodecData(yuvData);
+
+            feedMediaCodecData(nv12ToNV21(yuvData, mWidth, mHeight));
 
             if (time > 0)
                 Thread.sleep(time / 2);
@@ -106,13 +102,13 @@ public class H264EncodeConsumer extends Thread {
         }
     }
 
-    private void feedMediaCodecData(byte[] data){
-        if (! isEncoderStart)
+    private void feedMediaCodecData(byte[] data) {
+        if (!isEncoderStart)
             return;
         int bufferIndex = -1;
-        try{
+        try {
             bufferIndex = mMediaCodec.dequeueInputBuffer(0);
-        }catch (IllegalStateException e){
+        } catch (IllegalStateException e) {
             e.printStackTrace();
         }
         if (bufferIndex >= 0) {
@@ -129,15 +125,16 @@ public class H264EncodeConsumer extends Thread {
         }
     }
 
-    public void exit(){
+    public void exit() {
         isExit = true;
     }
 
+    @SuppressLint("WrongConstant")
     @Override
     public void run() {
-    	if(!isEncoderStart){
+        if (!isEncoderStart) {
             startMediaCodec();
-    	}
+        }
         // 休眠200ms，等待音频线程开启
         // 否则视频第一秒会卡住
         try {
@@ -147,7 +144,7 @@ public class H264EncodeConsumer extends Thread {
         }
 
         // 如果编码器没有启动或者没有图像数据，线程阻塞等待
-        while(!isExit){
+        while (!isExit) {
             MediaCodec.BufferInfo bufferInfo = new MediaCodec.BufferInfo();
             int outputBufferIndex = 0;
             byte[] mPpsSps = new byte[0];
@@ -162,7 +159,7 @@ public class H264EncodeConsumer extends Thread {
                 } else if (outputBufferIndex == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) {
                     synchronized (H264EncodeConsumer.this) {
                         newFormat = mMediaCodec.getOutputFormat();
-                        if(mMuxerRef != null){
+                        if (mMuxerRef != null) {
                             Mp4MediaMuxer muxer = mMuxerRef.get();
                             if (muxer != null) {
                                 muxer.addTrack(newFormat, true);
@@ -202,35 +199,35 @@ public class H264EncodeConsumer extends Thread {
                     if (sync) {
                         System.arraycopy(mPpsSps, 0, h264, 0, mPpsSps.length);
                         outputBuffer.get(h264, mPpsSps.length, bufferInfo.size);
-                        if(listener != null){
-                            listener.onEncodeResult(h264, 0,mPpsSps.length + bufferInfo.size, bufferInfo.presentationTimeUs / 1000);
+                        if (listener != null) {
+                            listener.onEncodeResult(h264, 0, mPpsSps.length + bufferInfo.size, bufferInfo.presentationTimeUs / 1000);
                         }
 
                         // 添加视频流到混合器
-                        if(mMuxerRef != null){
+                        if (mMuxerRef != null) {
                             Mp4MediaMuxer muxer = mMuxerRef.get();
                             if (muxer != null) {
                                 muxer.pumpStream(outputBuffer, bufferInfo, true);
                             }
                             isAddKeyFrame = true;
                         }
-                        if(DEBUG)
-                            Log.i(TAG,"关键帧 h264.length = "+h264.length+";mPpsSps.length="+mPpsSps.length
+                        if (DEBUG)
+                            Log.i(TAG, "关键帧 h264.length = " + h264.length + ";mPpsSps.length=" + mPpsSps.length
                                     + "  bufferInfo.size = " + bufferInfo.size);
                     } else {
                         outputBuffer.get(h264, 0, bufferInfo.size);
-                        if(listener != null){
-                            listener.onEncodeResult(h264, 0,bufferInfo.size, bufferInfo.presentationTimeUs / 1000);
+                        if (listener != null) {
+                            listener.onEncodeResult(h264, 0, bufferInfo.size, bufferInfo.presentationTimeUs / 1000);
                         }
                         // 添加视频流到混合器
-                        if(isAddKeyFrame && mMuxerRef != null){
+                        if (isAddKeyFrame && mMuxerRef != null) {
                             Mp4MediaMuxer muxer = mMuxerRef.get();
                             if (muxer != null) {
                                 muxer.pumpStream(outputBuffer, bufferInfo, true);
                             }
                         }
-                        if(DEBUG)
-                            Log.i(TAG,"普通帧 h264.length = "+h264.length+ "  bufferInfo.size = " + bufferInfo.size);
+                        if (DEBUG)
+                            Log.i(TAG, "普通帧 h264.length = " + h264.length + "  bufferInfo.size = " + bufferInfo.size);
                     }
                     mMediaCodec.releaseOutputBuffer(outputBufferIndex, false);
                 }
@@ -261,7 +258,6 @@ public class H264EncodeConsumer extends Thread {
         mMediaCodec.start();
 
 
-
         isEncoderStart = true;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP + 1) {
             inputBuffers = outputBuffers = null;
@@ -277,25 +273,27 @@ public class H264EncodeConsumer extends Thread {
         }
     }
 
-    private void stopMediaCodec(){
+    private void stopMediaCodec() {
         isEncoderStart = false;
-        if(mMediaCodec != null){
+        if (mMediaCodec != null) {
             mMediaCodec.stop();
             mMediaCodec.release();
-            Log.d(TAG,"关闭视频编码器");
+            Log.d(TAG, "关闭视频编码器");
         }
     }
 
     private static final int FRAME_RATE = 15;
     private static final float BPP = 0.50f;
+
     private int calcBitRate() {
-        final int bitrate = (int)(BPP * FRAME_RATE * mWidth * mHeight);
+        final int bitrate = (int) (BPP * FRAME_RATE * mWidth * mHeight);
         Log.i(TAG, String.format("bitrate=%5.2f[Mbps]", bitrate / 1024f / 1024f));
         return bitrate;
     }
 
     /**
      * select the first codec that match a specific MIME type
+     *
      * @param mimeType
      * @return null if no codec matched
      */
@@ -307,7 +305,7 @@ public class H264EncodeConsumer extends Thread {
         for (int i = 0; i < numCodecs; i++) {
             final MediaCodecInfo codecInfo = MediaCodecList.getCodecInfoAt(i);
 
-            if (!codecInfo.isEncoder()) {	// skipp decoder
+            if (!codecInfo.isEncoder()) {    // skipp decoder
                 continue;
             }
             // select first codec that match a specific MIME type and color format
@@ -327,6 +325,7 @@ public class H264EncodeConsumer extends Thread {
 
     /**
      * select color format available on specific codec and we can use.
+     *
      * @return 0 if no colorFormat is matched
      */
     protected static final int selectColorFormat(final MediaCodecInfo codecInfo, final String mimeType) {
@@ -356,12 +355,14 @@ public class H264EncodeConsumer extends Thread {
      * color formats that we can use in this class
      */
     protected static int[] recognizedFormats;
+
     static {
-        recognizedFormats = new int[] {
-//        	MediaCodecInfo.CodecCapabilities.COLOR_FormatYUV420Planar,
+        recognizedFormats = new int[]{
+//                MediaCodecInfo.CodecCapabilities.COLOR_FormatYUV420PackedPlanar,
+//                MediaCodecInfo.CodecCapabilities.COLOR_FormatYUV420Planar,
+//                MediaCodecInfo.CodecCapabilities.COLOR_FormatYUV420PackedSemiPlanar,
                 MediaCodecInfo.CodecCapabilities.COLOR_FormatYUV420SemiPlanar,
                 MediaCodecInfo.CodecCapabilities.COLOR_QCOM_FormatYUV420SemiPlanar,
-//        	MediaCodecInfo.CodecCapabilities.COLOR_FormatSurface,
         };
     }
 
@@ -374,4 +375,87 @@ public class H264EncodeConsumer extends Thread {
         }
         return false;
     }
+
+
+    private byte[] nv21ToI420(byte[] data, int width, int height) {
+        byte[] ret = new byte[width * height * 3 / 2];
+        int total = width * height;
+
+        ByteBuffer bufferY = ByteBuffer.wrap(ret, 0, total);         // I420的Y分量
+        ByteBuffer bufferU = ByteBuffer.wrap(ret, total, total / 4); // I420的U分量
+        ByteBuffer bufferV = ByteBuffer.wrap(ret, total + total / 4, total / 4); // I420的V分量
+        // NV21 YYYYYYYY VUVU
+        bufferY.put(data, 0, total);
+        for (int i = total; i < data.length; i += 2) {
+            bufferV.put(data[i]);
+            bufferU.put(data[i + 1]);
+        }
+
+        return ret;
+    }
+
+    private byte[] nv12ToI420(byte[] data, int width, int height) {
+        byte[] ret = new byte[width * height * 3 / 2];
+        int total = width * height;
+
+        ByteBuffer bufferY = ByteBuffer.wrap(ret, 0, total);         // I420的Y分量
+        ByteBuffer bufferU = ByteBuffer.wrap(ret, total, total / 4); // I420的U分量
+        ByteBuffer bufferV = ByteBuffer.wrap(ret, total + total / 4, total / 4); // I420的V分量
+
+        // NV12 YYYYYYYY UVUV
+        bufferY.put(data, 0, total);
+        for (int i = total; i < data.length; i += 2) {
+            bufferU.put(data[i]);
+            bufferV.put(data[i + 1]);
+        }
+        return ret;
+    }
+
+    private byte[] nv12ToNv21(byte[] data, int width, int height) {
+        byte[] ret = new byte[width * height * 3 / 2];
+        int total = width * height;
+
+        ByteBuffer bufferY = ByteBuffer.wrap(ret, 0, total);         // I420的Y分量
+        ByteBuffer bufferU = ByteBuffer.wrap(ret, total, total / 4); // I420的U分量
+        ByteBuffer bufferV = ByteBuffer.wrap(ret, total + total / 4, total / 4); // I420的V分量
+
+        // NV12 YYYYYYYY UVUV
+        bufferY.put(data, 0, total);
+        for (int i = total; i < data.length; i += 2) {
+            bufferU.put(data[i]);
+            bufferV.put(data[i + 1]);
+        }
+        return ret;
+    }
+
+    // YYYYYYYY UVUV(nv21)--> YYYYYYYY VUVU(nv12)
+    private byte[] nv21ToNV12(byte[] nv21, int width, int height) {
+        byte[] ret = new byte[width * height * 3 /2];
+        int framesize = width * height;
+        int i = 0, j = 0;
+        // 拷贝Y分量
+        System.arraycopy(nv21, 0,ret , 0, framesize);
+        // 拷贝UV分量
+        for (j = framesize; j < nv21.length; j += 2) {
+            ret[j+1] = nv21[j+1];
+            ret[j] = nv21[j];
+        }
+        return ret;
+    }
+
+    // YYYYYYYY UVUV(nv12)--> YYYYYYYY VUVU(nv21)
+    private byte[] nv12ToNV21(byte[] nv12, int width, int height) {
+        byte[] ret = new byte[width * height * 3 /2];
+        int framesize = width * height;
+        int i = 0, j = 0;
+        // 拷贝Y分量
+        System.arraycopy(nv12, 0,ret , 0, framesize);
+        // 拷贝UV分量
+        for (j = framesize; j < nv12.length; j += 2) {
+            ret[j] = nv12[j+1];
+            ret[j+1] = nv12[j];
+        }
+        return ret;
+    }
+
 }
diff --git a/local.properties b/local.properties
index 64ad2b1..8efd68c 100644
--- a/local.properties
+++ b/local.properties
@@ -7,6 +7,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Fri Sep 29 23:06:03 CST 2017
-ndk.dir=E\:\\Android\\Evironment\\android-sdk-windows\\ndk-bundle
-sdk.dir=E\:\\Android\\Evironment\\android-sdk-windows
+#Mon Nov 13 09:14:43 CST 2017
+sdk.dir=E\:\\Environment\\android-sdk-windows