Merge pull request pili-engineering#60 from lawder/master

v2.2.1 release

APIDiffs/api-diffs-2.2.1.md

@@ -0,0 +1,7 @@
+# PLMediaStreamingKit 2.2.0 to 2.2.1 API Differences
+
+
+```
+PLMediaStreamingSession.h
+```
+- *Added* method `- (void)setPushImage:(nullable UIImage *)image;`

Example/PLMediaStreamingKitDemo/Supporting Files/PLMediaStreamingKitDemo-Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.0</string>
+	<string>2.2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.2.1</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

Example/Podfile.lock

@@ -14,42 +14,42 @@ PODS:
   - BlocksKit/UIKit (2.2.5):
     - BlocksKit/Core
     - BlocksKit/DynamicDelegate
-  - Crashlytics (3.8.3):
+  - Crashlytics (3.8.4):
     - Fabric (~> 1.6.3)
   - Fabric (1.6.11)
   - HappyDNS (0.3.10)
   - Masonry (1.0.2)
   - pili-librtmp (1.0.6)
-  - PLMediaStreamingKit (2.2.0):
+  - PLMediaStreamingKit (2.2.1):
     - HappyDNS (= 0.3.10)
     - pili-librtmp (= 1.0.6)
-    - PLMediaStreamingKit/Common (= 2.2.0)
-    - PLMediaStreamingKit/PLCameraStreamingKit (= 2.2.0)
-    - PLMediaStreamingKit/PLMediaStreamingKit (= 2.2.0)
-    - PLMediaStreamingKit/PLRTCStreamingKit (= 2.2.0)
-    - PLMediaStreamingKit/PLStreamingKit (= 2.2.0)
+    - PLMediaStreamingKit/Common (= 2.2.1)
+    - PLMediaStreamingKit/PLCameraStreamingKit (= 2.2.1)
+    - PLMediaStreamingKit/PLMediaStreamingKit (= 2.2.1)
+    - PLMediaStreamingKit/PLRTCStreamingKit (= 2.2.1)
+    - PLMediaStreamingKit/PLStreamingKit (= 2.2.1)
     - QNNetDiag (= 0.0.4)
-  - PLMediaStreamingKit/Common (2.2.0):
+  - PLMediaStreamingKit/Common (2.2.1):
     - HappyDNS (= 0.3.10)
     - pili-librtmp (= 1.0.6)
     - QNNetDiag (= 0.0.4)
-  - PLMediaStreamingKit/PLCameraStreamingKit (2.2.0):
+  - PLMediaStreamingKit/PLCameraStreamingKit (2.2.1):
     - HappyDNS (= 0.3.10)
     - pili-librtmp (= 1.0.6)
     - PLMediaStreamingKit/PLStreamingKit
     - QNNetDiag (= 0.0.4)
-  - PLMediaStreamingKit/PLMediaStreamingKit (2.2.0):
+  - PLMediaStreamingKit/PLMediaStreamingKit (2.2.1):
     - HappyDNS (= 0.3.10)
     - pili-librtmp (= 1.0.6)
     - PLMediaStreamingKit/PLCameraStreamingKit
     - PLMediaStreamingKit/PLRTCStreamingKit
     - QNNetDiag (= 0.0.4)
-  - PLMediaStreamingKit/PLRTCStreamingKit (2.2.0):
+  - PLMediaStreamingKit/PLRTCStreamingKit (2.2.1):
     - HappyDNS (= 0.3.10)
     - pili-librtmp (= 1.0.6)
     - PLMediaStreamingKit/PLStreamingKit
     - QNNetDiag (= 0.0.4)
-  - PLMediaStreamingKit/PLStreamingKit (2.2.0):
+  - PLMediaStreamingKit/PLStreamingKit (2.2.1):
     - HappyDNS (= 0.3.10)
     - pili-librtmp (= 1.0.6)
     - PLMediaStreamingKit/Common
@@ -71,12 +71,12 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   BlocksKit: 7f422b971407001178d181a43b99014ea2591fe6
-  Crashlytics: 2b6dbe138a42395577cfa73dfa1aa7248cadf39e
+  Crashlytics: 79e236942ca1e7fc641df1feb9a275360a78ab6a
   Fabric: 5911403591946b8228ab1c51d98f1d7137e863c6
   HappyDNS: 06a9fed2796663fd87626dbf02552933265bf059
   Masonry: 7c429b56da9d4ee0bbb3ed77a5ea710d6a5df39e
   pili-librtmp: da10df0e835f135a75696cef429cc306773dd6f6
-  PLMediaStreamingKit: 7cc5112ba1e4c08c80cd2f866591882a19513e40
+  PLMediaStreamingKit: 25ed369fde16299649a6c597e2465caf4bca58fa
   QNNetDiag: f38e43c4f89aef14c1cc6b474a41e07bbe8b2820
   WeiboSDK: acb067053668102cf07d01aa7604350162c2e466
 

PLMediaStreamingKit.podspec

@@ -9,7 +9,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "PLMediaStreamingKit"
-  s.version          = "2.2.0"
+  s.version          = "2.2.1"
   s.summary          = "Pili iOS media streaming framework via RTMP."
   s.homepage         = "https://github.com/pili-engineering/PLMediaStreamingKit"
   s.license          = 'Apache License, Version 2.0'

Pod/Library/include/Common/PLTypeDefines.h

@@ -12,6 +12,7 @@
 #import <Foundation/Foundation.h>
 #import <AVFoundation/AVFoundation.h>
 
+
 #pragma mark - Stream State
 
 

Pod/Library/include/PLMediaStreamingKit/PLMediaStreamingSession.h

@@ -588,6 +588,17 @@
  */
 - (void)getScreenshotWithCompletionHandler:(nullable PLStreamScreenshotHandler)handler;
 
+/**
+ *  @brief 设置推流图片
+ *
+ *  @param image 推流的图片
+ *
+ *  @discussion 由于某些特殊原因不想使用摄像头采集的数据来推流时，可以使用该接口设置一张图片来替代。传入 nil 则关闭该功能。
+ *
+ *  @since v2.2.1
+ */
+- (void)setPushImage:(nullable UIImage *)image;
+
 @end
 
 #pragma mark - Category (MicrophoneSource)

Pod/Library/include/PLStreamingKit/PLStreamingEnv.h

@@ -32,6 +32,11 @@
  */
 +(void)enableQos:(BOOL)flag;
 
+/**
+ @brief 获取 QoS 的采样间隔
+ */
++(NSUInteger)getSampleInterval;
+
 /**
  @brief 是否打开测速功能，默认关闭
  

ReleaseNotes/release-notes-2.2.1.md

@@ -0,0 +1,25 @@
+# PLMediaStreamingKit Release Notes for 2.2.1
+
+## 内容
+
+- [简介](#简介)
+- [问题反馈](#问题反馈)
+- [记录](#记录)
+
+## 简介
+
+PLMediaStreamingKit 为 iOS 开发者提供直播推流 SDK。
+
+## 问题反馈
+
+当你遇到任何问题时，可以通过在 GitHub 的 repo 提交 ```issues``` 来反馈问题，请尽可能的描述清楚遇到的问题，如果有错误信息也一同附带，并且在 ```Labels``` 中指明类型为 bug 或者其他。
+
+[通过这里查看已有的 issues 和提交 Bug](https://github.com/pili-engineering/PLMediaStreamingKit/issues)
+
+## 记录
+- 功能
+  - 支持后台推静态图的功能
+- 缺陷
+  - 修复 iOS 8.1 使用 VideoToolbox 编码失败的问题
+  - 修复 iOS 9 及以上系统当 App 进入 Inactive 状态时推流画面卡住的问题 
+