提交

梁星国
1 parent 96b6c870
Showing 15 changed files with 247 additions and 247 deletions
CNLiveUploadManager.podspec
CNLiveUploadManager/CNTools.h → CNLiveUploadManager/util/CNTools.h
CNLiveUploadManager/CNTools.m → CNLiveUploadManager/util/CNTools.m
CNLiveUploadManager/HttpService.h → CNLiveUploadManager/util/HttpService.h
CNLiveUploadManager/HttpService.m → CNLiveUploadManager/util/HttpService.m
CNLiveUploadManager/UserInformationModel.h → CNLiveUploadManager/util/UserInformationModel.h
CNLiveUploadManager/UserInformationModel.m → CNLiveUploadManager/util/UserInformationModel.m
CNLiveUploadManager/CNLiveUploadManager.h → CNLiveUploadManager/上传/CNLiveUploadManager.h
CNLiveUploadManager/CNLiveUploadManager.m → CNLiveUploadManager/上传/CNLiveUploadManager.m
CNLiveUploadManager/PHAsset+zipData.h → CNLiveUploadManager/压缩图片/PHAsset+zipData.h
CNLiveUploadManager/PHAsset+zipData.m → CNLiveUploadManager/压缩图片/PHAsset+zipData.m
CNLiveUploadManager/UIImage+Luban_iOS_Extension.h → CNLiveUploadManager/压缩图片/UIImage+Luban_iOS_Extension.h
CNLiveUploadManager/UIImage+Luban_iOS_Extension.m → CNLiveUploadManager/压缩图片/UIImage+Luban_iOS_Extension.m
CNLiveUploadManager/UIImage+zipData.h → CNLiveUploadManager/压缩图片/UIImage+zipData.h
CNLiveUploadManager/UIImage+zipData.m → CNLiveUploadManager/压缩图片/UIImage+zipData.m
@@ -137,8 +137,8 @@ TODO:加入压缩测试
   # 依赖类库
   s.dependency "AFNetworking", "~> 3.1.0"
   s.dependency "Qiniu", "~> 7.1"
-  s.dependency "PLShortVideoKit", "~> 1.13.1"
-  s.dependency "PLPlayerKit", "~> 3.3.3"
+  # s.dependency "PLShortVideoKit", "~> 1.13.1"
+  # s.dependency "PLPlayerKit", "~> 3.3.3"
 end
@@ -8,7 +8,7 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
-#import <PLShortVideoKit/PLShortVideoKit.h>
+//#import <PLShortVideoKit/PLShortVideoKit.h>
 #import <Qiniu/QNResponseInfo.h>
 #import "UIImage+zipData.h"
@@ -179,8 +179,8 @@ typedef void (^progressHandlerBlock)(float progress);//进度
 /// 请求token 单个视频上传 (video - 系统压缩 - 限制 - 筛选)
 + (void)uploadRequestVideoType:(CNLiveUploadType)type url:(NSString *)url dic:(NSDictionary *)dic  asset:(id)asset outputPath:(NSString *)outputPath progress:(progressHandlerBlock)progress success:(successModelBlock)success failure:(failureModelBlock)failure;
-/// 请求token 单个视频上传 (video - 七牛短视频压缩 - 限制 - 筛选)
-+ (void)uploadRequestWhithPLShortVideoType:(CNLiveUploadType)type outputPath:(NSString *)outputPath url:(NSString *)url dic:(NSDictionary *)dic  asset:(id)asset limitType:(AppPhototLimitType)limitType progress:(progressHandlerBlock)progress success:(successModelBlock)success failure:(failureModelBlock)failure;
+///// 请求token 单个视频上传 (video - 七牛短视频压缩 - 限制 - 筛选)
+//+ (void)uploadRequestWhithPLShortVideoType:(CNLiveUploadType)type outputPath:(NSString *)outputPath url:(NSString *)url dic:(NSDictionary *)dic  asset:(id)asset limitType:(AppPhototLimitType)limitType progress:(progressHandlerBlock)progress success:(successModelBlock)success failure:(failureModelBlock)failure;
 #pragma mark - 处理方法
@@ -194,11 +194,11 @@ typedef void (^progressHandlerBlock)(float progress);//进度
 #pragma mark - 七牛短视频处理方法
-/// 根据限制获取视频分辨率
-+ (PLSFilePreset)presetWithVideoLimitType:(AppPhototLimitType)limitType url:(NSURL *)url dataL:(float)dataL;
-
-///根据分辨力设置码率
-+ (float)bitrateWithPreset:(PLSFilePreset)perset avAsset:(AVAsset *)avAsset url:(NSURL *)url dataL:(float)dataL;
+///// 根据限制获取视频分辨率
+//+ (PLSFilePreset)presetWithVideoLimitType:(AppPhototLimitType)limitType url:(NSURL *)url dataL:(float)dataL;
+//
+/////根据分辨力设置码率
+//+ (float)bitrateWithPreset:(PLSFilePreset)perset avAsset:(AVAsset *)avAsset url:(NSURL *)url dataL:(float)dataL;
 /**
  短视频分辨率压缩导出
@@ -210,7 +210,7 @@ typedef void (^progressHandlerBlock)(float progress);//进度
  @param progressCount 进度
  @param failure 是啊比
  */
-+ (void)zipVideoWithAsset:(id) asset outputPath:(NSString *)outputPath limitType:(AppPhototLimitType)limitType success:(void(^)(NSURL * url))success progressCount:(void(^)(float progress)) progressCount failure:(void(^)(void))failure;
+//+ (void)zipVideoWithAsset:(id) asset outputPath:(NSString *)outputPath limitType:(AppPhototLimitType)limitType success:(void(^)(NSURL * url))success progressCount:(void(^)(float progress)) progressCount failure:(void(^)(void))failure;
@@ -1071,51 +1071,51 @@ static CNLiveUploadManager *_uploadManager;
 }
-///单个视频上传  - 压缩(七牛转码) - 限制 - 筛选) 实现
-- (void)uploadRequestPLShortVideoLimitWithToken:(NSString*)token asset:(id)asset outputPath:(NSString *)outputPath limitType:(AppPhototLimitType)limitType progress:(progressHandlerBlock)progress success:(successModelBlock)success failure:(failureModelBlock)failure {
-
-    //七牛token
-    if ([NSString isEmpty:token]) {
-        NSError *error = [NSError errorWithDomain:@"七牛token为空" code:100 userInfo:@{NSLocalizedDescriptionKey:@"七牛token为空,请重新获取"}];
-        !failure ? : failure(nil,error);
-        return;
-    }
-
-    //上传路径
-    if (!asset) {
-        NSError *error = [NSError errorWithDomain:@"上传路径为空" code:101 userInfo:@{NSLocalizedDescriptionKey:@"上传为空,请重新获取"}];
-        !failure ? : failure(nil,error);
-        return;
-    }
-
-
-    __weak typeof(self) weakSelf = self;
-
-    [CNLiveUploadManager zipVideoWithAsset:asset outputPath:outputPath limitType:limitType  success:^(NSURL *url) {
-        __strong typeof(weakSelf) strongSelf = weakSelf;
-        AVAsset *avAsset = [AVAsset assetWithURL:url];
-        NSLog(@"转码后时长%f",[[NSNumber numberWithFloat:CMTimeGetSeconds(avAsset.duration)] floatValue]);
-        NSLog(@"转码后数据大小%ldmb",[NSData dataWithContentsOfURL:url].length / (1024*1024));
-        //不限制大小
-        [strongSelf qnUploadVideoWithToken:token file:url.path progress:progress success:success failure:failure];
-
-    } progressCount:^(float progress) {
-
-        // 更新压缩进度的 UI
-        NSLog(@"transCoding progress: %f", progress);
-
-    } failure:^{
-
-        dispatch_async(dispatch_get_main_queue(), ^{
-            NSError *returnError = [NSError errorWithDomain:@"压缩失败" code:105 userInfo:@{NSLocalizedDescriptionKey:@"压缩失败,请重新获取"}];
-            !failure ? : failure(nil,returnError);
-            return;
-
-        });
-
-    }];
-
-}
+/////单个视频上传  - 压缩(七牛转码) - 限制 - 筛选) 实现
+//- (void)uploadRequestPLShortVideoLimitWithToken:(NSString*)token asset:(id)asset outputPath:(NSString *)outputPath limitType:(AppPhototLimitType)limitType progress:(progressHandlerBlock)progress success:(successModelBlock)success failure:(failureModelBlock)failure {
+//
+//    //七牛token
+//    if ([NSString isEmpty:token]) {
+//        NSError *error = [NSError errorWithDomain:@"七牛token为空" code:100 userInfo:@{NSLocalizedDescriptionKey:@"七牛token为空,请重新获取"}];
+//        !failure ? : failure(nil,error);
+//        return;
+//    }
+//
+//    //上传路径
+//    if (!asset) {
+//        NSError *error = [NSError errorWithDomain:@"上传路径为空" code:101 userInfo:@{NSLocalizedDescriptionKey:@"上传为空,请重新获取"}];
+//        !failure ? : failure(nil,error);
+//        return;
+//    }
+//
+//
+//    __weak typeof(self) weakSelf = self;
+//
+//    [CNLiveUploadManager zipVideoWithAsset:asset outputPath:outputPath limitType:limitType  success:^(NSURL *url) {
+//        __strong typeof(weakSelf) strongSelf = weakSelf;
+//        AVAsset *avAsset = [AVAsset assetWithURL:url];
+//        NSLog(@"转码后时长%f",[[NSNumber numberWithFloat:CMTimeGetSeconds(avAsset.duration)] floatValue]);
+//        NSLog(@"转码后数据大小%ldmb",[NSData dataWithContentsOfURL:url].length / (1024*1024));
+//        //不限制大小
+//        [strongSelf qnUploadVideoWithToken:token file:url.path progress:progress success:success failure:failure];
+//
+//    } progressCount:^(float progress) {
+//
+//        // 更新压缩进度的 UI
+//        NSLog(@"transCoding progress: %f", progress);
+//
+//    } failure:^{
+//
+//        dispatch_async(dispatch_get_main_queue(), ^{
+//            NSError *returnError = [NSError errorWithDomain:@"压缩失败" code:105 userInfo:@{NSLocalizedDescriptionKey:@"压缩失败,请重新获取"}];
+//            !failure ? : failure(nil,returnError);
+//            return;
+//
+//        });
+//
+//    }];
+//
+//}
@@ -1760,32 +1760,32 @@ static CNLiveUploadManager *_uploadManager;
 }
-/// 请求token 单个视频上传 (video - 七牛短视频压缩 - 限制 - 筛选)
-+ (void)uploadRequestWhithPLShortVideoType:(CNLiveUploadType)type outputPath:(NSString *)outputPath url:(NSString *)url dic:(NSDictionary *)dic  asset:(id)asset limitType:(AppPhototLimitType)limitType progress:(progressHandlerBlock)progress success:(successModelBlock)success failure:(failureModelBlock)failure {
-
-    if (type == CNLiveUploadTypeQN) { //七牛上传
-        [[HttpService service] sendRequestWithHttpMethod:E_HTTP_REQUEST_METHOD_POST URLPath:url parameters:dic isCache:NO CheckParam:nil completionHandler:^(id data, NSError *error) {
-
-            NSDictionary *dic = (NSDictionary *)data;
-            if (!error && [dic containsObjectForKey:@"token"]) {
-                NSString *token = dic[@"token"];
-                [[CNLiveUploadManager shareInsance] uploadRequestPLShortVideoLimitWithToken:token asset:asset outputPath:outputPath limitType:limitType progress:progress success:success failure:failure];
-
-            } else {//请求token失败
-                NSError *error = [NSError errorWithDomain:@"请求token失败" code:100 userInfo:@{NSLocalizedDescriptionKey:@"请求token失败,请重新获取"}];
-                !failure ? : failure(nil,error);
-                return;
-            }
-
-        }];
-
-    }else if (type == CNLiveUploadTypeKS) {
-
-    }else{
-
-    }
-
-}
+///// 请求token 单个视频上传 (video - 七牛短视频压缩 - 限制 - 筛选)
+//+ (void)uploadRequestWhithPLShortVideoType:(CNLiveUploadType)type outputPath:(NSString *)outputPath url:(NSString *)url dic:(NSDictionary *)dic  asset:(id)asset limitType:(AppPhototLimitType)limitType progress:(progressHandlerBlock)progress success:(successModelBlock)success failure:(failureModelBlock)failure {
+//
+//    if (type == CNLiveUploadTypeQN) { //七牛上传
+//        [[HttpService service] sendRequestWithHttpMethod:E_HTTP_REQUEST_METHOD_POST URLPath:url parameters:dic isCache:NO CheckParam:nil completionHandler:^(id data, NSError *error) {
+//
+//            NSDictionary *dic = (NSDictionary *)data;
+//            if (!error && [dic containsObjectForKey:@"token"]) {
+//                NSString *token = dic[@"token"];
+//                [[CNLiveUploadManager shareInsance] uploadRequestPLShortVideoLimitWithToken:token asset:asset outputPath:outputPath limitType:limitType progress:progress success:success failure:failure];
+//
+//            } else {//请求token失败
+//                NSError *error = [NSError errorWithDomain:@"请求token失败" code:100 userInfo:@{NSLocalizedDescriptionKey:@"请求token失败,请重新获取"}];
+//                !failure ? : failure(nil,error);
+//                return;
+//            }
+//
+//        }];
+//
+//    }else if (type == CNLiveUploadTypeKS) {
+//
+//    }else{
+//
+//    }
+//
+//}
 #pragma mark - 私有方法
@@ -1865,173 +1865,173 @@ static CNLiveUploadManager *_uploadManager;
 #pragma mark - 七牛短视频设置方法
-/// 短视频分辨率转码导出
-+ (void)zipVideoWithAsset:(id) asset outputPath:(NSString *)outputPath limitType:(AppPhototLimitType)limitType success:(void(^)(NSURL * url))success progressCount:(void(^)(float progress)) progressCount failure:(void(^)(void))failure {
-
-        //取得url
-        NSURL *url = [PHAsset movieURLWithAsset:asset];
-        NSInteger dataLInt = [NSData dataWithContentsOfURL:url].length;
-        NSNumber *dataNumber = [NSNumber numberWithInteger:dataLInt];
-        float dataL = [dataNumber floatValue];
-        NSLog(@"转码前数据大小%f",dataL / (1024.0*1024.0));
-        //编辑原始数据
-        NSMutableDictionary *movieSettings = [[NSMutableDictionary alloc]init];
-        AVAsset *avAsset = [AVAsset assetWithURL:url];
-        movieSettings[PLSURLKey] = url;
-        movieSettings[PLSAssetKey] = avAsset;
-        movieSettings[PLSStartTimeKey] = [NSNumber numberWithFloat:0.f];//开始时间
-        movieSettings[PLSDurationKey] = [NSNumber numberWithFloat:CMTimeGetSeconds(avAsset.duration)];//时长
-        //设置进行压缩
-        CGFloat start = [movieSettings[PLSStartTimeKey] floatValue];
-        CGFloat duration = [movieSettings[PLSDurationKey] floatValue];
-        NSLog(@"转码前输出时长:%f.2",duration);
-        CMTimeRange timeRange = CMTimeRangeMake(CMTimeMake(start * 1000, 1000), CMTimeMake(duration * 1000, 1000));
-        PLShortVideoTranscoder *shortVideoTranscoder = [[PLShortVideoTranscoder alloc] initWithURL:url];
-    
-        NSString *path = [NSString string];
-        if (outputPath.length <= 0 || outputPath) {
-            NSDateFormatter *formater = [[NSDateFormatter alloc] init];
-            [formater setDateFormat:@"yyyy-MM-dd-HH:mm:ss-SSS"];
-            path = [NSHomeDirectory() stringByAppendingFormat:@"/tmp/output-%@.mp4", [formater stringFromDate:[NSDate date]]];
-        
-        }else {
-            path = outputPath;
-        }
-    
-        NSLog(@"输出转码前视频路径%@",path);
-        shortVideoTranscoder.outputURL = [NSURL fileURLWithPath:path];
-        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.timeRange = timeRange;
-        shortVideoTranscoder.rotateOrientation = PLSPreviewOrientationPortrait; //视频显示
-        shortVideoTranscoder.videoSelectedRect = CGRectZero; //视频剪裁区域
-        shortVideoTranscoder.videoFrameRate = 0; //帧率
-        //成功
-        [shortVideoTranscoder setCompletionBlock:^(NSURL *url){
-            NSLog(@"输出转码后视频路径%@",url.path);
-            NSLog(@"输出转码后数据大小%ld",[NSData dataWithContentsOfURL:url].length / (1024*1024));
-            dispatch_async(dispatch_get_main_queue(), ^{
-                !success ? : success(url);
-            });
-
-        }];
-
-        //失败
-        [shortVideoTranscoder setFailureBlock:^(NSError *error){
-            NSLog(@"输出错误%@",error);
-            dispatch_async(dispatch_get_main_queue(), ^{
-               !failure ? : failure();
-            });
-
-        }];
-
-        [shortVideoTranscoder setProcessingBlock:^(float progress){
-            // 更新压缩进度的 UI
-
-            NSLog(@"transCoding progress: %f", progress);
-            !progressCount ? : progressCount(progress);
-        }];
-
-        [shortVideoTranscoder startTranscoding];
-
-
-}
-
-/// 根据限制获取视频分辨率
-+ (PLSFilePreset)presetWithVideoLimitType:(AppPhototLimitType)limitType url:(NSURL *)url dataL:(float)dataL{
-
-    NSLog(@"1输出转码前数据长度%f",(dataL/(1024.0*1024)));
-    if (limitType == AppPhototLimitTypeChat) {//聊天
-        if (dataL > kCNUploadSize30MB) {
-            return PLSFilePreset640x480;
-        }else {
-            return PLSFilePreset960x540;
-        }
-
-    }else if (limitType == AppPhototLimitTypeFriendsCircle) {//朋友圈
-        if (dataL > kCNUploadSize30MB) {
-            return PLSFilePreset640x480;
-        }else {
-            return PLSFilePreset960x540;
-        }
-
-    }else if (limitType == AppPhototLimitTypeSweepCode) {//扫码
-        if (dataL > kCNUploadSize30MB) {
-            return PLSFilePreset640x480;
-        }else {
-            return PLSFilePreset960x540;
-        }
-    }else if (limitType == AppPhototLimitTypeTarentoComment) {//评论
-        if (dataL > kCNUploadSize30MB) {
-            return PLSFilePreset640x480;
-        }else {
-            return PLSFilePreset960x540;
-        }
-
-    }else {
-        if (dataL > kCNUploadSize30MB) {//其他
-            return PLSFilePreset640x480;
-        }else {
-            return PLSFilePreset960x540;
-        }
-    }
-
-}
-
-///根据分辨力设置码率
-+ (float)bitrateWithPreset:(PLSFilePreset)perset avAsset:(AVAsset *)avAsset url:(NSURL *)url dataL:(float)dataL{
-
-    float bitrate = avAsset.pls_bitrate;
-
-    if (perset == PLSFilePresetLowQuality) {
-        return 700 * 1000;
-    }else if (perset == PLSFilePresetMediumQuality) {
-        return 3000 * 1000;
-    }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 300 *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 > 550 * 1000) {
-                return 550 *1000;
-            }else {
-                return bitrate *0.40;
-            }
-
-        }else if (dataL > 30*1024*1024) {
-
-            if (bitrate *0.60 > 700 * 1000) {
-                return 700 *1000;
-            }else {
-                return bitrate *0.60;
-            }
-        }else if (dataL > 20*1024*1024) {
-
-            return bitrate *0.80;
-        }else if (dataL > 10*1024*1024) {
+///// 短视频分辨率转码导出
+//+ (void)zipVideoWithAsset:(id) asset outputPath:(NSString *)outputPath limitType:(AppPhototLimitType)limitType success:(void(^)(NSURL * url))success progressCount:(void(^)(float progress)) progressCount failure:(void(^)(void))failure {
+//
+//        //取得url
+//        NSURL *url = [PHAsset movieURLWithAsset:asset];
+//        NSInteger dataLInt = [NSData dataWithContentsOfURL:url].length;
+//        NSNumber *dataNumber = [NSNumber numberWithInteger:dataLInt];
+//        float dataL = [dataNumber floatValue];
+//        NSLog(@"转码前数据大小%f",dataL / (1024.0*1024.0));
+//        //编辑原始数据
+//        NSMutableDictionary *movieSettings = [[NSMutableDictionary alloc]init];
+//        AVAsset *avAsset = [AVAsset assetWithURL:url];
+//        movieSettings[PLSURLKey] = url;
+//        movieSettings[PLSAssetKey] = avAsset;
+//        movieSettings[PLSStartTimeKey] = [NSNumber numberWithFloat:0.f];//开始时间
+//        movieSettings[PLSDurationKey] = [NSNumber numberWithFloat:CMTimeGetSeconds(avAsset.duration)];//时长
+//        //设置进行压缩
+//        CGFloat start = [movieSettings[PLSStartTimeKey] floatValue];
+//        CGFloat duration = [movieSettings[PLSDurationKey] floatValue];
+//        NSLog(@"转码前输出时长:%f.2",duration);
+//        CMTimeRange timeRange = CMTimeRangeMake(CMTimeMake(start * 1000, 1000), CMTimeMake(duration * 1000, 1000));
+//        PLShortVideoTranscoder *shortVideoTranscoder = [[PLShortVideoTranscoder alloc] initWithURL:url];
+//
+//        NSString *path = [NSString string];
+//        if (outputPath.length <= 0 || outputPath) {
+//            NSDateFormatter *formater = [[NSDateFormatter alloc] init];
+//            [formater setDateFormat:@"yyyy-MM-dd-HH:mm:ss-SSS"];
+//            path = [NSHomeDirectory() stringByAppendingFormat:@"/tmp/output-%@.mp4", [formater stringFromDate:[NSDate date]]];
+//
+//        }else {
+//            path = outputPath;
+//        }
+//
+//        NSLog(@"输出转码前视频路径%@",path);
+//        shortVideoTranscoder.outputURL = [NSURL fileURLWithPath:path];
+//        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.timeRange = timeRange;
+//        shortVideoTranscoder.rotateOrientation = PLSPreviewOrientationPortrait; //视频显示
+//        shortVideoTranscoder.videoSelectedRect = CGRectZero; //视频剪裁区域
+//        shortVideoTranscoder.videoFrameRate = 0; //帧率
+//        //成功
+//        [shortVideoTranscoder setCompletionBlock:^(NSURL *url){
+//            NSLog(@"输出转码后视频路径%@",url.path);
+//            NSLog(@"输出转码后数据大小%ld",[NSData dataWithContentsOfURL:url].length / (1024*1024));
+//            dispatch_async(dispatch_get_main_queue(), ^{
+//                !success ? : success(url);
+//            });
+//
+//        }];
+//
+//        //失败
+//        [shortVideoTranscoder setFailureBlock:^(NSError *error){
+//            NSLog(@"输出错误%@",error);
+//            dispatch_async(dispatch_get_main_queue(), ^{
+//               !failure ? : failure();
+//            });
+//
+//        }];
+//
+//        [shortVideoTranscoder setProcessingBlock:^(float progress){
+//            // 更新压缩进度的 UI
+//
+//            NSLog(@"transCoding progress: %f", progress);
+//            !progressCount ? : progressCount(progress);
+//        }];
+//
+//        [shortVideoTranscoder startTranscoding];
+//
+//
+//}
-            return bitrate *0.9;
-        }else {
-            return bitrate;
-        }
-    }
+///// 根据限制获取视频分辨率
+//+ (PLSFilePreset)presetWithVideoLimitType:(AppPhototLimitType)limitType url:(NSURL *)url dataL:(float)dataL{
+//
+//    NSLog(@"1输出转码前数据长度%f",(dataL/(1024.0*1024)));
+//    if (limitType == AppPhototLimitTypeChat) {//聊天
+//        if (dataL > kCNUploadSize30MB) {
+//            return PLSFilePreset640x480;
+//        }else {
+//            return PLSFilePreset960x540;
+//        }
+//
+//    }else if (limitType == AppPhototLimitTypeFriendsCircle) {//朋友圈
+//        if (dataL > kCNUploadSize30MB) {
+//            return PLSFilePreset640x480;
+//        }else {
+//            return PLSFilePreset960x540;
+//        }
+//
+//    }else if (limitType == AppPhototLimitTypeSweepCode) {//扫码
+//        if (dataL > kCNUploadSize30MB) {
+//            return PLSFilePreset640x480;
+//        }else {
+//            return PLSFilePreset960x540;
+//        }
+//    }else if (limitType == AppPhototLimitTypeTarentoComment) {//评论
+//        if (dataL > kCNUploadSize30MB) {
+//            return PLSFilePreset640x480;
+//        }else {
+//            return PLSFilePreset960x540;
+//        }
+//
+//    }else {
+//        if (dataL > kCNUploadSize30MB) {//其他
+//            return PLSFilePreset640x480;
+//        }else {
+//            return PLSFilePreset960x540;
+//        }
+//    }
+//
+//}
-}
+/////根据分辨力设置码率
+//+ (float)bitrateWithPreset:(PLSFilePreset)perset avAsset:(AVAsset *)avAsset url:(NSURL *)url dataL:(float)dataL{
+//
+//    float bitrate = avAsset.pls_bitrate;
+//
+//    if (perset == PLSFilePresetLowQuality) {
+//        return 700 * 1000;
+//    }else if (perset == PLSFilePresetMediumQuality) {
+//        return 3000 * 1000;
+//    }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 300 *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 > 550 * 1000) {
+//                return 550 *1000;
+//            }else {
+//                return bitrate *0.40;
+//            }
+//
+//        }else if (dataL > 30*1024*1024) {
+//
+//            if (bitrate *0.60 > 700 * 1000) {
+//                return 700 *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;
+//        }
+//    }
+//
+//}
 #pragma mark - 金山