Merge pull request #141 from iossun/master

Release v3.0.5
pili-engineering · Aug 2, 2021 · 896d8d2 · 896d8d2
2 parents f590cba + fa5da2a
commit 896d8d2
Show file tree

Hide file tree

Showing 22 changed files with 185 additions and 136 deletions.
diff --git a/APIDiffs/api-diffs-3.0.5.md b/APIDiffs/api-diffs-3.0.5.md
@@ -0,0 +1,14 @@
+# PLMediaStreamingKit 3.0.4 to 3.0.5 API Differences
+
+## General Headers
+
+
+```
+PLStreamingSession.h
+```
+
+- *Added* **@property** (**nonatomic**, **assign**) PLProtocolModel  protocolModel;
+
+
+
+
diff --git a/Example/PLMediaStreamingKitDemo.xcodeproj/project.pbxproj b/Example/PLMediaStreamingKitDemo.xcodeproj/project.pbxproj
@@ -718,12 +718,10 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-PLMediaStreamingKitDemo/Pods-PLMediaStreamingKitDemo-frameworks.sh",
-				"${PODS_ROOT}/../../Pod/Library/PLMediaStreamingKit.framework",
 				"${PODS_ROOT}/../../Pod/Library/HappyDNS.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PLMediaStreamingKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HappyDNS.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -3,9 +3,9 @@ PODS:
     - Fabric (~> 1.10.1)
   - Fabric (1.10.1)
   - Masonry (1.1.0)
-  - PLMediaStreamingKit (3.0.3):
-    - PLMediaStreamingKit/iphoneos (= 3.0.3)
-  - PLMediaStreamingKit/iphoneos (3.0.3)
+  - PLMediaStreamingKit (3.0.4):
+    - PLMediaStreamingKit/iphoneos (= 3.0.4)
+  - PLMediaStreamingKit/iphoneos (3.0.4)
 
 DEPENDENCIES:
   - Crashlytics
@@ -27,8 +27,8 @@ SPEC CHECKSUMS:
   Crashlytics: 666da4380b70d38c80426754fa9d5dfca0e5fd43
   Fabric: 58508b243fa6053c03bd04b9e0ada772f317d5b4
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
-  PLMediaStreamingKit: d379d44ee4f825c0b91a532d4e94d0685d934af6
+  PLMediaStreamingKit: 433ad99ed8feb48a2305db85a42f7937ba8875c6
 
-PODFILE CHECKSUM: 310f2b5ec7edf56ebf2d63f7d91dc9f38d241bec
+PODFILE CHECKSUM: 01b839d9eedb8dc4ae7438d2253f169c3d8deb5b
 
 COCOAPODS: 1.10.1
diff --git a/Example/Pods/Local Podspecs/PLMediaStreamingKit.podspec.json b/Example/Pods/Local Podspecs/PLMediaStreamingKit.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/...get Support Files/Pods-PLMediaStreamingKitDemo/Pods-PLMediaStreamingKitDemo-frameworks.sh b/...get Support Files/Pods-PLMediaStreamingKitDemo/Pods-PLMediaStreamingKitDemo-frameworks.sh
diff --git a/PLMediaStreamingKit-Universal.podspec b/PLMediaStreamingKit-Universal.podspec
@@ -9,12 +9,12 @@
 
 Pod::Spec.new do |s|
   s.name             = "PLMediaStreamingKit"
-  s.version          = "3.0.4"
+  s.version          = "3.0.5"
   s.summary          = "Pili iOS media streaming framework via RTMP."
   s.homepage         = "https://github.com/pili-engineering/PLMediaStreamingKit"
   s.license          = 'Apache License, Version 2.0'
   s.author           = { "pili" => "pili@qiniu.com" }
-  s.source           = { :http => "https://sdk-release.qnsdk.com/PLMediaStreamingKit-v3.0.4-universal.zip"}
+  s.source           = { :http => "https://sdk-release.qnsdk.com/PLMediaStreamingKit-v3.0.5-universal.zip"}
 
   s.platform     = :ios
   s.ios.deployment_target = '8.0'

diff --git a/PLMediaStreamingKit.podspec b/PLMediaStreamingKit.podspec
@@ -9,12 +9,12 @@
 
 Pod::Spec.new do |s|
   s.name             = "PLMediaStreamingKit"
-  s.version          = "3.0.4"
+  s.version          = "3.0.5"
   s.summary          = "Pili iOS media streaming framework via RTMP."
   s.homepage         = "https://github.com/pili-engineering/PLMediaStreamingKit"
   s.license          = 'Apache License, Version 2.0'
   s.author           = { "pili" => "pili@qiniu.com" }
-  s.source           = { :http => "https://sdk-release.qnsdk.com/PLMediaStreamingKit-v3.0.4-iphoneos.zip"}
+  s.source           = { :http => "https://sdk-release.qnsdk.com/PLMediaStreamingKit-v3.0.5-iphoneos.zip"}
 
   s.platform     = :ios
   s.ios.deployment_target = '8.0'

diff --git a/Pod/Library-Universal/PLMediaStreamingKit.framework.dSYM/Contents/Info.plist b/Pod/Library-Universal/PLMediaStreamingKit.framework.dSYM/Contents/Info.plist
@@ -13,7 +13,7 @@
 		<key>CFBundleSignature</key>
 		<string>????</string>
 		<key>CFBundleShortVersionString</key>
-		<string>3.0.3</string>
+		<string>3.0.5</string>
 		<key>CFBundleVersion</key>
 		<string>1</string>
 	</dict>

diff --git a/...Universal/PLMediaStreamingKit.framework.dSYM/Contents/Resources/DWARF/PLMediaStreamingKit b/...Universal/PLMediaStreamingKit.framework.dSYM/Contents/Resources/DWARF/PLMediaStreamingKit
diff --git a/Pod/Library-Universal/PLMediaStreamingKit.framework/Headers/PLMediaStreamingSession.h b/Pod/Library-Universal/PLMediaStreamingKit.framework/Headers/PLMediaStreamingSession.h
@@ -270,6 +270,16 @@ NS_ASSUME_NONNULL_BEGIN
 */
 @property (nonatomic, assign) NSTimeInterval statusUpdateInterval;
 
+/*!
+@property   protocolModel
+@abstract   传输协议
+
+@discussion  指定内部传输协议，默认rtmp
+
+@since      v3.0.4
+*/
+@property (nonatomic, assign) PLProtocolModel   protocolModel;
+
 /*!
  @abstract   流信息更新间隔。
 

diff --git a/Pod/Library-Universal/PLMediaStreamingKit.framework/Headers/PLStreamingSession.h b/Pod/Library-Universal/PLMediaStreamingKit.framework/Headers/PLStreamingSession.h
@@ -232,6 +232,16 @@ typedef void (^PLStreamDiagnosisResultHandler)(NSString * _Nullable diagnosisRes
  */
 @property (nonatomic, assign) NSTimeInterval    statusUpdateInterval;
 
+/*!
+ @property   protocolModel
+ @abstract   传输协议
+
+ @discussion  指定内部传输协议，默认rtmp
+
+ @since      v3.0.4
+ */
+@property (nonatomic, assign) PLProtocolModel   protocolModel;
+
 ///----------------------
 /// @name 对象生命周期
 ///----------------------
@@ -678,7 +688,8 @@ typedef void (^PLStreamDiagnosisResultHandler)(NSString * _Nullable diagnosisRes
  @method     pushSEIMessage:repeat:
  @abstract   发送 SEI 消息
 
- @discussion 视频编码数据中规定的一种附加增强信息，平时一般不被使用，可以在其中加入一些自定义消息，这些消息会被直播 CDN 转发到观众端
+ @discussion 视频编码数据中规定的一种附加增强信息，平时一般不被使用，可以在其中加入一些自定义消息，这些消息会被直播 CDN 转发到观众端,。
+             注： 同一编码帧内，发送多条message，内部会自动拼接成一条message
 
  @warning 由于消息是直接被塞入视频数据中的，所以不能太大（几个字节比较合适）