增加不支持的尺寸异常抛出

mabeijianxi · Oct 14, 2016 · 3874db0 · 3874db0
1 parent 10739b6
commit 3874db0
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@
 ###使用方法：
 ######1：添加依赖
 ```java
-compile 'com.mabeijianxi:small-video-record:1.0.5'
+compile 'com.mabeijianxi:small-video-record:1.0.6'
 ```
 ######2:在manifests里面添加
 ```java
@@ -52,6 +52,9 @@ MediaRecorderConfig config = new MediaRecorderConfig.Buidler()
         MediaRecorderActivity.goSmallVideoRecorder(this, SendSmallVideoActivity.class.getName(), config);
 ```
 ######更新日志：
+	2016-10-14:
+	提交1.0.6，修复在不支持的尺寸下无异常抛出。
+
 	2016-10-13:
 	提交小视频1.0.5，修复部分手机录制变形问题。
 

diff --git a/SmallVideoLib/build.gradle b/SmallVideoLib/build.gradle
@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 22
-        versionCode 6
-        versionName "1.0.5"
+        versionCode 7
+        versionName "1.0.6"
     }
 
     buildTypes {
@@ -23,7 +23,7 @@ android {
         userOrg = 'mabeijianxi'//bintray.com用户名
         groupId = 'com.mabeijianxi'//jcenter上的路径
         artifactId = 'small-video-record'//项目名称
-        publishVersion = '1.0.5'//版本号
+        publishVersion = '1.0.6'//版本号
         desc = '利用FFmpeg来小视频录制与压缩处理!'//描述，不重要
         website = 'https://github.com/mabeijianxi/small-video-record'//网站，不重要
     }

diff --git a/SmallVideoLib/src/main/java/mabeijianxi/camera/MediaRecorderBase.java b/SmallVideoLib/src/main/java/mabeijianxi/camera/MediaRecorderBase.java
@@ -538,9 +538,9 @@ protected void prepareCameraParaments() {
         for (int i = 0; i < mSupportedPreviewSizes.size(); i++) {
             Size size = mSupportedPreviewSizes.get(i);
             if (size.height == SMALL_VIDEO_WIDTH) {
-                if(SMALL_VIDEO_WIDTH==480){
-                    mSupportedPreviewWidth=640;
-                }else {
+                if (SMALL_VIDEO_WIDTH == 480) {
+                    mSupportedPreviewWidth = 640;
+                } else {
                     mSupportedPreviewWidth = size.width;
                 }
                 findWidth = true;
@@ -549,7 +549,7 @@ protected void prepareCameraParaments() {
         if (findWidth) {
             mParameters.setPreviewSize(mSupportedPreviewWidth, SMALL_VIDEO_WIDTH);
         } else {
-            new IllegalArgumentException("传入高度不支持或未找到对应宽度");
+            throw new IllegalArgumentException("传入高度不支持或未找到对应宽度");
         }
 
         // 设置输出视频流尺寸，采样率

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.mabeijianxi.smallvideo"
         minSdkVersion 14
         targetSdkVersion 22
-        versionCode 6
-        versionName "1.0.5"
+        versionCode 7
+        versionName "1.0.6"
     }
     buildTypes {
         release {

diff --git a/sample/src/main/java/com/mabeijianxi/smallvideo/MainActivity.java b/sample/src/main/java/com/mabeijianxi/smallvideo/MainActivity.java
@@ -25,8 +25,8 @@ protected void onCreate(Bundle savedInstanceState) {
     public void go(View c) {
         MediaRecorderConfig config = new MediaRecorderConfig.Buidler()
                 .doH264Compress(true)
-                .smallVideoWidth(480)
-                .smallVideoHeight(360)
+                .smallVideoWidth(640)
+                .smallVideoHeight(480)
                 .recordTimeMax(6 * 1000)
                 .maxFrameRate(20)
                 .minFrameRate(8)