提交0.1.15

梁星国
1 parent dcb08329
Showing 2 changed files with 7 additions and 4 deletions
CNLiveUploadManager.podspec
CNLiveUploadManager/Classes/CNLiveUploadManager.m
@@ -8,7 +8,7 @@
  
 Pod::Spec.new do |s|
   s.name             = 'CNLiveUploadManager'
-  s.version          = '0.1.14'
+  s.version          = '0.1.15'
   s.summary          = '压缩上传,组件化中加入新参数加入outPath,不在直接取'
  
 # This description is used to generate tags and improve search results.
@@ -2291,12 +2291,11 @@ static CNLiveUploadManager *_uploadManager;
     shortVideoTranscoder.videoFrameRate = 0; //帧率
  
  
-    
+    dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
     [PLShortVideoRecorder checkAuthentication:^(PLSAuthenticationResult result) {
  
         if (PLSAuthenticationResultAuthorized == result) {//授权
  
-            dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
             //成功
             [shortVideoTranscoder setCompletionBlock:^(NSURL *url){
                 NSLog(@"输出转码后视频路径%@",url.path);
@@ -2319,18 +2318,22 @@ static CNLiveUploadManager *_uploadManager;
  
                 NSLog(@"transCoding progress: %f", progress);
                 !progressCount ? : progressCount(progress);
+                
             }];
  
             [shortVideoTranscoder startTranscoding];
-            dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
+            
         }else{//未授权
  
             !failure ? : failure();
+            dispatch_semaphore_signal(semaphore);
         }
  
  
     }];
  
+    dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
+    
  
  
 }