no message

zhangxiaowen
1 parent 071d59de
Showing 4 changed files with 150 additions and 43 deletions
CNLivePlayer/Classes/Header/CNLivePlayerDefines.h
CNLivePlayer/Classes/Player/CNLivePlayer.h
CNLivePlayer/Classes/Player/CNLivePlayer.m
Example/CNLivePlayer/Player/CNLivePlayerController.m
@@ -18,6 +18,19 @@ typedef NS_ENUM(NSUInteger, CNLivePlayerType) {
     CNLivePlayerAudio  //音频
 };
+/**
+ * 视频解码模式
+ */
+typedef NS_ENUM(NSUInteger, CNLiveMovieVideoDecoderMode) {
+    ///视频解码方式采用软解
+    CNLiveMovieVideoDecoderMode_Software = 0,
+    ///视频解码方式采用硬解
+    CNLiveMovieVideoDecoderMode_Hardware,
+    ///自动选择解码方式，8.0以上的系统优先选择硬解
+    CNLiveMovieVideoDecoderMode_AUTO,
+    ///使用系统接口进行解码和渲染，只适用于8.0及以上系统，低于8.0的系统自动使用软解
+    CNLiveMovieVideoDecoderMode_DisplayLayer,
+};
 /**
  *  主播直播状态
@@ -120,6 +120,14 @@ typedef void(^AuthFailureBlock)(NSDictionary *errorInfo);
  */
 @property (nonatomic, assign, readonly) CNLiveHostStatus hostStatus;
+/* 解码方式（硬解/软解/自动/使用系统接口进行解码和渲染）
+ *
+ * 建议系统版本高于8.0 选择硬解，或者自动选择解码方式，8.0以上的系统优先选择硬解
+ * 只在[prepareToPlay]调用前设置生效
+ *
+ */
+@property(nonatomic) CNLiveMovieVideoDecoderMode videoDecoderMode;
+
 /**
  @abstract 是否静音
  @discussion
@@ -45,7 +45,7 @@
 }
 @property (nonatomic, strong, readwrite) UIView *view;
 @property (nonatomic, copy) NSString *videoUrl;
-@property (nonatomic, strong) KSYMoviePlayerController *switchPlayer;
+@property (nonatomic, weak) KSYMoviePlayerController *switchPlayer;
 @end
@@ -281,7 +281,7 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
  * rate              码率 1-流畅，2-标清，3-高清，4-超清，默认为2
  */
 - (void)setPlayerWithContentId:(NSString *)contentId rate:(NSString *)rate authSuccess:(AuthSuccessBlock)authSuccessBlock authFailure:(AuthFailureBlock)authFailureBlock {
-    if(!_contentId&&[_rate isEqualToString:rate]){
+    if(!contentId&&[_rate isEqualToString:rate]){
         return;
     }
     if([_contentId isEqualToString:contentId]&&[_rate isEqualToString:rate]){
@@ -396,15 +396,17 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
     if(self->_switchRate){
         //切换码率
         NSString *proxyUrl = [[CNLiveHTTPProxyService manager] getProxyUrl:self.videoUrl];
-        self.switchPlayer = [[KSYMoviePlayerController alloc] initWithContentURL:[NSURL URLWithString:PLAYER_OpenCache?proxyUrl:self.videoUrl]];
-//        self.switchPlayer.view.frame = CGRectMake(0, 0, 200, 100);
-        self.switchPlayer.view.frame = self.view.bounds;
-        self.switchPlayer.view.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleHeight;
-        self.switchPlayer.shouldAutoplay = NO;
-        self.switchPlayer.shouldEnableKSYStatModule = NO;
-        [self.switchPlayer seekTo:self.player.currentPlaybackTime accurate:YES];
-        [self.switchPlayer prepareToPlay];
-        [self.view addSubview:self.switchPlayer.view];
+        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.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleHeight;
+        switchPlayer.shouldAutoplay = NO;
+        switchPlayer.shouldEnableKSYStatModule = NO;
+        [switchPlayer prepareToPlay];
+        [switchPlayer play];
+        [switchPlayer seekTo:self.player.currentPlaybackTime accurate:YES];
+        [self.view addSubview:switchPlayer.view];
+        self.switchPlayer = switchPlayer;
     }else{
         if(!self.player){
@@ -698,10 +700,51 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
 #pragma mark - 通知响应方法
 - (void)loadStateDidChange:(NSNotification *)notification {
-    MPMovieLoadState loadState = _player.loadState;
+    KSYMoviePlayerController *player = [notification object];
+    MPMovieLoadState loadState = player.loadState;
     if (PLAYER_TestEnvironment) {
         NSLog(@"CNLivePlayer-->播放器加载状态改变MPMovieLoadState：%ld", (unsigned long)loadState);
     }
+
+    //切换码率
+    if(_switchRate){
+        if((self.switchPlayer == player)&&(loadState == 3)){
+            [player seekTo:self.player.currentPlaybackTime accurate:NO];
+            [player play];
+            [self.player stop];
+            KSYMoviePlayerController *temp = self.player;
+            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];
+//            });
+            _switchRate = NO;
+        }
+    }
+    [_player play];
+
+}
+
+- (void)mediaIsPreparedToPlayDidChange:(NSNotification *)notification {
+    KSYMoviePlayerController *player = [notification object];
+    MPMovieLoadState loadState = player.loadState;
+
+    if (PLAYER_TestEnvironment) {
+        NSLog(@"CNLivePlayer-->播放器缓冲至可播放状态");
+    }
+
+    if (!_contentType || _contentType.length == 0) {
+        return;
+    }
+    if(!_statTimer){
+        _statTimer = [NSTimer scheduledTimerWithTimeInterval:30 target:self selector:@selector(statTimerAction) userInfo:nil repeats:YES];
+        
+    }
 }
@@ -746,29 +789,6 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
 }
-- (void)mediaIsPreparedToPlayDidChange:(NSNotification *)notification {
-    if (PLAYER_TestEnvironment) {
-        NSLog(@"CNLivePlayer-->播放器缓冲至可播放状态");
-    }
-    //切换码率
-    if(_switchRate){
-        [self.switchPlayer seekTo:self.player.currentPlaybackTime accurate:YES];
-        [self.player stop];
-        self.player = self.switchPlayer;
-        self.switchPlayer.shouldMute = NO;
-        _switchRate = NO;
-    }
-    [_player play];
-    if (!_contentType || _contentType.length == 0) {
-        return;
-    }
-    if(!_statTimer){
-        _statTimer = [NSTimer scheduledTimerWithTimeInterval:30 target:self selector:@selector(statTimerAction) userInfo:nil repeats:YES];
-
-    }
-    
-}
-
 - (void)mediaCacheDidChanged:(NSNotification *)notification {
     NSDictionary *userInfo = notification.userInfo;
     float progress = [userInfo[CacheProgressKey] floatValue];
@@ -850,6 +870,10 @@ NSString * const CNLiveHostStatusChangedNotification = @&quot;CNLiveAnchorStatusChang
     return _view;
 }
+- (void)setVideoDecoderMode:(CNLiveMovieVideoDecoderMode)videoDecoderMode{
+    _player.videoDecoderMode = (MPMovieVideoDecoderMode)videoDecoderMode;
+}
+
 - (void)setShouldMute:(BOOL)shouldMute {
     _player.shouldMute = shouldMute;
 }
@@ -28,7 +28,9 @@
                                              selector:@selector(mediaIsPreparedToPlayDidChange:)
                                                  name:MPMediaPlaybackIsPreparedToPlayDidChangeNotification
                                                object:nil];
-    self.player = [[CNLivePlayer alloc]initVodPlayerWithVideoId:@"82_c8ff347048414b7295cef882f8361073" authSuccess:^{
+    //82_c8ff347048414b7295cef882f8361073
+//    223_9855888ddc68402ca738bf302e535805
+    self.player = [[CNLivePlayer alloc]initVodPlayerWithVideoId:@"223_9855888ddc68402ca738bf302e535805" authSuccess:^{
         _player.view.frame = CGRectMake(0, 0, [UIScreen mainScreen].bounds.size.width, [UIScreen mainScreen].bounds.size.width*9/16.0);
         [_player prepareToPlay];
@@ -74,22 +76,49 @@
     UIButton *btn2 = [UIButton buttonWithType:UIButtonTypeCustom];
     btn2.frame = CGRectMake(0, 0, 100, 50);
-    btn2.center = CGPointMake(self.view.center.x, self.view.center.y+100);
+    btn2.center = CGPointMake(self.view.center.x-80, self.view.center.y+100);
     btn2.backgroundColor = [UIColor redColor];
-    [btn2 setTitle:@"切换码率" forState:UIControlStateNormal];
+    [btn2 setTitle:@"切换码率1" forState:UIControlStateNormal];
     [btn2 setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
     [btn2 addTarget:self action:@selector(btnDidClicked2) forControlEvents:UIControlEventTouchUpInside];
     [self.view addSubview:btn2];
     UIButton *btn3 = [UIButton buttonWithType:UIButtonTypeCustom];
     btn3.frame = CGRectMake(0, 0, 100, 50);
-    btn3.center = CGPointMake(self.view.center.x, self.view.center.y+200);
+    btn3.center = CGPointMake(self.view.center.x+80, self.view.center.y+100);
     btn3.backgroundColor = [UIColor redColor];
-    [btn3 setTitle:@"返回" forState:UIControlStateNormal];
+    [btn3 setTitle:@"切换码率2" forState:UIControlStateNormal];
     [btn3 setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
     [btn3 addTarget:self action:@selector(btnDidClicked3) forControlEvents:UIControlEventTouchUpInside];
     [self.view addSubview:btn3];
+    UIButton *btn4 = [UIButton buttonWithType:UIButtonTypeCustom];
+    btn4.frame = CGRectMake(0, 0, 100, 50);
+    btn4.center = CGPointMake(self.view.center.x-80, self.view.center.y+200);
+    btn4.backgroundColor = [UIColor redColor];
+    [btn4 setTitle:@"切换码率3" forState:UIControlStateNormal];
+    [btn4 setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+    [btn4 addTarget:self action:@selector(btnDidClicked4) forControlEvents:UIControlEventTouchUpInside];
+    [self.view addSubview:btn4];
+    
+    UIButton *btn5 = [UIButton buttonWithType:UIButtonTypeCustom];
+    btn5.frame = CGRectMake(0, 0, 100, 50);
+    btn5.center = CGPointMake(self.view.center.x+80, self.view.center.y+200);
+    btn5.backgroundColor = [UIColor redColor];
+    [btn5 setTitle:@"切换码率4" forState:UIControlStateNormal];
+    [btn5 setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+    [btn5 addTarget:self action:@selector(btnDidClicked5) forControlEvents:UIControlEventTouchUpInside];
+    [self.view addSubview:btn5];
+    
+    UIButton *btn6 = [UIButton buttonWithType:UIButtonTypeCustom];
+    btn6.frame = CGRectMake(0, 0, 100, 50);
+    btn6.center = CGPointMake(self.view.center.x, self.view.center.y+300);
+    btn6.backgroundColor = [UIColor redColor];
+    [btn6 setTitle:@"返回" forState:UIControlStateNormal];
+    [btn6 setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+    [btn6 addTarget:self action:@selector(btnDidClicked6) forControlEvents:UIControlEventTouchUpInside];
+    [self.view addSubview:btn6];
+    
 //    CNLivePlayerDownloader *dowa = [[CNLivePlayerDownloader alloc]initWithUrlString:@"http://wideo02.cnlive.com/video/data1/2017/0423/206473/800/c8ff347048414b7295cef882f8361073_206473_800.m3u8" progressBlock:^(float progress) {
 //        NSLog(@"缓存进度中%f",progress);
 //    }];
@@ -119,7 +148,7 @@
     __weak typeof(self) weakSelf = self;
     [_player setPlayerWithContentId:@"1066_716fabeaafb64236b60ecf74167c5c96" type:CNLivePlayerVod authSuccess:^{
         __strong typeof(self) strongSelf = weakSelf;
-//        [strongSelf.player prepareToPlay];
+        [strongSelf.player prepareToPlay];
     } authFailure:^(NSDictionary * _Nonnull errorInfo) {
@@ -130,9 +159,8 @@
 - (void)btnDidClicked2{
     self.state.text = @"切换中";
     __weak typeof(self) weakSelf = self;
-    [_player setPlayerWithContentId:nil rate:@"4" authSuccess:^{
+    [_player setPlayerWithContentId:nil rate:@"1" authSuccess:^{
         __strong typeof(self) strongSelf = weakSelf;
-        [strongSelf.player prepareToPlay];
     } authFailure:^(NSDictionary * _Nonnull errorInfo) {
     }];
@@ -140,6 +168,40 @@
 }
 - (void)btnDidClicked3{
+    self.state.text = @"切换中";
+    __weak typeof(self) weakSelf = self;
+    [_player setPlayerWithContentId:nil rate:@"2" authSuccess:^{
+        __strong typeof(self) strongSelf = weakSelf;
+    } authFailure:^(NSDictionary * _Nonnull errorInfo) {
+        
+    }];
+    
+}
+
+- (void)btnDidClicked4{
+    self.state.text = @"切换中";
+    __weak typeof(self) weakSelf = self;
+    [_player setPlayerWithContentId:nil rate:@"3" authSuccess:^{
+        __strong typeof(self) strongSelf = weakSelf;
+    } authFailure:^(NSDictionary * _Nonnull errorInfo) {
+        
+    }];
+    
+}
+
+- (void)btnDidClicked5{
+    self.state.text = @"切换中";
+    __weak typeof(self) weakSelf = self;
+    [_player setPlayerWithContentId:nil rate:@"4" authSuccess:^{
+        __strong typeof(self) strongSelf = weakSelf;
+    } authFailure:^(NSDictionary * _Nonnull errorInfo) {
+        
+    }];
+    
+}
+
+
+- (void)btnDidClicked6{
     [self dismissViewControllerAnimated:YES completion:nil];
 }