@byteplus/react-native-live-pull 1.1.3-rc.3 → 1.2.0-rc.0

package/lib/typescript/core/api.d.ts

@@ -96,6 +96,19 @@ declare module '../codegen/pack/api' {
          * @order 7
          */
         setEnableIgnoreAudioInterruption(enable: boolean): void;
+        /**
+         * {zh}
+         * @brief 添加用户自定义的HTTP请求头
+         * @param headers 用户自定义的HTTP请求头
+         * @order 8
+         */
+        /**
+         * {en}
+         * @brief Add user-defined HTTP request headers
+         * @param headers User-defined HTTP request headers
+         * @order 8
+         */
+        addExtraHttpRequestHeadersByUser(headers: Record<string, string>): void;
     }
 }
 export { VeLivePlayer };

package/lib/typescript/core/keytype.d.ts

@@ -1,17 +1,33 @@
 declare module '../codegen/pack/keytype' {
+    interface VeLivePlayerStreamData {
+        
+        /** {en}
+         * @brief A list of main stream addresses. See [VeLivePlayerStream](#VeLivePlayerStreamData-VeLivePlayerStream) for details.
+         *
+         */
+        get mainStreamList(): VeLivePlayerStream[];
+        set mainStreamList(value: VeLivePlayerStream[]);
+        
+        /** {en}
+         * @brief A list of backup stream addresses. See [VeLivePlayerStream](#VeLivePlayerStreamData-VeLivePlayerStream) for details.
+         *
+         */
+        get backupStreamList(): VeLivePlayerStream[];
+        set backupStreamList(value: VeLivePlayerStream[]);
+    }
     interface VeLivePlayerStatistics {
         
         /** {en}
          * @brief The video format.
          *
          */
-        format: VeLivePlayerFormat;
+        get format(): VeLivePlayerFormat;
         
         /** {en}
          * @brief The transmission protocol of the live stream.
          *
          */
-        protocol: VeLivePlayerProtocol;
+        get protocol(): VeLivePlayerProtocol;
     }
 }
 export { VeLivePlayerAudioBufferType, VeLivePlayerAudioFrame, VeLivePlayerConfiguration, VeLivePlayerFillMode, VeLivePlayerFormat, VeLivePlayerLogLevel, VeLivePlayerMirror, VeLivePlayerPixelFormat, VeLivePlayerProtocol, VeLivePlayerResolution, VeLivePlayerResolutionSwitchReason, VeLivePlayerRotation, VeLivePlayerStatistics, VeLivePlayerStatus, VeLivePlayerStream, VeLivePlayerStreamData, VeLivePlayerStreamType, VeLivePlayerVideoBufferType, VeLivePlayerVideoFrame, } from '../codegen/pack/keytype';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@byteplus/react-native-live-pull",
-  "version": "1.1.3-rc.3",
+  "version": "1.2.0-rc.0",
   "peerDependencies": {
     "react": "*",
     "react-native": "*"

package/react-native-velive-pull.podspec

@@ -15,6 +15,15 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/volcengine/volcengine-specs.git", :tag => "#{s.version}" }
 
   s.source_files = "ios/**/*.{h,m,mm}"
+  s.static_framework = true
+  s.preserve_paths = ['ios/include/react-native-velive-pull.modulemap']
+  
+  s.pod_target_xcconfig = {
+    'DEFINES_MODULE' => 'YES',
+    'SWIFT_INCLUDE_PATHS' => '$(PODS_TARGET_SRCROOT)/ios/include',
+    'MODULEMAP_FILE' => '$(PODS_TARGET_SRCROOT)/ios/include/react-native-velive-pull.modulemap',
+    'CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES' => 'YES'
+  }
 
   # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
   # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.
@@ -39,7 +48,7 @@ Pod::Spec.new do |s|
    end
   end
 
-  s.dependency 'VolcApiEngine', '1.2.3'   
-  s.dependency 'TTSDKFramework/Core', '1.41.300.7-premium'
-  s.dependency 'TTSDKFramework/LivePull-RTS', '1.41.300.7-premium'
+  s.dependency 'VolcApiEngine', '1.6.2'
+  s.dependency 'TTSDKFramework/Core', '1.46.300.1-premium'
+  s.dependency 'TTSDKFramework/LivePull-RTS', '1.46.300.1-premium'
 end

package/ios/pictureInpicture/VeLivePictureInPictureController.h

@@ -1,207 +0,0 @@
-      
-//
-// VeLivePictureInPictureController.h
-// VELLiveDemo
-// 
-// Created by Bytedance on 2023-06-09
-//
-//
-
-#import <UIKit/UIKit.h>
-#import <AVKit/AVKit.h>
-#import <AVFoundation/AVFoundation.h>
-
-//  {zh} 是否开启 iOS 15 以下画中画支持  {en} Whether to enable PIP support below iOS 15
-//  {zh} 会调用未公开 API， 可能会有审核风险，请业务自行决定是否开启  {en} The undisclosed API will be called, and there may be audit risks. Please decide whether to open it or not.
-#define VEL_PICTURE_IN_PICTURE_ENABLE_PIP_BELOW_IOS_15 0
-
-#ifndef VeLivePipLog
-#   ifdef VELLogDebug
-#       define VeLivePipLog(tag, fmt, ...) VELLogDebug(tag, fmt, ##__VA_ARGS__)
-#   else
-#       define VeLivePipLog(tag, fmt, ...) NSLog((@"[%@] [%s] [%d] " fmt), tag, __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__);
-#   endif
-#endif
-
-#ifndef VeLivePipError
-#   define VeLivePipError(c, des) [NSError errorWithDomain:VeLivePictureInPictureErrorDomain code:c userInfo:@{NSLocalizedDescriptionKey : des}]
-#endif
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class VeLivePictureInPictureController;
-@protocol VeLivePictureInPictureDelegate <NSObject>
-@optional
-//  {zh} 画中画准备完成  {en} PIP ready to complete
-- (void)pictureInPictureIsReady:(VeLivePictureInPictureController *)pictureInPicture;
-
-//  {zh} 画中画将要开始  {en} PIP is about to start
-- (void)pictureInPictureWillStart:(VeLivePictureInPictureController *)pictureInPicture;
-
-//  {zh} 画中画已经开始  {en} Picture-in-picture has begun
-- (void)pictureInPictureDidStart:(VeLivePictureInPictureController *)pictureInPicture;
-
-//  {zh} 画中画启动失败  {en} Picture-in-picture startup failed
-- (void)pictureInPicture:(VeLivePictureInPictureController *)pictureInPicture
-  failedToStartWithError:(NSError *)error;
-
-//  {zh} 画中画将要结束  {en} Picture-in-picture is coming to an end
-- (void)pictureInPictureWillStop:(VeLivePictureInPictureController *)pictureInPicture isUserStop:(BOOL)isUserStop;
-
-//  {zh} 画中画已经结束  {en} Picture-in-picture is over
-- (void)pictureInPictureDidStop:(VeLivePictureInPictureController *)pictureInPicture isUserStop:(BOOL)isUserStop;
-
-//  {zh} 画中画将要结束，需要重新布局原来的画面  {en} The picture-in-picture is about to end, and the original picture needs to be rearranged.
-//  {zh} 如果没有实现当前代理，内部会自动布局，contentView 和其父视图大小完全一致  {en} If the current proxy is not implemented, the interior is automatically laid out, and the contentView is exactly the same size as its parent view
-- (void)pictureInPicture:(VeLivePictureInPictureController *)pictureInPicture
-restoreUserInterfaceWithCompletionHandler:(void (^)(BOOL restored))completionHandler
-              isUserStop:(BOOL)isUserStop;
-@end
-
-typedef NS_ENUM(NSInteger, VeLivePictureInPictureErrorCode) {
-    VeLivePictureInPictureErrorCodeAlreadyStarted = 0,
-    VeLivePictureInPictureErrorCodeFailed = -1001,
-    VeLivePictureInPictureErrorCodePlayTemplateFileFailed = -1002,
-    VeLivePictureInPictureErrorCodeTemplateFileNotFound = -1003,
-    VeLivePictureInPictureErrorCodeNotPossible = -1004,
-};
-
-typedef NS_ENUM(NSInteger, VeLivePictureInPictureState) {
-    VeLivePictureInPictureStateIde = 0,
-    VeLivePictureInPictureStatePreparing = 1,
-    VeLivePictureInPictureStateReady = 2,
-    VeLivePictureInPictureStateRunning = 3,
-    VeLivePictureInPictureStateStopping = 4,
-    VeLivePictureInPictureStateError = 5,
-};
-
-typedef NS_ENUM(NSInteger, VeLivePictureInPictureType) {
-#if VEL_PICTURE_IN_PICTURE_ENABLE_PIP_BELOW_IOS_15
-    VeLivePictureInPictureTypeAVPlayer = 0,
-    VeLivePictureInPictureTypeAVPlayerViewController = 1,
-    VeLivePictureInPictureTypeContentSourceAVPlayer API_AVAILABLE(ios(15.0))  = 2,
-#endif
-    VeLivePictureInPictureTypeContentSource API_AVAILABLE(ios(15.0)) = 3,
-    VeLivePictureInPictureTypeContentViewPlayerLayer = 4,
-    //  {zh} 自动根据系统选择  {en} Automatically select according to the system
-    VeLivePictureInPictureTypeAuto = NSIntegerMax
-};
-
-@class VeLivePictureInPictureController;
-//  {zh} 画中画准备完成回调  {en} PIP ready to complete callback
-typedef void (^VELPipPrepareCompletionBlock)(VeLivePictureInPictureController *_Nullable pipController, NSError *_Nullable error);
-
-//  {zh} 基类，主要处理不同场景下的相同业务逻辑  {en} Base class, which mainly handles the same business logic in different scenarios
-@interface VeLivePictureInPictureController : NSObject
-
-//  {zh} 需要小窗的视图  {en} View that requires small windows
-@property (nonatomic, weak, nullable) UIView *contentView;
-
-//  {zh} contentView 所在的容器  {en} Container where contentView is located
-@property (nonatomic, weak, nullable) UIViewController *contentController;
-
-//  {zh} 如果配置了 contentController 并且这个值设置为 YES。  {en} If contentController is configured and this value is set to YES.
-//  {zh} 会在画中画启动的时候，把控制器隐藏。画中画结束后，自动展示该控制器  {en} Will hide the controller when the picture-in-picture starts. After the picture-in-picture is over, the controller is automatically displayed
-//  {zh} 自动隐藏 contentController 默认 NO  {en} Auto hide contentController default NO
-@property (nonatomic, assign) BOOL autoHideContentController;
-
-//  {zh} 视频在 contentView 中的尺寸布局，用来存放画中画占位视图，如果不设置，内部自动计算  {en} The size layout of the video in contentView is used to store the picture-in-picture placeholder view. If it is not set, it will be automatically calculated internally.
-//  {zh} 主要用于视频在非填充模式下，会有黑边，再设置占位视图的时候，尺寸大小不正确会有 UI 突变的问题  {en} Mainly used for video in non-filling mode, there will be black edges. When setting the placeholder view, if the size is incorrect, there will be a problem of UI mutation.
-//  {zh} 默认取 contentView.frame  {en} Default take contentView.frame
-@property (nonatomic, assign) CGRect videoFrame;
-
-// {zh} 当视频填充模式非等比例填充时，实际的 videoSize 应该比 videoFrame.size 大或者小，此处可更新视频宽高 {en} When the video filling mode is not proportionally filled, the actual videoSize should be larger or smaller than videoFrame.size. The video width and height can be updated here.
-@property (nonatomic, assign) CGSize videoSize;
-
-//  {zh} 画中画占位视图，可以在画中画启动后，自行重新布局，内部初始会使用 contentView 的尺寸  {en} The picture-in-picture placeholder view can be rearranged by itself after the picture-in-picture is started, and the size of the contentView will be used initially inside.
-// {zh} type == ContentViewPlayerLayer 时为空 {en} type == ContentViewPlayerLayer be nil
-@property (nonatomic, strong, readonly, nullable) UIView *pipHolderView;
-
-// {zh} 如果送入多个 pixelBuffer 并且指定 videoRect，设置展示画中画的 fps，默认 15, 只在开启画中画前设置有效{en} If multiple pixelBuffers are sent and videoRect is specified, set the fps for displaying picture-in-picture, the default is 15. The setting is only valid before turning on picture-in-picture.
-@property (nonatomic, assign) int fps;
-
-// {zh} 如果输入多个视频源的话，需要指定正确的视频源数量，默认 1，只在开启画中画前设置有效 {en} If you input multiple video sources, you need to specify the correct number of video sources. The default is 1. The setting is only valid before turning on picture-in-picture.
-@property (nonatomic, assign) int videoSourceCount;
-
-//  {zh} 代理回调  {en} proxy callback
-@property (nonatomic, weak) id <VeLivePictureInPictureDelegate> delegate;
-
-//  {zh} 画中画填充模式  {en} PIP Fill Mode
-//  {zh} 默认:  AVLayerVideoGravityResize  {en} Default: AVLayerVideoGravityResize
-@property (nonatomic, copy) AVLayerVideoGravity videoGravity;
-
-//  {zh} 进入后台时，自动弹出小窗， 默认 YES  {en} When entering the background, a small window will automatically pop up, and the default is YES.
-//  {zh} 如果配置了 YES，画中画配置完成后，会在后台持续循环播放黑帧视频，App 进入后台后，会自动弹出小窗  {en} If YES is configured, after the picture-in-picture configuration is completed, the black frame video will continue to be played in a loop in the background. After the App enters the background, a small window will automatically pop up.
-@property (nonatomic, assign) BOOL canStartPictureInPictureAutomaticallyFromInline API_AVAILABLE(ios(14.2));
-
-//  {zh} 是否可以调用 start 方法开启画中画  {en} Is it possible to call the start method to turn on picture-in-picture?
-@property (nonatomic, assign, readonly) BOOL canStartPictureInPicture;
-
-//  {zh} 在手动启动画中画失败后，自动降级重试， 默认 NO  {en} After the manual start of picture-in-picture fails, it will automatically downgrade and retry, the default is NO.
-//  {zh} 如果开启，iOS 15 及以上系统的降级顺序是 ContentSource -> AVPlayerViewController -> AVPlayer  {en} If enabled, the downgrade order for iOS 15 and above is ContentSource - > AVPlayerViewController - > AVPlayer
-//  {zh} 如果开启，iOS 15 及以上系统的降级顺序是 AVPlayerViewController -> AVPlayer  {en} If enabled, the downgrade order for iOS 15 and above is AVPlayerViewController - > AVPlayer
-@property (nonatomic, assign, readonly) BOOL downgradeWhenStartFailed;
-
-//  {zh} 是否支持画中画  {en} Whether to support picture-in-picture
-@property (nonatomic, assign, readonly) BOOL isPictureInPictureSupported;
-
-//  {zh} 当前是否已经有画中画在播放  {en} Is there already a picture-in-picture playing?
-@property (nonatomic, assign, readonly) BOOL isPictureInPictureStarted;
-
-//  {zh} 画中画状态  {en} PIP state
-@property (atomic, assign, readonly) VeLivePictureInPictureState state;
-
-//  {zh} 画中画类型  {en} PIP type
-@property (atomic, assign, readonly) VeLivePictureInPictureType type;
-
-//  {zh} 初始化画中画控制器  {en} Preliminary picture-in-picture controller
-- (instancetype)initWithType:(VeLivePictureInPictureType)type NS_DESIGNATED_INITIALIZER;
-
-//  {zh} 初始化画中画控制器  {en} Preliminary picture-in-picture controller
-- (instancetype)initWithContentView:(UIView *)contentView NS_DESIGNATED_INITIALIZER;
-
-//  {zh} 初始化画中画控制器  {en} Preliminary picture-in-picture controller
-- (instancetype)initWithType:(VeLivePictureInPictureType)type contentView:(nullable UIView *)contentView NS_DESIGNATED_INITIALIZER;
-
-//  {zh} 准备  {en} prepare
-- (void)prepareWithCompletion:(nullable VELPipPrepareCompletionBlock)completion;
-
-//  {zh} 主动开启画中画  {en} Actively turn on picture-in-picture
-//  {zh} 注意：只有 App 有声音播放时，才能正常启动画中画  {en} Note: Picture-in-picture can only be started normally when the App has sound playback.
-- (void)startPictureInPicture;
-
-//  {zh} 停止当前正在展示的画中画，当进入后台，还会自动打开画中画  {en} Stop the picture-in-picture currently being displayed. When entering the background, it will also automatically open the picture-in-picture.
-- (void)stopPictureInPicture;
-
-//  {zh} 销毁当前画中画，不会再推入后台后自动开启画中画  {en} Destroy the current picture-in-picture, it will not be automatically turned on after being pushed into the background.
-- (void)destroyPictureInPicture;
-
-//  {zh} iOS 15 && type == VeLivePictureInPictureTypeContentSource 时使用  {en} iOS 15 & & type == VeLivePictureInPictureTypeContentSource
-//  {zh} 只支持 BGRA 类型 {en} Only supports BGRA type
-- (void)enqueuePixelBuffer:(CVPixelBufferRef)pixelBuffer;
-- (void)enqueuePixelBuffer:(CVPixelBufferRef)pixelBuffer videoRect:(CGRect)videoRect;
-
-//  {zh} iOS 15 && type == VeLivePictureInPictureTypeContentSource 时使用  {en} iOS 15 & & type == VeLivePictureInPictureTypeContentSource
-//  {zh} 只支持 BGRA 类型 {en} Only supports BGRA type
-- (void)enqueueSampleBuffer:(CMSampleBufferRef)sampleBuffer;
-- (void)enqueueSampleBuffer:(CMSampleBufferRef)sampleBuffer videoRect:(CGRect)videoRect;
-
-
-//  {zh} 销毁画中画所有实例，调用此方法后，不会在后台的时候自动弹出画中画，可以释放一部分内存  {en} Destroy all instances of PIP. After calling this method, PIP will not automatically pop up in the background, and part of the memory can be freed
-+ (void)destroyPictureInPicture;
-
-//  {zh} 是否支持画中画  {en} Whether to support picture-in-picture
-+ (BOOL)isPictureInPictureSupported;
-
-//  {zh} 当前是否已经有画中画在播放  {en} Is there already a picture-in-picture playing?
-+ (BOOL)isPictureInPictureStarted;
-@end
-
-
-
-
-FOUNDATION_EXTERN NSString *VeLivePictureInPictureErrorDomain;
-FOUNDATION_EXPORT CGRect VELPixtureInPictureFullVideoRect;
-NS_ASSUME_NONNULL_END
-
-