iOS Team / CNLiveUploadManager · Commits

Commit efd54936ae9657d275b1bfb281b39ee09d0ed091

Authored by 梁星国
1 parent 1fe89a38

提交0.1.13

Inline Side-by-side
Showing 2 changed files with 4 additions and 4 deletions
CNLiveUploadManager.podspec
  View file @efd5493
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 8
9 Pod::Spec.new do |s| 9 Pod::Spec.new do |s|
10 s.name = 'CNLiveUploadManager' 10 s.name = 'CNLiveUploadManager'
11 - s.version = '0.1.12' 11 + s.version = '0.1.13'
12 s.summary = '压缩上传,组件化中加入新参数加入outPath,不在直接取' 12 s.summary = '压缩上传,组件化中加入新参数加入outPath,不在直接取'
13 13
14 # This description is used to generate tags and improve search results. 14 # This description is used to generate tags and improve search results.
CNLiveUploadManager/Classes/CNLiveUploadManager.m
  View file @efd5493
@@ -2265,11 +2265,11 @@ static CNLiveUploadManager *_uploadManager; @@ -2265,11 +2265,11 @@ static CNLiveUploadManager *_uploadManager;
2265 NSDateFormatter *formater = [[NSDateFormatter alloc] init]; 2265 NSDateFormatter *formater = [[NSDateFormatter alloc] init];
2266 [formater setDateFormat:@"yyyy-MM-dd-HH:mm:ss-SSS"]; 2266 [formater setDateFormat:@"yyyy-MM-dd-HH:mm:ss-SSS"];
2267 NSInteger rand = random(); 2267 NSInteger rand = random();
2268 - NSString *filaName = [NSString stringWithFormat:@"output-%@_fileType=videoType_%ld.mp4",[formater stringFromDate:[NSDate date]],rand]; 2268 + NSString *filaName = [NSString stringWithFormat:@"/output-%@_fileType=videoType_%zi.mp4",[formater stringFromDate:[NSDate date]],rand];
2269 editOutputPath = [[CNLiveUploadManager createVideoFolderOutputPath:outputPath] stringByAppendingString:filaName]; 2269 editOutputPath = [[CNLiveUploadManager createVideoFolderOutputPath:outputPath] stringByAppendingString:filaName];
2270 2270
2271 - NSLog(@"输出转码前视频路径%@",outputPath);  
2272 - shortVideoTranscoder.outputURL = [NSURL fileURLWithPath:outputPath]; 2271 + NSLog(@"输出转码前视频路径%@",editOutputPath);
  2272 + shortVideoTranscoder.outputURL = [NSURL fileURLWithPath:editOutputPath];
2273 shortVideoTranscoder.outputFileType = PLSFileTypeMPEG4; 2273 shortVideoTranscoder.outputFileType = PLSFileTypeMPEG4;
2274 shortVideoTranscoder.outputFilePreset = [CNLiveUploadManager presetWithVideoLimitType:limitType url:url dataL:dataL];//分辨率 2274 shortVideoTranscoder.outputFilePreset = [CNLiveUploadManager presetWithVideoLimitType:limitType url:url dataL:dataL];//分辨率
2275 shortVideoTranscoder.bitrate = [CNLiveUploadManager bitrateWithPreset:shortVideoTranscoder.outputFilePreset avAsset:avAsset url:url dataL:dataL]; 2275 shortVideoTranscoder.bitrate = [CNLiveUploadManager bitrateWithPreset:shortVideoTranscoder.outputFilePreset avAsset:avAsset url:url dataL:dataL];