Merge pull request #95 from HeraShowFeng/v3.1.1

release version v3.1.1
pili-engineering · Feb 7, 2020 · 767dcb0 · 767dcb0
2 parents c6b0db1 + fbf968f
commit 767dcb0
Show file tree

Hide file tree

Showing 26 changed files with 175 additions and 42 deletions.
diff --git a/APIDiffs/api-diffs-3.1.1.md b/APIDiffs/api-diffs-3.1.1.md
@@ -0,0 +1,29 @@
+# PLShortVideoKit 3.1.0 to 3.1.1 API Differences
+
+## General Headers
+
+`PLShortVideoRecorder`
+
+- *Deprecated* 
+
+```objc
+- (CVPixelBufferRef __nonnull)shortVideoRecorder:(PLShortVideoRecorder *__nonnull)recorder cameraSourceDidGetPixelBuffer:(CVPixelBufferRef __nonnull)pixelBuffer;
+```
+
+- *Added*
+
+```objc
+- (CVPixelBufferRef __nonnull)shortVideoRecorder:(PLShortVideoRecorder *__nonnull)recorder cameraSourceDidGetPixelBuffer:(CVPixelBufferRef __nonnull)pixelBuffer timingInfo:(CMSampleTimingInfo)timingInfo;
+```
+
+`PLSTypeDefines`
+
+- *Added* 
+
+```objc
+typedef enum {
+    PLSVideoHardwareTypeH264 = 0,
+    PLSVideoHardwareTypeHEVC = 1,  // iOS 11.0 及以上版本支持，即 hvc1
+} PLSVideoHardwareType;
+```
+*Warning* You can set it, such as `PLSVideoConfiguration`、`PLShortVideoTranscoder`、`PLSAVAssetExportSession`、`PLSImageToMovieComposer`、`PLSRangeMovieExport`、`PLSMultiVideoMixer`、`PLSImageVideoComposer`、`PLSGifToMovieConverter`、`PLSImageToMovieConverter`
diff --git a/Example/PLShortVideoKitDemo.xcodeproj/project.pbxproj b/Example/PLShortVideoKitDemo.xcodeproj/project.pbxproj
@@ -1463,7 +1463,7 @@
 					"$(PROJECT_DIR)",
 					"$(PROJECT_DIR)/PLShortVideoKitDemo/Librarys",
 				);
-				MARKETING_VERSION = 3.1.0;
+				MARKETING_VERSION = 3.1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.qbox.PLShortVideoKitDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -1496,7 +1496,7 @@
 					"$(PROJECT_DIR)",
 					"$(PROJECT_DIR)/PLShortVideoKitDemo/Librarys",
 				);
-				MARKETING_VERSION = 3.1.0;
+				MARKETING_VERSION = 3.1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.qbox.PLShortVideoKitDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};

diff --git a/Example/PLShortVideoKitDemo/Info.plist b/Example/PLShortVideoKitDemo/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>$(MARKETING_VERSION).git-2019-12-06-b5e3822</string>
+	<string>$(MARKETING_VERSION).git-2019-12-06-c6b0db1</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -5,13 +5,13 @@ PODS:
   - FLAnimatedImage (1.0.12)
   - HappyDNS (0.3.15)
   - Masonry (1.0.2)
-  - PLShortVideoKit (3.1.0):
-    - PLShortVideoKit/ex-libMuseProcessor (= 3.1.0)
-    - PLShortVideoKit/libMuseProcessor (= 3.1.0)
+  - PLShortVideoKit (3.1.1):
+    - PLShortVideoKit/ex-libMuseProcessor (= 3.1.1)
+    - PLShortVideoKit/libMuseProcessor (= 3.1.1)
     - Qiniu (= 7.2.5)
-  - PLShortVideoKit/ex-libMuseProcessor (3.1.0):
+  - PLShortVideoKit/ex-libMuseProcessor (3.1.1):
     - Qiniu (= 7.2.5)
-  - PLShortVideoKit/libMuseProcessor (3.1.0):
+  - PLShortVideoKit/libMuseProcessor (3.1.1):
     - Qiniu (= 7.2.5)
   - Qiniu (7.2.5):
     - HappyDNS (~> 0.3)
@@ -43,7 +43,7 @@ SPEC CHECKSUMS:
   FLAnimatedImage: 4a0b56255d9b05f18b6dd7ee06871be5d3b89e31
   HappyDNS: 00c15e651a347206e58a20503a32a5564589b56a
   Masonry: 7c429b56da9d4ee0bbb3ed77a5ea710d6a5df39e
-  PLShortVideoKit: fb7200400f414b1b57edfd977114c521e6ca0dac
+  PLShortVideoKit: b74189c13cf31b294523babd0d55d950a4ff9ac7
   Qiniu: 909b408ee489ea54827e9717be90b94bc9dfbc48
 
 PODFILE CHECKSUM: 464a1d9cdafee0a2337603af681aa59f2814b116

diff --git a/Example/Pods/Local Podspecs/PLShortVideoKit.podspec.json b/Example/Pods/Local Podspecs/PLShortVideoKit.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example_TuTu/PLShortVideoKitDemo.xcodeproj/project.pbxproj b/Example_TuTu/PLShortVideoKitDemo.xcodeproj/project.pbxproj
@@ -2251,7 +2251,7 @@
 					"$(PROJECT_DIR)",
 					"$(PROJECT_DIR)/PLShortVideoKitDemo/Librarys",
 				);
-				MARKETING_VERSION = 3.1.0;
+				MARKETING_VERSION = 3.1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.qiniu.PLShortVideoKitDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = 1;
@@ -2287,7 +2287,7 @@
 					"$(PROJECT_DIR)",
 					"$(PROJECT_DIR)/PLShortVideoKitDemo/Librarys",
 				);
-				MARKETING_VERSION = 3.1.0;
+				MARKETING_VERSION = 3.1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.qiniu.PLShortVideoKitDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = 1;

diff --git a/Example_TuTu/Podfile.lock b/Example_TuTu/Podfile.lock
@@ -5,13 +5,13 @@ PODS:
   - FLAnimatedImage (1.0.12)
   - HappyDNS (0.3.14)
   - Masonry (1.0.2)
-  - PLShortVideoKit (3.1.0):
-    - PLShortVideoKit/ex-libMuseProcessor (= 3.1.0)
-    - PLShortVideoKit/libMuseProcessor (= 3.1.0)
+  - PLShortVideoKit (3.1.1):
+    - PLShortVideoKit/ex-libMuseProcessor (= 3.1.1)
+    - PLShortVideoKit/libMuseProcessor (= 3.1.1)
     - Qiniu (= 7.2.5)
-  - PLShortVideoKit/ex-libMuseProcessor (3.1.0):
+  - PLShortVideoKit/ex-libMuseProcessor (3.1.1):
     - Qiniu (= 7.2.5)
-  - PLShortVideoKit/libMuseProcessor (3.1.0):
+  - PLShortVideoKit/libMuseProcessor (3.1.1):
     - Qiniu (= 7.2.5)
   - Qiniu (7.2.5):
     - HappyDNS (~> 0.3)
@@ -43,7 +43,7 @@ SPEC CHECKSUMS:
   FLAnimatedImage: 4a0b56255d9b05f18b6dd7ee06871be5d3b89e31
   HappyDNS: dc6a164ee81979093123c241c6353bcf0218add6
   Masonry: 7c429b56da9d4ee0bbb3ed77a5ea710d6a5df39e
-  PLShortVideoKit: fb7200400f414b1b57edfd977114c521e6ca0dac
+  PLShortVideoKit: b74189c13cf31b294523babd0d55d950a4ff9ac7
   Qiniu: 909b408ee489ea54827e9717be90b94bc9dfbc48
 
 PODFILE CHECKSUM: 464a1d9cdafee0a2337603af681aa59f2814b116

diff --git a/Example_TuTu/Pods/Local Podspecs/PLShortVideoKit.podspec.json b/Example_TuTu/Pods/Local Podspecs/PLShortVideoKit.podspec.json
diff --git a/Example_TuTu/Pods/Manifest.lock b/Example_TuTu/Pods/Manifest.lock
diff --git a/PLShortVideoKit-Advanced.podspec b/PLShortVideoKit-Advanced.podspec
@@ -9,12 +9,12 @@
 Pod::Spec.new do |s|
 
   s.name         = "PLShortVideoKit"
-  s.version      = "3.1.0"
+  s.version      = "3.1.1"
   s.summary      = "PILI iOS short video record SDK"
   s.homepage     = "https://github.com/pili-engineering/PLShortVideoKit"
   s.license      = "Apache License 2.0"
   s.author       = { "pili" => "[email protected]" }
-  s.source       = { :http => "https://sdk-release.qnsdk.com/PLShortVideoKit-advanced-v3.1.0.zip"}
+  s.source       = { :http => "https://sdk-release.qnsdk.com/PLShortVideoKit-advanced-v3.1.1.zip"}
   s.platform     = :ios
   s.requires_arc = true
 

diff --git a/PLShortVideoKit-Basic.podspec b/PLShortVideoKit-Basic.podspec
@@ -9,12 +9,12 @@
 Pod::Spec.new do |s|
 
   s.name         = "PLShortVideoKit"
-  s.version      = "3.1.0"
+  s.version      = "3.1.1"
   s.summary      = "PILI iOS short video record SDK"
   s.homepage     = "https://github.com/pili-engineering/PLShortVideoKit"
   s.license      = "Apache License 2.0"
   s.author       = { "pili" => "[email protected]" }
-  s.source       = { :http => "https://sdk-release.qnsdk.com/PLShortVideoKit-basic-v3.1.0.zip"}
+  s.source       = { :http => "https://sdk-release.qnsdk.com/PLShortVideoKit-basic-v3.1.1.zip"}
   s.platform     = :ios
   s.requires_arc = true
 

diff --git a/PLShortVideoKit-Smart.podspec b/PLShortVideoKit-Smart.podspec
@@ -9,12 +9,12 @@
 Pod::Spec.new do |s|
 
   s.name         = "PLShortVideoKit"
-  s.version      = "3.1.0"
+  s.version      = "3.1.1"
   s.summary      = "PILI iOS short video record SDK"
   s.homepage     = "https://github.com/pili-engineering/PLShortVideoKit"
   s.license      = "Apache License 2.0"
   s.author       = { "pili" => "[email protected]" }
-  s.source       = { :http => "https://sdk-release.qnsdk.com/PLShortVideoKit-smart-v3.1.0.zip"}
+  s.source       = { :http => "https://sdk-release.qnsdk.com/PLShortVideoKit-smart-v3.1.1.zip"}
   s.platform     = :ios
   s.requires_arc = true
 

diff --git a/PLShortVideoKit.podspec b/PLShortVideoKit.podspec
@@ -9,12 +9,12 @@
 Pod::Spec.new do |s|
 
   s.name         = "PLShortVideoKit"
-  s.version      = "3.1.0"
+  s.version      = "3.1.1"
   s.summary      = "PILI iOS short video record SDK"
   s.homepage     = "https://github.com/pili-engineering/PLShortVideoKit"
   s.license      = "Apache License 2.0"
   s.author       = { "pili" => "[email protected]" }
-  s.source       = { :http => "https://sdk-release.qnsdk.com/PLShortVideoKit-profession-v3.1.0.zip"}
+  s.source       = { :http => "https://sdk-release.qnsdk.com/PLShortVideoKit-profession-v3.1.1.zip"}
   s.platform     = :ios
   s.requires_arc = true
 

diff --git a/Pod/Library/Profession/PLShortVideoKit.framework/Headers/PLSAVAssetExportSession.h b/Pod/Library/Profession/PLShortVideoKit.framework/Headers/PLSAVAssetExportSession.h
@@ -139,6 +139,14 @@
  */
 @property (assign, nonatomic) CGSize outputVideoSize;
 
+/*!
+ @property videoHardwareType
+ @brief 是否使用 H265 编码，仅支持 iOS 11.0 系统以上
+ 
+ @since      v3.1.1
+ */
+@property (assign, nonatomic) PLSVideoHardwareType videoHardwareType;
+
 /*!
  @property outputVideoFrameRate
  @brief 视频的帧率

diff --git a/Pod/Library/Profession/PLShortVideoKit.framework/Headers/PLSImageToMovieComposer.h b/Pod/Library/Profession/PLShortVideoKit.framework/Headers/PLSImageToMovieComposer.h
@@ -101,6 +101,14 @@ __deprecated_msg("Class PLSImageToMovieComposer is deprecated in v1.16.0, use PL
  */
 @property (assign, nonatomic) PLSFileType outputFileType;
 
+/*!
+ @property videoHardwareType
+ @brief 视频编码格式，默认是 PLSVideoHardwareTypeH264，iOS 11.0 及以上版本可配置为 PLSVideoHardwareTypeHEVC。
+ 
+ @since      v3.1.1
+ */
+@property (assign, nonatomic) PLSVideoHardwareType videoHardwareType;
+
 /*!
  @method initWithImages:
  @brief 初始化

diff --git a/Pod/Library/Profession/PLShortVideoKit.framework/Headers/PLSImageVideoComposer.h b/Pod/Library/Profession/PLShortVideoKit.framework/Headers/PLSImageVideoComposer.h
@@ -146,6 +146,14 @@
  */
 @property (assign, nonatomic) PLSFileType outputFileType;
 
+/*!
+ @property videoHardwareType
+ @brief 视频编码格式，默认是 PLSVideoHardwareTypeH264，iOS 11.0 及以上版本可配置为 PLSVideoHardwareTypeHEVC。
+ 
+ @since      v3.1.1
+ */
+@property (assign, nonatomic) PLSVideoHardwareType videoHardwareType;
+
 /*!
  @property mediaArrays
  @brief 合并的文件数组，按照数组顺序拼接

diff --git a/Pod/Library/Profession/PLShortVideoKit.framework/Headers/PLSMultiVideoMixer.h b/Pod/Library/Profession/PLShortVideoKit.framework/Headers/PLSMultiVideoMixer.h
@@ -51,6 +51,13 @@
  */
 @property (nonatomic, assign) float frameRate;
 
+/*!
+ @property videoHardwareType
+ @brief 是否使用 H265 编码，仅支持 iOS 11.0 系统以上
+ 
+ @since      v3.1.1
+ */
+@property (assign, nonatomic) PLSVideoHardwareType videoHardwareType;
 
 /*!
  @property completionBlock

diff --git a/Pod/Library/Profession/PLShortVideoKit.framework/Headers/PLSRangeMovieExport.h b/Pod/Library/Profession/PLShortVideoKit.framework/Headers/PLSRangeMovieExport.h
@@ -62,6 +62,14 @@
  */
 @property (assign, nonatomic) NSInteger bitrate;
 
+/*!
+ @property videoHardwareType
+ @brief 是否使用 H265 编码，仅支持 iOS 11.0 系统以上
+ 
+ @since      v3.1.1
+ */
+@property (assign, nonatomic) PLSVideoHardwareType videoHardwareType;
+
 /*!
  @property completionBlock
  @abstract 视频合并完成的 block

diff --git a/Pod/Library/Profession/PLShortVideoKit.framework/Headers/PLSTypeDefines.h b/Pod/Library/Profession/PLShortVideoKit.framework/Headers/PLSTypeDefines.h
@@ -367,6 +367,17 @@ typedef enum {
     PLSAuthenticationResultAuthorized
 } PLSAuthenticationResult;
 
+/*!
+ @typedef    PLSVideoHardwareType
+ @abstract   视频编码，硬编类型。
+ 
+ @since      v3.1.1
+ */
+typedef enum {
+    PLSVideoHardwareTypeH264 = 0,
+    PLSVideoHardwareTypeHEVC = 1,  // iOS 11.0 及以上版本支持，即 hvc1
+} PLSVideoHardwareType;
+
 #endif