提交上传0.1.18

梁星国
1 parent e7a3775c
Showing 3 changed files with 63 additions and 37 deletions
CNLiveUploadManager.podspec
CNLiveUploadManager/Classes/CNLiveUploadManager.h
CNLiveUploadManager/Classes/CNLiveUploadManager.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveUploadManager'
-  s.version          = '0.1.17'
+  s.version          = '0.1.18'
   s.summary          = '压缩上传,组件化中加入新参数加入outPath,不在直接取'
 # This description is used to generate tags and improve search results.
@@ -147,7 +147,7 @@ typedef void (^progressHandlerBlock)(float progress);//进度
 + (PLSFilePreset)presetWithVideoLimitType:(AppPhototLimitType)limitType url:(NSURL *)url dataL:(float)dataL;
 ///根据分辨力设置码率
-+ (float)bitrateWithPreset:(PLSFilePreset)perset avAsset:(AVAsset *)avAsset url:(NSURL *)url dataL:(float)dataL;
++ (float)bitrateWithPreset:(PLSFilePreset)perset limitType:(AppPhototLimitType)limitType avAsset:(AVAsset *)avAsset url:(NSURL *)url dataL:(float)dataL;
 @end
@@ -2239,7 +2239,7 @@ static CNLiveUploadManager *_uploadManager;
     shortVideoTranscoder.outputURL = [NSURL fileURLWithPath:editOutputPath];
     shortVideoTranscoder.outputFileType = PLSFileTypeMPEG4;
     shortVideoTranscoder.outputFilePreset = [CNLiveUploadManager presetWithVideoLimitType:limitType url:url  dataL:dataL];//分辨率
-    shortVideoTranscoder.bitrate = [CNLiveUploadManager bitrateWithPreset:shortVideoTranscoder.outputFilePreset avAsset:avAsset url:url dataL:dataL];
+    shortVideoTranscoder.bitrate = [CNLiveUploadManager bitrateWithPreset:shortVideoTranscoder.outputFilePreset limitType:limitType avAsset:avAsset url:url dataL:dataL];
     shortVideoTranscoder.timeRange = timeRange;
     shortVideoTranscoder.rotateOrientation = PLSPreviewOrientationPortrait; //视频显示
     shortVideoTranscoder.videoSelectedRect = CGRectZero; //视频剪裁区域
@@ -2326,7 +2326,7 @@ static CNLiveUploadManager *_uploadManager;
     shortVideoTranscoder.outputURL = [NSURL fileURLWithPath:editOutputPath];
     shortVideoTranscoder.outputFileType = PLSFileTypeMPEG4;
     shortVideoTranscoder.outputFilePreset = [CNLiveUploadManager presetWithVideoLimitType:limitType url:url  dataL:dataL];//分辨率
-    shortVideoTranscoder.bitrate = [CNLiveUploadManager bitrateWithPreset:shortVideoTranscoder.outputFilePreset avAsset:avAsset url:url dataL:dataL];
+    shortVideoTranscoder.bitrate = [CNLiveUploadManager bitrateWithPreset:shortVideoTranscoder.outputFilePreset limitType:limitType avAsset:avAsset url:url dataL:dataL];
     shortVideoTranscoder.timeRange = timeRange;
     shortVideoTranscoder.rotateOrientation = PLSPreviewOrientationPortrait; //视频显示
     shortVideoTranscoder.videoSelectedRect = CGRectZero; //视频剪裁区域
@@ -2392,8 +2392,8 @@ static CNLiveUploadManager *_uploadManager;
         }
     }else if (limitType == AppPhototLimitTypeFriendsCircle) {//朋友圈
-        if (dataL > kCNUploadSize30MB) {
-            return PLSFilePreset640x480;
+        if (dataL > kCNUploadSize100MB) {
+            return PLSFilePreset960x540;
         }else {
             return PLSFilePreset960x540;
         }
@@ -2422,7 +2422,7 @@ static CNLiveUploadManager *_uploadManager;
 }
 ///根据分辨力设置码率
-+ (float)bitrateWithPreset:(PLSFilePreset)perset avAsset:(AVAsset *)avAsset url:(NSURL *)url dataL:(float)dataL{
++ (float)bitrateWithPreset:(PLSFilePreset)perset limitType:(AppPhototLimitType)limitType avAsset:(AVAsset *)avAsset url:(NSURL *)url dataL:(float)dataL{
     float bitrate = avAsset.pls_bitrate;
@@ -2433,44 +2433,70 @@ static CNLiveUploadManager *_uploadManager;
     }else if (perset == PLSFilePresetHighestQuality) {
         return 6000 * 1000;
     }else {
-        if (dataL > 150*1024*1024) {
-            float scale = (20*1024*1024)/dataL;
-            if (bitrate *scale > 300 * 1000) {
-                return 200 *1000;
-            }else {
-                return bitrate *scale;
-            }
-        }else if (dataL > 50*1024*1024) {
-            float scale = (25*1024*1024)/dataL;
-            if (bitrate *scale > 400 * 1000) {
-                return 400 *1000;
-            }else {
-                return bitrate *scale;
-            }
+        
+        if (limitType == AppPhototLimitTypeFriendsCircle) {//朋友圈
-        }else if (dataL > 40*1024*1024) {
-            if (bitrate *0.4 > 450 * 1000) {
-                return 450 *1000;
+            if (dataL > 150*1024*1024) {
+                float scale = (50*1024*1024)/dataL;
+                if (bitrate *scale > 3000 * 1000) {
+                    return 3000 * 1000;
+                }else {
+                    return bitrate *scale;
+                }
+            }else if (dataL > 75*1024*1024) {
+                
+                float scale = (60*1024*1024)/dataL;
+                if (bitrate *scale > 5000 * 1000) {
+                    return 5000 * 1000;
+                }else {
+                    return bitrate *scale;
+                }
             }else {
-                return bitrate *0.40;
+                return bitrate;
             }
-        }else if (dataL > 30*1024*1024) {
-            
-            if (bitrate *0.60 > 700 * 1000) {
-                return 550 *1000;
+        }else {
+            if (dataL > 150*1024*1024) {
+                float scale = (20*1024*1024)/dataL;
+                if (bitrate *scale > 300 * 1000) {
+                    return 200 *1000;
+                }else {
+                    return bitrate *scale;
+                }
+            }else if (dataL > 50*1024*1024) {
+                float scale = (25*1024*1024)/dataL;
+                if (bitrate *scale > 400 * 1000) {
+                    return 400 *1000;
+                }else {
+                    return bitrate *scale;
+                }
+                
+            }else if (dataL > 40*1024*1024) {
+                if (bitrate *0.4 > 450 * 1000) {
+                    return 450 *1000;
+                }else {
+                    return bitrate *0.40;
+                }
+                
+            }else if (dataL > 30*1024*1024) {
+                
+                if (bitrate *0.60 > 700 * 1000) {
+                    return 550 *1000;
+                }else {
+                    return bitrate *0.60;
+                }
+            }else if (dataL > 20*1024*1024) {
+                
+                return bitrate *0.80;
+            }else if (dataL > 10*1024*1024) {
+                
+                return bitrate *0.9;
             }else {
-                return bitrate *0.60;
+                return bitrate;
             }
-        }else if (dataL > 20*1024*1024) {
-            return bitrate *0.80;
-        }else if (dataL > 10*1024*1024) {
-            
-            return bitrate *0.9;
-        }else {
-            return bitrate;
         }
+
     }
 }