@byteplus/react-native-live-pull 1.5.2-rc.2 → 1.5.2-rc.4

package/ios/VeLivePullImpl.m

@@ -32,17 +32,8 @@
 }
 
 - (NSDictionary *)callApiSync:(NSDictionary *)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;
+  [self newApiEngine];
+  return [self.volcApiEngine callApi:args];
 }
 
 //callback 是OC的回调函数，外层需要进一步封装，接收一个NSDictionary类型的参数

package/ios/VeLivePullView.m

@@ -46,13 +46,18 @@
 - (void) insertSubview:(UIView *)view atIndex:(NSInteger)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);
+  
+  dispatch_async(dispatch_get_main_queue(), ^{
     [super insertSubview:view atIndex:index];
     [self setSubViewLayout:view];
+  });
 }
 
 - (void) addSubview:(UIView *)view {
+  dispatch_async(dispatch_get_main_queue(), ^{
     [super addSubview:view];
     [self setSubViewLayout:view];
+  });
 }
 
 // 设置 Auto Layout，确保 subView 始终匹配 view 尺寸

package/ios/pictureInpicture/PictureInPictureManager.m

@@ -52,17 +52,11 @@ 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];
 
@@ -74,31 +68,6 @@ 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];
@@ -276,7 +245,7 @@ NSString *const kObserverKey = @"pip-observer";
   self.enableVideoObserver = YES;
   [self.player
       enableVideoFrameObserver:YES
-                   pixelFormat:VeLivePlayerPixelFormatNV12
+                   pixelFormat:VeLivePlayerPixelFormatBGRA32
                     bufferType:VeLivePlayerVideoBufferTypeSampleBuffer];
   [[VeLivePlayerMultiObserver sharedInstance] removeObserver:kObserverKey];
   [[VeLivePlayerMultiObserver sharedInstance] addObserver:kObserverKey
@@ -403,20 +372,6 @@ 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) {
@@ -515,4 +470,4 @@ NSString *const kObserverKey = @"pip-observer";
   }
 }
 
-@end
+@end

package/lib/commonjs/index.js

@@ -6183,6 +6183,7 @@ var TVLManager = function () {
     var _setEnableIgnoreAudioInterruption_decorators;
     var _setAllowsVideoRendering_decorators;
     var _addExtraHttpRequestHeadersByUser_decorators;
+    var _setOptionValue_decorators;
     _classThis = /** @class */ (function () {
         function TVLManager_1() {
             /** {zh}
@@ -6730,6 +6731,21 @@ var TVLManager = function () {
         TVLManager_1.prototype.addExtraHttpRequestHeadersByUser = function (headers) {
             throw new Error('not implement');
         };
+        /** {zh}
+         * @detail api
+         * @brief 设置播放器选项值
+         * @param value 选项值
+         * @param identifier 选项标识符
+         */
+        /** {en}
+         * @detail api
+         * @brief Sets player option value
+         * @param value Option value
+         * @param identifier Option identifier
+         */
+        TVLManager_1.prototype.setOptionValue = function (value, identifier) {
+            throw new Error('not implement');
+        };
         return TVLManager_1;
     }());
     __setFunctionName(_classThis, "TVLManager");
@@ -6768,6 +6784,7 @@ var TVLManager = function () {
         _setEnableIgnoreAudioInterruption_decorators = [NativeMethodSync('setEnableIgnoreAudioInterruption:')];
         _setAllowsVideoRendering_decorators = [NativeMethodSync('setAllowsVideoRendering:')];
         _addExtraHttpRequestHeadersByUser_decorators = [NativeMethodSync('addExtraHttpRequestHeadersByUser:')];
+        _setOptionValue_decorators = [NativeMethodSync('setOptionValue:forIdentifier:')];
         __esDecorate(_classThis, null, _static_setLogLevel_decorators, { kind: "method", name: "setLogLevel", static: true, private: false, access: { has: function (obj) { return "setLogLevel" in obj; }, get: function (obj) { return obj.setLogLevel; } }, metadata: _metadata }, null, _staticExtraInitializers);
         __esDecorate(_classThis, null, _static_getVersion_decorators, { kind: "method", name: "getVersion", static: true, private: false, access: { has: function (obj) { return "getVersion" in obj; }, get: function (obj) { return obj.getVersion; } }, metadata: _metadata }, null, _staticExtraInitializers);
         __esDecorate(_classThis, null, _init_decorators, { kind: "method", name: "init", static: false, private: false, access: { has: function (obj) { return "init" in obj; }, get: function (obj) { return obj.init; } }, metadata: _metadata }, null, _instanceExtraInitializers);
@@ -6797,6 +6814,7 @@ var TVLManager = function () {
         __esDecorate(_classThis, null, _setEnableIgnoreAudioInterruption_decorators, { kind: "method", name: "setEnableIgnoreAudioInterruption", static: false, private: false, access: { has: function (obj) { return "setEnableIgnoreAudioInterruption" in obj; }, get: function (obj) { return obj.setEnableIgnoreAudioInterruption; } }, metadata: _metadata }, null, _instanceExtraInitializers);
         __esDecorate(_classThis, null, _setAllowsVideoRendering_decorators, { kind: "method", name: "setAllowsVideoRendering", static: false, private: false, access: { has: function (obj) { return "setAllowsVideoRendering" in obj; }, get: function (obj) { return obj.setAllowsVideoRendering; } }, metadata: _metadata }, null, _instanceExtraInitializers);
         __esDecorate(_classThis, null, _addExtraHttpRequestHeadersByUser_decorators, { kind: "method", name: "addExtraHttpRequestHeadersByUser", static: false, private: false, access: { has: function (obj) { return "addExtraHttpRequestHeadersByUser" in obj; }, get: function (obj) { return obj.addExtraHttpRequestHeadersByUser; } }, metadata: _metadata }, null, _instanceExtraInitializers);
+        __esDecorate(_classThis, null, _setOptionValue_decorators, { kind: "method", name: "setOptionValue", static: false, private: false, access: { has: function (obj) { return "setOptionValue" in obj; }, get: function (obj) { return obj.setOptionValue; } }, metadata: _metadata }, null, _instanceExtraInitializers);
         __esDecorate(null, null, _observer_decorators, { kind: "field", name: "observer", static: false, private: false, access: { has: function (obj) { return "observer" in obj; }, get: function (obj) { return obj.observer; }, set: function (obj, value) { obj.observer = value; } }, metadata: _metadata }, _observer_initializers, _observer_extraInitializers);
         __esDecorate(null, null, _playerView_decorators, { kind: "field", name: "playerView", static: false, private: false, access: { has: function (obj) { return "playerView" in obj; }, get: function (obj) { return obj.playerView; }, set: function (obj, value) { obj.playerView = value; } }, metadata: _metadata }, _playerView_initializers, _playerView_extraInitializers);
         __esDecorate(null, null, _volume_decorators, { kind: "field", name: "volume", static: false, private: false, access: { has: function (obj) { return "volume" in obj; }, get: function (obj) { return obj.volume; }, set: function (obj, value) { obj.volume = value; } }, metadata: _metadata }, _volume_initializers, _volume_extraInitializers);
@@ -14646,6 +14664,8 @@ function initIOSPlayer(options) {
                 case 0:
                     viewId = options.viewId, option = __rest(options, ["viewId"]);
                     iosPlayer = new TVLManager();
+                    // 设置选项值
+                    iosPlayer.setOptionValue(1, 42866);
                     player = packObject(iosPlayer, VeLivePlayer);
                     config = new VeLivePlayerConfiguration();
                     Object.assign(config, defaultConfig, option);

package/lib/module/index.js

@@ -6181,6 +6181,7 @@ var TVLManager = function () {
     var _setEnableIgnoreAudioInterruption_decorators;
     var _setAllowsVideoRendering_decorators;
     var _addExtraHttpRequestHeadersByUser_decorators;
+    var _setOptionValue_decorators;
     _classThis = /** @class */ (function () {
         function TVLManager_1() {
             /** {zh}
@@ -6728,6 +6729,21 @@ var TVLManager = function () {
         TVLManager_1.prototype.addExtraHttpRequestHeadersByUser = function (headers) {
             throw new Error('not implement');
         };
+        /** {zh}
+         * @detail api
+         * @brief 设置播放器选项值
+         * @param value 选项值
+         * @param identifier 选项标识符
+         */
+        /** {en}
+         * @detail api
+         * @brief Sets player option value
+         * @param value Option value
+         * @param identifier Option identifier
+         */
+        TVLManager_1.prototype.setOptionValue = function (value, identifier) {
+            throw new Error('not implement');
+        };
         return TVLManager_1;
     }());
     __setFunctionName(_classThis, "TVLManager");
@@ -6766,6 +6782,7 @@ var TVLManager = function () {
         _setEnableIgnoreAudioInterruption_decorators = [NativeMethodSync('setEnableIgnoreAudioInterruption:')];
         _setAllowsVideoRendering_decorators = [NativeMethodSync('setAllowsVideoRendering:')];
         _addExtraHttpRequestHeadersByUser_decorators = [NativeMethodSync('addExtraHttpRequestHeadersByUser:')];
+        _setOptionValue_decorators = [NativeMethodSync('setOptionValue:forIdentifier:')];
         __esDecorate(_classThis, null, _static_setLogLevel_decorators, { kind: "method", name: "setLogLevel", static: true, private: false, access: { has: function (obj) { return "setLogLevel" in obj; }, get: function (obj) { return obj.setLogLevel; } }, metadata: _metadata }, null, _staticExtraInitializers);
         __esDecorate(_classThis, null, _static_getVersion_decorators, { kind: "method", name: "getVersion", static: true, private: false, access: { has: function (obj) { return "getVersion" in obj; }, get: function (obj) { return obj.getVersion; } }, metadata: _metadata }, null, _staticExtraInitializers);
         __esDecorate(_classThis, null, _init_decorators, { kind: "method", name: "init", static: false, private: false, access: { has: function (obj) { return "init" in obj; }, get: function (obj) { return obj.init; } }, metadata: _metadata }, null, _instanceExtraInitializers);
@@ -6795,6 +6812,7 @@ var TVLManager = function () {
         __esDecorate(_classThis, null, _setEnableIgnoreAudioInterruption_decorators, { kind: "method", name: "setEnableIgnoreAudioInterruption", static: false, private: false, access: { has: function (obj) { return "setEnableIgnoreAudioInterruption" in obj; }, get: function (obj) { return obj.setEnableIgnoreAudioInterruption; } }, metadata: _metadata }, null, _instanceExtraInitializers);
         __esDecorate(_classThis, null, _setAllowsVideoRendering_decorators, { kind: "method", name: "setAllowsVideoRendering", static: false, private: false, access: { has: function (obj) { return "setAllowsVideoRendering" in obj; }, get: function (obj) { return obj.setAllowsVideoRendering; } }, metadata: _metadata }, null, _instanceExtraInitializers);
         __esDecorate(_classThis, null, _addExtraHttpRequestHeadersByUser_decorators, { kind: "method", name: "addExtraHttpRequestHeadersByUser", static: false, private: false, access: { has: function (obj) { return "addExtraHttpRequestHeadersByUser" in obj; }, get: function (obj) { return obj.addExtraHttpRequestHeadersByUser; } }, metadata: _metadata }, null, _instanceExtraInitializers);
+        __esDecorate(_classThis, null, _setOptionValue_decorators, { kind: "method", name: "setOptionValue", static: false, private: false, access: { has: function (obj) { return "setOptionValue" in obj; }, get: function (obj) { return obj.setOptionValue; } }, metadata: _metadata }, null, _instanceExtraInitializers);
         __esDecorate(null, null, _observer_decorators, { kind: "field", name: "observer", static: false, private: false, access: { has: function (obj) { return "observer" in obj; }, get: function (obj) { return obj.observer; }, set: function (obj, value) { obj.observer = value; } }, metadata: _metadata }, _observer_initializers, _observer_extraInitializers);
         __esDecorate(null, null, _playerView_decorators, { kind: "field", name: "playerView", static: false, private: false, access: { has: function (obj) { return "playerView" in obj; }, get: function (obj) { return obj.playerView; }, set: function (obj, value) { obj.playerView = value; } }, metadata: _metadata }, _playerView_initializers, _playerView_extraInitializers);
         __esDecorate(null, null, _volume_decorators, { kind: "field", name: "volume", static: false, private: false, access: { has: function (obj) { return "volume" in obj; }, get: function (obj) { return obj.volume; }, set: function (obj, value) { obj.volume = value; } }, metadata: _metadata }, _volume_initializers, _volume_extraInitializers);
@@ -14644,6 +14662,8 @@ function initIOSPlayer(options) {
                 case 0:
                     viewId = options.viewId, option = __rest(options, ["viewId"]);
                     iosPlayer = new TVLManager();
+                    // 设置选项值
+                    iosPlayer.setOptionValue(1, 42866);
                     player = packObject(iosPlayer, VeLivePlayer);
                     config = new VeLivePlayerConfiguration();
                     Object.assign(config, defaultConfig, option);

package/lib/typescript/codegen/ios/api.d.ts

@@ -292,4 +292,12 @@ export declare class TVLManager {
     setEnableIgnoreAudioInterruption(enable: BOOL): void;
     setAllowsVideoRendering(enable: BOOL): void;
     addExtraHttpRequestHeadersByUser(headers: NSDictionary): void;
+    
+    /** {en}
+     * @detail api
+     * @brief Sets player option value
+     * @param value Option value
+     * @param identifier Option identifier
+     */
+    setOptionValue(value: id, identifier: int): void;
 }

package/package.json

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