Merge pull request #43 from Kivenhaoyu/v3.0.2-release

v3.0.2 release
pili-engineering · Mar 10, 2021 · 00ca42a · 00ca42a
2 parents ea86d8f + 30979e2
commit 00ca42a
Show file tree

Hide file tree

Showing 21 changed files with 402 additions and 440 deletions.
diff --git a/APIDiffs/api-diffs-3.0.2.md b/APIDiffs/api-diffs-3.0.2.md
@@ -0,0 +1,8 @@
+# QNRTCKit 3.0.1 to 3.0.2 API Differences
+
+## General Headers
+
+```
+QNMergeStreamLayout.h
+```
+- *Added*  property `@property (nonatomic, assign) BOOL supportSEI;`
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -6,9 +6,9 @@ PODS:
   - PLPlayerKit (3.4.1):
     - PLPlayerKit/iphoneos (= 3.4.1)
   - PLPlayerKit/iphoneos (3.4.1)
-  - QNRTCKit (3.0.1):
-    - QNRTCKit/Core (= 3.0.1)
-  - QNRTCKit/Core (3.0.1)
+  - QNRTCKit (3.0.2):
+    - QNRTCKit/Core (= 3.0.2)
+  - QNRTCKit/Core (3.0.2)
 
 DEPENDENCIES:
   - Bugsnag (= 5.15.4)
@@ -36,7 +36,7 @@ SPEC CHECKSUMS:
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
   MMMaterialDesignSpinner: a548042720c2e5f04212048483085d7942ac3e81
   PLPlayerKit: ebec9d70b66a95d1770b2dc5107fe2a469454a28
-  QNRTCKit: 24cd5e890e9151ac509fbf71ad660307b5f34c48
+  QNRTCKit: 8e39a3d0f80cae7aec40618e14510b347f42dc96
 
 PODFILE CHECKSUM: b2d05023ad44db0b63e1263186f1e268a2c7e2ff
 

diff --git a/Example/Pods/Local Podspecs/QNRTCKit.podspec.json b/Example/Pods/Local Podspecs/QNRTCKit.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/QNRTCKitDemo.xcodeproj/project.pbxproj b/Example/QNRTCKitDemo.xcodeproj/project.pbxproj
@@ -598,7 +598,7 @@
 					"$(PROJECT_DIR)/../QNRTCKit/**",
 					"$(inherited)",
 				);
-				MARKETING_VERSION = 3.0.1;
+				MARKETING_VERSION = 3.0.2;
 				OTHER_LDFLAGS = (
 					"$(OTHER_LDFLAGS)",
 					"-ObjC",
@@ -638,7 +638,7 @@
 					"$(PROJECT_DIR)/../QNRTCKit/**",
 					"$(inherited)",
 				);
-				MARKETING_VERSION = 3.0.1;
+				MARKETING_VERSION = 3.0.2;
 				OTHER_LDFLAGS = (
 					"$(OTHER_LDFLAGS)",
 					"-ObjC",

diff --git a/Pod/iphoneos/QNRTCKit.framework.dSYM/Contents/Info.plist b/Pod/iphoneos/QNRTCKit.framework.dSYM/Contents/Info.plist
@@ -13,7 +13,7 @@
 		<key>CFBundleSignature</key>
 		<string>????</string>
 		<key>CFBundleShortVersionString</key>
-		<string>2.5.0</string>
+		<string>3.0.2</string>
 		<key>CFBundleVersion</key>
 		<string>1</string>
 	</dict>

diff --git a/Pod/iphoneos/QNRTCKit.framework.dSYM/Contents/Resources/DWARF/QNRTCKit b/Pod/iphoneos/QNRTCKit.framework.dSYM/Contents/Resources/DWARF/QNRTCKit
diff --git a/Pod/iphoneos/QNRTCKit.framework/Headers/QNMergeStreamLayout.h b/Pod/iphoneos/QNRTCKit.framework/Headers/QNMergeStreamLayout.h
@@ -34,6 +34,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (nonatomic, assign) QNVideoFillModeType fillMode;
 
+/**
+ @brief 是否在合流中添加视频 Track 的 SEI 内容，针对所有合流视频 Track，默认只能设置一路 SEI
+ */
+@property (nonatomic, assign) BOOL supportSEI;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/Pod/iphoneos/QNRTCKit.framework/Headers/QNTypeDefines.h b/Pod/iphoneos/QNRTCKit.framework/Headers/QNTypeDefines.h
@@ -24,55 +24,193 @@ extern NSString *QNAudioFileErrorDomain;
 
 NS_ERROR_ENUM(QNRTCErrorDomain)
 {
-    //token error
+    /*!
+     * @abstract token error
+     *
+     * @discussion 鉴权失败，建议用户收到此错误代码时尝试重新获取 RoomToken 后再次加入房间。
+     */
     QNRTCErrorTokenError                        = 10001,
-    //token expired
+
+    /*!
+     * @abstract token expired
+     *
+     * @discussion RoomToken 过期，建议用户收到此错误代码时尝试重新获取 RoomToken 后再次加入房间。
+     */
     QNRTCErrorTokenExpired                      = 10002,
-    //room instance closed
+
+    /*!
+     * @abstract room instance closed
+     *
+     * @discussion 房间实例关闭，用户无需处理。
+     */
     QNRTCErrorRoomInstanceClosed                = 10003,
-    //reconnect token error
+
+    /*!
+     * @abstract reconnect token error
+     *
+     * @discussion 重连时 RoomToken 错误，建议用户收到此错误代码时尝试重新获取 RoomToken 后再次加入房间。
+     */
     QNRTCErrorReconnectTokenError               = 10004,
-    //room closed
+
+    /*!
+     * @abstract room closed
+     *
+     * @discussion 房间被管理员关闭。
+     */
     QNRTCErrorRoomClosed                        = 10005,
-    //room is full
+
+    /*!
+     * @abstract room is full
+     *
+     * @discussion 房间人数已超过限制。
+     */
     QNRTCErrorRoomIsFull                        = 10011,
-    //room not exist
+
+    /*!
+     * @abstract room not exist
+     *
+     * @discussion 房间不存在。
+     */
     QNRTCErrorRoomNotExist                      = 10012,
-    //user not exist
+
+    /*!
+     * @abstract user not exist
+     *
+     * @discussion 用户不存在。
+     */
     QNRTCErrorUserNotExist                      = 10021,
-    //user already exist
+
+    /*!
+     * @abstract user already exist
+     *
+     * @discussion 用户已存在，该用户可能已使用其他设备进入房间。
+     */
     QNRTCErrorUserAlreadyExist                  = 10022,
-    //publish stream not exist
+
+    /*!
+     * @abstract publish stream not exist
+     *
+     * @discussion 流不存在。
+     */
     QNRTCErrorPublishStreamNotExist             = 10031,
-    //publish stream info not match
+
+    /*!
+     * @abstract publish stream info not match
+     *
+     * @discussion 流信息不匹配。
+     */
     QNRTCErrorPublishStreamInfoNotMatch         = 10032,
-    //publish stream already exist
+
+    /*!
+     * @abstract publish stream already exist
+     *
+     * @discussion 流已存在。
+     */
     QNRTCErrorPublishStreamAlreadyExist         = 10033,
-    //publish stream not ready
+
+    /*!
+     * @abstract publish stream not ready
+     *
+     * @discussion 流未完成。
+     */
     QNRTCErrorPublishStreamNotReady             = 10034,
-    //subscribe stream not exist
+
+    /*!
+     * @abstract subscribe stream not exist
+     *
+     * @discussion 订阅不存在的流。
+     */
     QNRTCErrorSubscribeStreamNotExist           = 10041,
-    //subscribe stream info not match
+
+    /*!
+     * @abstract subscribe stream info not match
+     *
+     * @discussion 订阅不匹配信息流。
+     */
     QNRTCErrorSubscribeStreamInfoNotMatch       = 10042,
-    //subscribe stream already exist
+
+    /*!
+     * @abstract subscribe stream already exist
+     *
+     * @discussion 订阅已存在流。
+     */
     QNRTCErrorSubscribeStreamAlreadyExist       = 10043,
-    //can't subscribe self
+
+    /*!
+     * @abstract can't subscribe self
+     *
+     * @discussion 不能订阅自己。
+     */
     QNRTCErrorSubscribeSelf                     = 10044,
-    //no permission
+
+    /*!
+     * @abstract no permission
+     *
+     * @discussion 当用户在进行踢人等操作没有权限时会返回此错误代码。
+     */
     QNRTCErrorNoPermission                      = 10051,
-    //server unavailable
+
+    /*!
+     * @abstract server unavailable
+     *
+     * @discussion 服务不可用，SDK 内部错误。用户无需处理。
+     */
     QNRTCErrorServerUnavailable                 = 10052,
-    //invalid parameter
+
+    /*!
+     * @abstract Publisher Disconnected, or not exist
+     *
+     * @discussion 发布失败，或不存在，用户无需处理。
+     */
+    QNRTCErrorPublishDisconnected               = 10061,
+
+    /*!
+     * @abstract Subscriber Disconnected, or not exist
+     *
+     * @discussion 订阅失败，或订阅不存在，用户无需处理。
+     */
+    QNRTCErrorSubscribeDisconnected             = 10062,
+
+    /*!
+     * @abstract invalid parameter
+     *
+     * @discussion 参数错误，当用户在进行踢人、合流等操作传入错误的参数时会返回此错误代码。
+     */
     QNRTCErrorInvalidParameter                  = 11001,
-    //auth failed
+
+    /*!
+     * @abstract auth failed
+     *
+     * @discussion 鉴权失败，建议用户收到此错误代码时检查网络并尝试重新获取 RoomToken 后再次加入房间。
+     */
     QNRTCErrorAuthFailed                        = 11002,
-    //publish failed
+
+    /*!
+     * @abstract publish failed
+     *
+     * @discussion 发布失败。
+     */
     QNRTCErrorPublishFailed                     = 11011,
-    //subscribe failed
+
+    /*!
+     * @abstract subscribe failed
+     *
+     * @discussion 订阅失败。
+     */
     QNRTCErrorSubscribeFailed                   = 11012,
-    //merge failed
+
+    /*!
+     * @abstract merge failed
+     *
+     * @discussion 更新合流失败。
+     */
     QNRTCErrorUpdateMergeFailed                 = 11013,
-    //push audioBuffer with asbd convert failed
+
+    /*!
+     * @abstract push audioBuffer with asbd convert failed
+     *
+     * @discussion 音频转码失败。
+     */
     QNRTCErrorPushAudioBufferFailed             = 11014,
 
 };
@@ -253,6 +391,12 @@ typedef NS_ENUM(NSUInteger, QNRTCBWEPolicy) {
 
 //视频填充模式
 typedef enum {
+
+    /**
+     @brief default
+     */
+    QNVideoFillModeNone,
+
     /**
      @brief Stretch to fill the full view, which may distort the image outside of its normal aspect ratio
      */

diff --git a/Pod/iphoneos/QNRTCKit.framework/Info.plist b/Pod/iphoneos/QNRTCKit.framework/Info.plist
diff --git a/Pod/iphoneos/QNRTCKit.framework/QNRTCKit b/Pod/iphoneos/QNRTCKit.framework/QNRTCKit
diff --git a/Pod/universal/QNRTCKit.framework.dSYM/Contents/Info.plist b/Pod/universal/QNRTCKit.framework.dSYM/Contents/Info.plist
@@ -13,7 +13,7 @@
 		<key>CFBundleSignature</key>
 		<string>????</string>
 		<key>CFBundleShortVersionString</key>
-		<string>2.4.0</string>
+		<string>3.0.2</string>
 		<key>CFBundleVersion</key>
 		<string>1</string>
 	</dict>

diff --git a/Pod/universal/QNRTCKit.framework.dSYM/Contents/Resources/DWARF/QNRTCKit b/Pod/universal/QNRTCKit.framework.dSYM/Contents/Resources/DWARF/QNRTCKit
diff --git a/Pod/universal/QNRTCKit.framework/Headers/QNMergeStreamLayout.h b/Pod/universal/QNRTCKit.framework/Headers/QNMergeStreamLayout.h
@@ -34,6 +34,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (nonatomic, assign) QNVideoFillModeType fillMode;
 
+/**
+ @brief 是否在合流中添加视频 Track 的 SEI 内容，针对所有合流视频 Track，默认只能设置一路 SEI
+ */
+@property (nonatomic, assign) BOOL supportSEI;
+
 @end
 
 NS_ASSUME_NONNULL_END