@volcengine/react-native-live-pull 1.5.2-rc.2 → 1.5.2-rc.3

package/ios/pictureInpicture/PictureInPictureManager.m

@@ -26,9 +26,23 @@
         *pipObservers;
 // Add timer to refresh playback state
 @property(nonatomic, strong) NSTimer *playbackStateTimer;
+@property(nonatomic, assign) NSTimeInterval lastStateSwitchTime;
+@property(nonatomic, assign) UIApplicationState lastAppState;
+@property(nonatomic, assign) NSTimeInterval lastRebindTime;
+@property(nonatomic, copy) NSString *pipTraceId;
+@property(nonatomic, assign) NSTimeInterval lastDropLogTime;
+@property(nonatomic, assign) NSUInteger enqueueCount;
+@property(nonatomic, assign) NSUInteger dropInactiveCount;
+@property(nonatomic, assign) NSUInteger dropCooldownCount;
+@property(nonatomic, assign) NSUInteger dropNotReadyCount;
+@property(nonatomic, assign) NSUInteger dropNoControllerCount;
 @end
 
 NSString *const kObserverKey = @"pip-observer";
+static const NSTimeInterval kStateSwitchCooldownSeconds = 0.3;
+static const NSTimeInterval kRebindCooldownSeconds = 1.0;
+static const NSTimeInterval kDropLogIntervalSeconds = 1.0;
+static const NSTimeInterval kFrameStatsLogIntervalSeconds = 5.0;
 
 @implementation VeLivePictureInPictureManager
 
@@ -52,6 +66,16 @@ NSString *const kObserverKey = @"pip-observer";
     if (@available(iOS 14.2, *)) {
       _canStartPictureInPictureAutomaticallyFromInline = NO;
     }
+    _lastStateSwitchTime = 0;
+    _lastAppState = UIApplicationStateActive;
+    _lastRebindTime = 0;
+    _lastDropLogTime = 0;
+    _enqueueCount = 0;
+    _dropInactiveCount = 0;
+    _dropCooldownCount = 0;
+    _dropNotReadyCount = 0;
+    _dropNoControllerCount = 0;
+    _pipTraceId = [[NSUUID UUID] UUIDString];
     // 监听从通知中心/后台返回活跃状态
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(handleAppDidBecomeActive)
@@ -61,6 +85,19 @@ NSString *const kObserverKey = @"pip-observer";
   return self;
 }
 
+- (UIApplicationState)currentApplicationStateSafe {
+  __block UIApplicationState state = UIApplicationStateInactive;
+  void (^readState)(void) = ^{
+    state = [UIApplication sharedApplication].applicationState;
+  };
+  if ([NSThread isMainThread]) {
+    readState();
+  } else {
+    dispatch_sync(dispatch_get_main_queue(), readState);
+  }
+  return state;
+}
+
 - (void)dealloc {
   [[NSNotificationCenter defaultCenter] removeObserver:self];
   [self disableVideoFrameObserver];
@@ -74,29 +111,54 @@ NSString *const kObserverKey = @"pip-observer";
   [[VeLivePlayerMultiObserver sharedInstance] removeObserver:kObserverKey];
 }
 
+- (void)logDropIfNeeded:(NSString *)reason state:(UIApplicationState)state {
+  NSTimeInterval now = CFAbsoluteTimeGetCurrent();
+  if (self.lastDropLogTime > 0 &&
+      now - self.lastDropLogTime < kDropLogIntervalSeconds) {
+    return;
+  }
+  self.lastDropLogTime = now;
+  NSLog(@"PIP[%@] drop frame reason=%@ state=%ld elapsedSinceSwitch=%.3f",
+        self.pipTraceId, reason, (long)state,
+        (self.lastStateSwitchTime > 0 ? now - self.lastStateSwitchTime : -1.0));
+}
+
 - (void)handleAppDidBecomeActive {
+  if (!self.pipController || !self.contentView) {
+    return;
+  }
+  AVPictureInPictureController *controller =
+      [self.pipController pictureInPictureController];
+  if (!controller || !controller.isPictureInPictureActive) {
+    return;
+  }
 
-  if (self.pipController && [self.pipController pictureInPictureController]) {
-  // 只有在 PIP 开启状态下才需要重连，避免干扰正常播放
-    AVPictureInPictureController *controller =
-        [self.pipController pictureInPictureController];
-    if (controller.isPictureInPictureActive) {
-      __weak typeof(self) weakSelf = self;
-      dispatch_async(dispatch_get_main_queue(), ^{
-        __strong typeof(weakSelf) strongSelf = weakSelf;
-        if (!strongSelf) return;
-        // 强制重新绑定 ContentView。
-        // 这会诱导底层重新创建 IOSurface，修复内核日志中的 SID: 0x0 报错。
-        [strongSelf.pipController setContentView:strongSelf.contentView completion:^{
-            __strong typeof(weakSelf) strongSelf = weakSelf;
-            if (!strongSelf) return;
-            // 刷新播放状态，确保画面立即同步
-            [[strongSelf.pipController pictureInPictureController] invalidatePlaybackState];
-            NSLog(@"PIP: App active, re-bound Surface to fix potential corruption.");
-        }];
-      });
-    }
+  // Keep a short guard window after state switch.
+  NSTimeInterval now = CFAbsoluteTimeGetCurrent();
+  if (self.lastStateSwitchTime > 0 &&
+      now - self.lastStateSwitchTime < kStateSwitchCooldownSeconds) {
+    return;
   }
+  // Avoid repeated rebind storms when app repeatedly toggles active/inactive.
+  if (self.lastRebindTime > 0 &&
+      now - self.lastRebindTime < kRebindCooldownSeconds) {
+    return;
+  }
+  self.lastRebindTime = now;
+
+  __weak typeof(self) weakSelf = self;
+  dispatch_async(dispatch_get_main_queue(), ^{
+    __strong typeof(weakSelf) strongSelf = weakSelf;
+    if (!strongSelf) return;
+    [strongSelf.pipController setContentView:strongSelf.contentView
+                                  completion:^{
+                                    __strong typeof(weakSelf) strongSelf = weakSelf;
+                                    if (!strongSelf) return;
+                                    [[strongSelf.pipController pictureInPictureController]
+                                        invalidatePlaybackState];
+                                    NSLog(@"PIP: App active, re-bound content view.");
+                                  }];
+  });
 }
 
 // Start playback state refresh timer
@@ -106,15 +168,15 @@ NSString *const kObserverKey = @"pip-observer";
   if (self.pipController && [self.pipController pictureInPictureController]) {
     // Use main thread timer to ensure UI updates on main thread
     self.playbackStateTimer = [NSTimer
-        scheduledTimerWithTimeInterval:1.0
+        scheduledTimerWithTimeInterval:kFrameStatsLogIntervalSeconds
                                 target:self
-                              selector:@selector(invalidatePlaybackState)
+                              selector:@selector(logFrameStats)
                               userInfo:nil
                                repeats:YES];
     // Add timer to main run loop
     [[NSRunLoop mainRunLoop] addTimer:self.playbackStateTimer
                               forMode:NSRunLoopCommonModes];
-    NSLog(@"PIP: Started playback state timer");
+    NSLog(@"PIP[%@] Started frame stats timer", self.pipTraceId);
   }
 }
 
@@ -123,7 +185,7 @@ NSString *const kObserverKey = @"pip-observer";
   if (self.playbackStateTimer) {
     [self.playbackStateTimer invalidate];
     self.playbackStateTimer = nil;
-    NSLog(@"PIP: Stopped playback state timer");
+    NSLog(@"PIP[%@] Stopped frame stats timer", self.pipTraceId);
   }
 }
 
@@ -138,6 +200,15 @@ NSString *const kObserverKey = @"pip-observer";
   }
 }
 
+- (void)logFrameStats {
+  NSLog(@"PIP[%@] frame stats enqueue=%lu dropInactive=%lu dropCooldown=%lu dropNotReady=%lu dropNoController=%lu",
+        self.pipTraceId, (unsigned long)self.enqueueCount,
+        (unsigned long)self.dropInactiveCount,
+        (unsigned long)self.dropCooldownCount,
+        (unsigned long)self.dropNotReadyCount,
+        (unsigned long)self.dropNoControllerCount);
+}
+
 - (void)setupPlayer:(TVLManager *)player {
   [self ensurePipControllerReady:player completion:nil];
 }
@@ -212,6 +283,14 @@ NSString *const kObserverKey = @"pip-observer";
   self.pipController = [[VePictureInPictureController alloc]
       initWithType:VePictureInPictureTypeContentSource
        contentView:self.player.playerView];
+  self.pipTraceId = [[NSUUID UUID] UUIDString];
+  self.enqueueCount = 0;
+  self.dropInactiveCount = 0;
+  self.dropCooldownCount = 0;
+  self.dropNotReadyCount = 0;
+  self.dropNoControllerCount = 0;
+  NSLog(@"PIP[%@] init controller contentView=%p playerView=%p", self.pipTraceId,
+        self.contentView, self.player.playerView);
   [self.pipController setRenderMode:1];
   self.pipController.delegate = self;
   self.pipController.autoConfigAudioSession = YES;
@@ -403,38 +482,105 @@ NSString *const kObserverKey = @"pip-observer";
 - (void)onRenderVideoFrame:(TVLManager *_Nonnull)player
                 videoFrame:(VeLivePlayerVideoFrame *_Nonnull)videoFrame {
   @autoreleasepool {
-    UIApplicationState state = [UIApplication sharedApplication].applicationState;
-    
-    // 【核心修正】
-    // 1. 如果是 Active (前台)，正常推流。
-    // 2. 如果是 Background (正常画中画/后台)，正常推流。
-    // 3. 【拦截】只有当状态是 Inactive 时：
-    //    这通常对应“下拉通知中心”、“拉下控制中心”或“系统弹窗”遮挡。
-    //    此时日志中的 SID: 0x0 报错最集中，必须拦截推流以保护内核句柄。
-    NSLog(@"PIP: Application state is %ld", (long)state);
-    if (state == UIApplicationStateInactive) {
-        // 如果正在画中画过程中，且 App 处于非活跃（被遮挡）状态，暂时丢弃这一帧
+    UIApplicationState currentState = [self currentApplicationStateSafe];
+
+    // 1) Detect foreground/background switches and start cooldown.
+    if (currentState != self.lastAppState) {
+      self.lastAppState = currentState;
+      self.lastStateSwitchTime = CFAbsoluteTimeGetCurrent();
+      NSLog(@"PIP[%@] app state changed -> %ld", self.pipTraceId,
+            (long)currentState);
+    }
+
+    // 2) Block enqueue for 300ms after state switch.
+    if (self.lastStateSwitchTime > 0) {
+      NSTimeInterval elapsed =
+          CFAbsoluteTimeGetCurrent() - self.lastStateSwitchTime;
+      if (elapsed < kStateSwitchCooldownSeconds) {
+        self.dropCooldownCount += 1;
+        [self logDropIfNeeded:@"cooldown" state:currentState];
         return;
+      }
+    }
+
+    // 3) Block Inactive while Control Center/Notification shade is presented.
+    NSLog(@"PIP: Application state is %ld", (long)currentState);
+    if (currentState == UIApplicationStateInactive) {
+      self.dropInactiveCount += 1;
+      [self logDropIfNeeded:@"inactive" state:currentState];
+      return;
     }
 
     // Ensure pipController exists and is valid, avoid processing buffer during
     // destruction
     if (!self.pipController || !self.enableVideoObserver) {
+      self.dropNoControllerCount += 1;
+      [self logDropIfNeeded:@"no_controller_or_observer" state:currentState];
       return;
     }
 
     if (@available(iOS 15.0, *)) {
+      // 4) Enqueue on main queue to let UI/lifecycle transitions settle first.
+      CVPixelBufferRef pixelBuffer = NULL;
+      CMSampleBufferRef sampleBuffer = NULL;
       if (videoFrame.bufferType == VeLivePlayerVideoBufferTypePixelBuffer) {
-        CVPixelBufferRef pixelBuffer = videoFrame.pixelBuffer;
-        if (pixelBuffer != NULL) {
-          [self.pipController enqueuePixelBuffer:pixelBuffer];
+        pixelBuffer = videoFrame.pixelBuffer;
+        if (pixelBuffer) {
+          CVBufferRetain(pixelBuffer);
         }
       } else if (videoFrame.bufferType ==
                  VeLivePlayerVideoBufferTypeSampleBuffer) {
+        sampleBuffer = videoFrame.sampleBuffer;
+        if (sampleBuffer) {
+          CFRetain(sampleBuffer);
+        }
+      }
+
+      if (!pixelBuffer && !sampleBuffer) {
+        self.dropNotReadyCount += 1;
+        [self logDropIfNeeded:@"no_buffer" state:currentState];
+        return;
+      }
+
+      dispatch_async(dispatch_get_main_queue(), ^{
+        if ([self currentApplicationStateSafe] == UIApplicationStateInactive) {
+          if (pixelBuffer) {
+            CVBufferRelease(pixelBuffer);
+          }
+          if (sampleBuffer) {
+            CFRelease(sampleBuffer);
+          }
+          return;
+        }
+        if (!self.pipController || !self.enableVideoObserver) {
+          if (pixelBuffer) {
+            CVBufferRelease(pixelBuffer);
+          }
+          if (sampleBuffer) {
+            CFRelease(sampleBuffer);
+          }
+          return;
+        }
+        if (pixelBuffer) {
+          [self.pipController enqueuePixelBuffer:pixelBuffer];
+          CVBufferRelease(pixelBuffer);
+          self.enqueueCount += 1;
+        } else if (sampleBuffer) {
+          [self.pipController enqueueSampleBuffer:sampleBuffer];
+          CFRelease(sampleBuffer);
+          self.enqueueCount += 1;
+        }
+      });
+    } else {
+      // iOS < 15 fallback: keep existing direct path.
+      if (videoFrame.bufferType == VeLivePlayerVideoBufferTypeSampleBuffer) {
         CMSampleBufferRef sampleBuffer = videoFrame.sampleBuffer;
         if (sampleBuffer != NULL) {
           [self.pipController enqueueSampleBuffer:sampleBuffer];
+          self.enqueueCount += 1;
         }
+      } else {
+        self.dropNotReadyCount += 1;
       }
     }
   }
@@ -459,6 +605,8 @@ NSString *const kObserverKey = @"pip-observer";
             (VePictureInPictureController *)pictureInPictureController
                      statusChanged:(VePictureInPictureStatus)fromStatus
                                 to:(VePictureInPictureStatus)toStatus {
+  NSLog(@"PIP[%@] status changed from=%ld to=%ld", self.pipTraceId,
+        (long)fromStatus, (long)toStatus);
   switch (toStatus) {
   case VePictureInPictureStatusIde: {
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volcengine/react-native-live-pull",
-  "version": "1.5.2-rc.2",
+  "version": "1.5.2-rc.3",
   "peerDependencies": {
     "react": "*",
     "react-native": "*"