卡顿

zhangxiaowen
1 parent bc4de5f0
Showing 3 changed files with 33 additions and 21 deletions
CNLivePlayer/Classes/Player/CNLivePlayer.m
Example/CNLivePlayer/Player/CNLivePlayerController.m
Example/Podfile
@@ -32,7 +32,8 @@
     // 1-流畅，2-标清，3-高清，4-超清，默认为2
     NSString *_rate;
     BOOL _switchRate;
-
+    NSTimeInterval _switchCurrentTime;
+    
     //音频标识
     BOOL _isAudio;
     NSString *_roomId;
@@ -394,17 +395,17 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
 - (void)createPlayerWithUrl:(NSString *)url {
     self.videoUrl = url;
     if(self->_switchRate){
+        _switchCurrentTime = self.player.currentPlaybackTime;
+
         //切换码率
         NSString *proxyUrl = [[CNLiveHTTPProxyService manager] getProxyUrl:self.videoUrl];
         KSYMoviePlayerController *switchPlayer = [[KSYMoviePlayerController alloc] initWithContentURL:[NSURL URLWithString:PLAYER_OpenCache?proxyUrl:self.videoUrl]];
-//        switchPlayer.view.frame = self.view.bounds;
-        switchPlayer.view.frame = CGRectMake(100, 200, 200, 100);
+        switchPlayer.view.frame = self.view.bounds;
+//        switchPlayer.view.frame = CGRectMake(0, 200, self.view.bounds.size.width, 200);
         switchPlayer.view.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleHeight;
-        switchPlayer.shouldAutoplay = NO;
         switchPlayer.shouldEnableKSYStatModule = NO;
+        switchPlayer.shouldMute = YES;
         [switchPlayer prepareToPlay];
-        [switchPlayer play];
-        [switchPlayer seekTo:self.player.currentPlaybackTime accurate:YES];
         [self.view addSubview:switchPlayer.view];
         self.switchPlayer = switchPlayer;
  
@@ -709,33 +710,43 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
     //切换码率
     if(_switchRate){
         if((self.switchPlayer == player)&&(loadState == 3)){
-            [player seekTo:self.player.currentPlaybackTime accurate:NO];
-            [player play];
-            [self.player stop];
+            
             KSYMoviePlayerController *temp = self.player;
+            temp.shouldMute = NO;
             self.player = player;
             self.switchPlayer = temp;
-//            __weak typeof(self)weakSelf = self;
-//            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-//                __strong typeof (weakSelf) strongSelf = weakSelf;
-//                if(!strongSelf){
-//                    return ;
-//                }
-//                [strongSelf.switchPlayer stop];
-//            });
+
+            __weak typeof(self)weakSelf = self;
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(10.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                __strong typeof (weakSelf) strongSelf = weakSelf;
+                if(!strongSelf){
+                    return ;
+                }
+                strongSelf.player.shouldMute = NO;
+                [strongSelf.switchPlayer reset:NO];
+                [strongSelf.switchPlayer stop];
+                [strongSelf.switchPlayer.view removeFromSuperview];
+
+            });
+            
             _switchRate = NO;
+            
         }
     }
-    [_player play];
+    [player play];
  
 }
  
 - (void)mediaIsPreparedToPlayDidChange:(NSNotification *)notification {
     KSYMoviePlayerController *player = [notification object];
-    MPMovieLoadState loadState = player.loadState;
+    if(self.switchPlayer == player){
+//        [player seekTo:_switchCurrentTime accurate:YES];
+        player.currentPlaybackTime = _switchCurrentTime+5.0;
+        [player play];
  
+    }
     if (PLAYER_TestEnvironment) {
-        NSLog(@"CNLivePlayer-->播放器缓冲至可播放状态");
+        NSLog(@"CNLivePlayer-->播放器开始预播放");
     }
  
     if (!_contentType || _contentType.length == 0) {
@@ -59,7 +59,7 @@
 //
 //    }];
  
-    UILabel *state = [[UILabel alloc]initWithFrame:CGRectMake(100, 400, 200, 20)];
+    UILabel *state = [[UILabel alloc]initWithFrame:CGRectMake(100, 300, 200, 20)];
     state.backgroundColor = [UIColor redColor];
     state.text = @"切换中";
     [self.view addSubview:state];
@@ -7,6 +7,7 @@ platform :ios, &#39;9.0&#39;
 target 'CNLivePlayer_Example' do
   pod 'CNLivePlayer', :path => '../'
   pod 'YYImage'
+#  pod 'SJVideoPlayer'
  
   target 'CNLivePlayer_Tests' do
     inherit! :search_paths