Merge branch 'master' of https://github.com/anyrtcIO-Community/anyRTC-RTMP-OpenSource

Author: LxzBUG

Prj-iOS/ARLiveKit/ARLiveEngineKit.mm

@@ -55,6 +55,9 @@ - (instancetype)initWithDelegate:(id<ARLiveEngineDelegate>)delegate {
         if (liveEngine == NULL) {
             liveEngine = anyrtc::createArLive2Engine();
             liveEngine->initialize(nil);
+            
+            [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(enterBackground:) name:UIApplicationDidEnterBackgroundNotification object:nil];
+            [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(becomeActive:) name:UIApplicationDidBecomeActiveNotification object:nil];
         } else {
             return nil;
         }
@@ -100,4 +103,18 @@ - (void)releaseArLivePlayer: (ARLivePlayer *)player {
     }
 }
 
+// MARK: - private
+
+- (void)enterBackground:(NSNotification *)notification {
+    if (liveEngine) {
+        liveEngine->setAppInBackground(true);
+    }
+}
+
+- (void)becomeActive:(NSNotification *)notification {
+    if (liveEngine) {
+        liveEngine->setAppInBackground(false);
+    }
+}
+
 @end

Prj-iOS/ARLiveKit/ARLivePlayer.mm

@@ -122,17 +122,16 @@ void onVodPlaybackProcess(anyrtc::IArLivePlayer *player, int allDuration, int cu
 
     void onStatisticsUpdate(anyrtc::IArLivePlayer *player, anyrtc::ArLivePlayerStatistics statistics) override {
         /// 直播播放器统计数据回调
+        ARLivePlayerStatistics *playerStatistics = [[ARLivePlayerStatistics alloc] init];
+        playerStatistics.width = statistics.width;
+        playerStatistics.height = statistics.height;
+        playerStatistics.fps = statistics.fps;
+        playerStatistics.videoBitrate = statistics.videoBitrate;
+        playerStatistics.audioBitrate = statistics.audioBitrate;
+        
         void(^functionBlock)() = ^(){
             if (!isDestroy()) {
                 if ([play_delegate_ respondsToSelector:@selector(onStatisticsUpdate:statistics:)]) {
-                    ARLivePlayerStatistics *playerStatistics = [[ARLivePlayerStatistics alloc] init];
-                    playerStatistics.appCpu = statistics.appCpu;
-                    playerStatistics.systemCpu = statistics.systemCpu;
-                    playerStatistics.width = statistics.width;
-                    playerStatistics.height = statistics.height;
-                    playerStatistics.fps = statistics.fps;
-                    playerStatistics.videoBitrate = statistics.videoBitrate;
-                    playerStatistics.audioBitrate = statistics.audioBitrate;
                     [play_delegate_ onStatisticsUpdate:playerKit_ statistics:playerStatistics];
                 }
             }
@@ -161,10 +160,10 @@ void onRenderVideoFrame(anyrtc::IArLivePlayer *player, const anyrtc::ArLiveVideo
 
     void onReceiveSeiMessage(anyrtc::IArLivePlayer *player, int payloadType, const uint8_t *data, uint32_t dataSize) override {
         /// 收到 SEI 消息的回调，发送端通过 {@link ArLivePusher} 中的 `sendSeiMessage` 来发送 SEI 消息
+        NSData *seiData = [NSData dataWithBytes:data length:dataSize];
         void(^functionBlock)() = ^(){
             if (!isDestroy()) {
                 if ([play_delegate_ respondsToSelector:@selector(onReceiveSeiMessage:payloadType:data:)]) {
-                    NSData *seiData = [NSData dataWithBytes:data length:dataSize];
                     [play_delegate_ onReceiveSeiMessage:playerKit_ payloadType:payloadType data:seiData];
                 }
             }
@@ -303,16 +302,25 @@ - (int)isPlaying {
 
 - (int)seekTo:(int)seekTimeS {
     /// 跳转进度
+    if (_livePlayer) {
+        return _livePlayer->seekTo(seekTimeS);
+    }
     return -1;
 }
 
 - (int)setSpeed:(CGFloat)speed {
     /// 倍速播放
+    if (_livePlayer) {
+        return _livePlayer->setSpeed(speed);
+    }
     return -1;
 }
 
 - (int)replay {
     /// 重新开始播放。一般用于点播场景
+    if (_livePlayer) {
+        _livePlayer->rePlay();
+    }
     return -1;
 }
 

Prj-iOS/ARLiveKit/ARLivePusher.mm

@@ -94,16 +94,15 @@ virtual void onPushStatusUpdate(anyrtc::ArLivePushStatus state, const char* msg,
 
     virtual void onStatisticsUpdate(anyrtc::ArLivePusherStatistics statistics) {
         /// 直播推流器统计数据回调
+        ARLivePusherStatistics *playerStatistics = [[ARLivePusherStatistics alloc] init];
+        playerStatistics.width = statistics.width;
+        playerStatistics.height = statistics.height;
+        playerStatistics.fps = statistics.fps;
+        playerStatistics.videoBitrate = statistics.videoBitrate;
+        playerStatistics.audioBitrate = statistics.audioBitrate;
+        
         void(^functionBlock)() = ^(){
             if ([push_delegate_ respondsToSelector:@selector(onStatisticsUpdate:)]) {
-                ARLivePusherStatistics *playerStatistics = [[ARLivePusherStatistics alloc] init];
-                playerStatistics.appCpu = statistics.appCpu;
-                playerStatistics.systemCpu = statistics.systemCpu;
-                playerStatistics.width = statistics.width;
-                playerStatistics.height = statistics.height;
-                playerStatistics.fps = statistics.fps;
-                playerStatistics.videoBitrate = statistics.videoBitrate;
-                playerStatistics.audioBitrate = statistics.audioBitrate;
                 [push_delegate_ onStatisticsUpdate:playerStatistics];
             }
         };

Prj-iOS/Live_All.xcworkspace/xcuserdata/yusheng.xcuserdatad/UserInterfaceState.xcuserstate

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2022 The WebRTC project authors. All Rights Reserved.
+ *  Copyright 2023 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source