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

package/ios/VeLivePullImpl.m

@@ -32,8 +32,17 @@
 }
 
 - (NSDictionary *)callApiSync:(NSDictionary *)args {
-  [self newApiEngine];
-  return [self.volcApiEngine callApi:args];
+  __block NSDictionary *result = nil;
+  void (^work)(void) = ^{
+    [self newApiEngine];
+    result = [self.volcApiEngine callApi:args];
+  };
+  if ([NSThread isMainThread]) {
+    work();
+  } else {
+    dispatch_sync(dispatch_get_main_queue(), work);
+  }
+  return result;
 }
 
 //callback 是OC的回调函数，外层需要进一步封装，接收一个NSDictionary类型的参数

package/ios/VeLivePullView.m

@@ -44,22 +44,26 @@
 }
 
 - (void) insertSubview:(UIView *)view atIndex:(NSInteger)index {
-  [super insertSubview:view atIndex:index];
-  // 不需要在这里设置约束
+//  NSLog(@"insert playview, self bounds=%f x %f", self.bounds.size.width, self.bounds.size.height);
+//  NSLog(@"insert playview, view frame=%f x %f", view.frame.size.width, view.frame.size.height);
+    [super insertSubview:view atIndex:index];
+    [self setSubViewLayout:view];
 }
 
 - (void) addSubview:(UIView *)view {
-  [super addSubview:view];
+    [super addSubview:view];
+    [self setSubViewLayout:view];
 }
 
-- (void)layoutSubviews {
-  [super layoutSubviews];
-  // 遍历子视图，强制对齐 frame
-  for (UIView *subview in self.subviews) {
-    if (!CGRectEqualToRect(subview.frame, self.bounds)) {
-      subview.frame = self.bounds;
-    }
-  }
+// 设置 Auto Layout，确保 subView 始终匹配 view 尺寸
+- (void) setSubViewLayout:(UIView *)view {
+  view.translatesAutoresizingMaskIntoConstraints = NO;
+  [NSLayoutConstraint activateConstraints:@[
+    [view.leadingAnchor constraintEqualToAnchor:self.leadingAnchor],
+    [view.trailingAnchor constraintEqualToAnchor:self.trailingAnchor],
+    [view.topAnchor constraintEqualToAnchor:self.topAnchor],
+    [view.bottomAnchor constraintEqualToAnchor:self.bottomAnchor]
+  ]];
 }
 
-@end
+@end

package/ios/pictureInpicture/PictureInPictureManager.m

@@ -52,11 +52,17 @@ NSString *const kObserverKey = @"pip-observer";
     if (@available(iOS 14.2, *)) {
       _canStartPictureInPictureAutomaticallyFromInline = NO;
     }
+    // 监听从通知中心/后台返回活跃状态
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(handleAppDidBecomeActive)
+                                                 name:UIApplicationDidBecomeActiveNotification
+                                               object:nil];
   }
   return self;
 }
 
 - (void)dealloc {
+  [[NSNotificationCenter defaultCenter] removeObserver:self];
   [self disableVideoFrameObserver];
   [self stopPlaybackStateTimer];
 
@@ -68,6 +74,31 @@ NSString *const kObserverKey = @"pip-observer";
   [[VeLivePlayerMultiObserver sharedInstance] removeObserver:kObserverKey];
 }
 
+- (void)handleAppDidBecomeActive {
+
+  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.");
+        }];
+      });
+    }
+  }
+}
+
 // Start playback state refresh timer
 - (void)startPlaybackStateTimer {
   [self stopPlaybackStateTimer];
@@ -245,7 +276,7 @@ NSString *const kObserverKey = @"pip-observer";
   self.enableVideoObserver = YES;
   [self.player
       enableVideoFrameObserver:YES
-                   pixelFormat:VeLivePlayerPixelFormatBGRA32
+                   pixelFormat:VeLivePlayerPixelFormatNV12
                     bufferType:VeLivePlayerVideoBufferTypeSampleBuffer];
   [[VeLivePlayerMultiObserver sharedInstance] removeObserver:kObserverKey];
   [[VeLivePlayerMultiObserver sharedInstance] addObserver:kObserverKey
@@ -372,6 +403,20 @@ 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 处于非活跃（被遮挡）状态，暂时丢弃这一帧
+        return;
+    }
+
     // Ensure pipController exists and is valid, avoid processing buffer during
     // destruction
     if (!self.pipController || !self.enableVideoObserver) {
@@ -470,4 +515,4 @@ NSString *const kObserverKey = @"pip-observer";
   }
 }
 
-@end
+@end

package/package.json

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