Skip to content

Commit

Permalink
Merge pull request #121 from LZYongcn/master
Browse files Browse the repository at this point in the history 
release 3.2.2
  • Loading branch information
LZYongcn authored Nov 5, 2020
2 parents d0b37f1 + cfcd9cb commit 393c21d
Show file tree
Hide file tree
Showing 10 changed files with 143 additions and 7 deletions.
4 changes: 4 additions & 0 deletions APIDiffs/api-diffs-3.2.2.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# PLShortVideoKit 3.2.1 to 3.2.2 API Differences

## General Headers

2 changes: 1 addition & 1 deletion PLShortVideoKit-Advanced.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Pod::Spec.new do |s|

s.name = "PLShortVideoKit"
s.version = "3.2.1"
s.version = "3.2.2"
s.summary = "PILI iOS short video record SDK"
s.homepage = "https://github.com/pili-engineering/PLShortVideoKit"
s.license = "Apache License 2.0"
Expand Down
2 changes: 1 addition & 1 deletion PLShortVideoKit-Basic.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Pod::Spec.new do |s|

s.name = "PLShortVideoKit"
s.version = "3.2.1"
s.version = "3.2.2"
s.summary = "PILI iOS short video record SDK"
s.homepage = "https://github.com/pili-engineering/PLShortVideoKit"
s.license = "Apache License 2.0"
Expand Down
2 changes: 1 addition & 1 deletion PLShortVideoKit-Smart.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Pod::Spec.new do |s|

s.name = "PLShortVideoKit"
s.version = "3.2.1"
s.version = "3.2.2"
s.summary = "PILI iOS short video record SDK"
s.homepage = "https://github.com/pili-engineering/PLShortVideoKit"
s.license = "Apache License 2.0"
Expand Down
2 changes: 1 addition & 1 deletion PLShortVideoKit.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Pod::Spec.new do |s|

s.name = "PLShortVideoKit"
s.version = "3.2.1"
s.version = "3.2.2"
s.summary = "PILI iOS short video record SDK"
s.homepage = "https://github.com/pili-engineering/PLShortVideoKit"
s.license = "Apache License 2.0"
Expand Down
Binary file modified Pod/Library/Profession/PLShortVideoKit.framework/Info.plist
View file
Binary file not shown.
Binary file modified Pod/Library/Profession/PLShortVideoKit.framework/PLShortVideoKit
View file
Binary file not shown.
18 changes: 18 additions & 0 deletions ReleaseNotes/release-notes-3.2.2.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# PLShortVideoKit Release Notes for 3.2.2

### 简介
PLShortVideoKit 是七牛推出的一款适用于 iOS 平台的短视频 SDK，提供了包括美颜、滤镜、水印、断点录制、分段回删、视频编辑、混音特效、MV 特效、本地/云端存储在内的多种功能，支持高度定制以及二次开发。

### 版本
- 发布 PLShortVideoKit.framework

### 缺陷
- 修复后置切前置第一帧画面镜像的问题
- 修复转码有色差的问题
- 修复横屏拍摄时内存泄漏的问题


### 注意事项
- 七牛短视频 SDK 自 v3.0.0 版本起, 划分为精简版、基础版、进阶版、专业版 。不同版本 SDK 可以使用的功能点数量有差别，请按照购买的 License 版本使用对应的短视频 SDK 版本。
- 若需要使用 PLShortVideoKit.framework 中的内置滤镜，则必须将 PLShortVideoKit.bundle 导入项目中。若需要增删、替换滤镜资源可操作 PLShortVideoKit.bundle 中的 colorFilter 文件夹。
- 抖音特效，需要联系七牛商务获取 appkey 和资源文件。具体使用可参看 PLShortVideoKitDemo。
118 changes: 116 additions & 2 deletions ShortVideoFunctionDemo/PLShortVideoKitDemo.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@
9343A8C01F66763A007213BD /* Time_Machine_No_Reverser.png in Resources */ = {isa = PBXBuildFile; fileRef = 9343A8BE1F66763A007213BD /* Time_Machine_No_Reverser.png */; };
9343A8C11F66763A007213BD /* Time_Machine_Reverser.png in Resources */ = {isa = PBXBuildFile; fileRef = 9343A8BF1F66763A007213BD /* Time_Machine_Reverser.png */; };
9C42B4832402B2F000D5D2D7 /* ScreenRecordViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C42B4822402B2F000D5D2D7 /* ScreenRecordViewController.m */; };
9CE2C18E237C020500D43873 /* PLShortVideoKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC277F1A223A417C004137ED /* PLShortVideoKit.framework */; };
AA09EB0322E7F71E001BBA54 /* PLSDrawView.m in Sources */ = {isa = PBXBuildFile; fileRef = AA09EB0222E7F71E001BBA54 /* PLSDrawView.m */; };
AA09EB0D22E7FD2F001BBA54 /* PLSDrawBar.m in Sources */ = {isa = PBXBuildFile; fileRef = AA09EB0C22E7FD2F001BBA54 /* PLSDrawBar.m */; };
AA09EB1022E80583001BBA54 /* PLSDrawModel.m in Sources */ = {isa = PBXBuildFile; fileRef = AA09EB0F22E80583001BBA54 /* PLSDrawModel.m */; };
Expand Down Expand Up @@ -245,6 +246,51 @@
F360B89E036039A66815D9FE /* libPods-PLShortVideoKitDemo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57AEAFA0012D959C08AB23AE /* libPods-PLShortVideoKitDemo.a */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
0A9435DC1E6CA3D4008845A3 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0A9435D81E6CA3D4008845A3 /* PLShortVideoKit.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 0A9435A01E6CA32F008845A3;
remoteInfo = PLShortVideoKit;
};
0A94DFA51E6DCF09007BDD0D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0A9435D81E6CA3D4008845A3 /* PLShortVideoKit.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 0A94359F1E6CA32F008845A3;
remoteInfo = PLShortVideoKit;
};
9C0CD1BA2341A00400692CCE /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0A9435D81E6CA3D4008845A3 /* PLShortVideoKit.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = AA1B18DD231D336500645CEF;
remoteInfo = PLShortVideoSmartKit;
};
BC277F17223A417C004137ED /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0A9435D81E6CA3D4008845A3 /* PLShortVideoKit.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = BCD9A496221FD48B009A7315;
remoteInfo = PLShortVideoCoreKit;
};
BC277F19223A417C004137ED /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0A9435D81E6CA3D4008845A3 /* PLShortVideoKit.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = BC277D652238DE7B004137ED;
remoteInfo = PLShortVideoBasicKit;
};
BCA4E706223F8E9800957D24 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0A9435D81E6CA3D4008845A3 /* PLShortVideoKit.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = BCF95E81223B462600D87795;
remoteInfo = PLShortVideoStandardKit;
};
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
0A0692311E8A3B590035CB7B /* btn_bar_back_a@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "btn_bar_back_a@2x.png"; path = "images/btn_bar_back_a@2x.png"; sourceTree = "<group>"; };
0A0692321E8A3B590035CB7B /* btn_bar_back_a@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "btn_bar_back_a@3x.png"; path = "images/btn_bar_back_a@3x.png"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -343,6 +389,7 @@
0A94358B1E6CA2E2008845A3 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
0A94358E1E6CA2E2008845A3 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
0A9435901E6CA2E2008845A3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
0A9435D81E6CA3D4008845A3 /* PLShortVideoKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PLShortVideoKit.xcodeproj; path = ../PLShortVideoKit/PLShortVideoKit.xcodeproj; sourceTree = "<group>"; };
0A94DFC61E6DF5D2007BDD0D /* end_normal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = end_normal.png; path = images/end_normal.png; sourceTree = "<group>"; };
0A94DFC71E6DF5D2007BDD0D /* delete.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = delete.png; path = images/delete.png; sourceTree = "<group>"; };
0A94DFCB1E6DF5D2007BDD0D /* toggle_camera.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = toggle_camera.png; path = images/toggle_camera.png; sourceTree = "<group>"; };
Expand Down Expand Up @@ -557,6 +604,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
9CE2C18E237C020500D43873 /* PLShortVideoKit.framework in Frameworks */,
BC281BF8225212C700CC7584 /* ReplayKit.framework in Frameworks */,
0A0DCA2A1FB0715100F1446F /* Accelerate.framework in Frameworks */,
C3A78FB71F95F67500C3F2D6 /* libc++.tbd in Frameworks */,
Expand Down Expand Up @@ -585,6 +633,7 @@
0A9435731E6CA2E2008845A3 = {
isa = PBXGroup;
children = (
0A9435D81E6CA3D4008845A3 /* PLShortVideoKit.xcodeproj */,
0A94357E1E6CA2E2008845A3 /* PLShortVideoKitDemo */,
0A94357D1E6CA2E2008845A3 /* Products */,
32B90CBBA587775FFC5C4D5B /* Pods */,
Expand Down Expand Up @@ -808,6 +857,18 @@
name = "Supporting Files";
sourceTree = "<group>";
};
0A9435D91E6CA3D4008845A3 /* Products */ = {
isa = PBXGroup;
children = (
0A9435DD1E6CA3D4008845A3 /* PLShortVideoKit.framework */,
BC277F18223A417C004137ED /* PLShortVideoKit.framework */,
BC277F1A223A417C004137ED /* PLShortVideoKit.framework */,
BCA4E707223F8E9800957D24 /* PLShortVideoKit.framework */,
9C0CD1BB2341A00400692CCE /* PLShortVideoKit.framework */,
);
name = Products;
sourceTree = "<group>";
};
0A9B8A6520B6822800E7C8D7 /* StickerToolbox */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1029,6 +1090,7 @@
buildRules = (
);
dependencies = (
0A94DFA61E6DCF09007BDD0D /* PBXTargetDependency */,
);
name = PLShortVideoKitDemo;
productName = PLShortVideoKitDemo;
Expand Down Expand Up @@ -1064,13 +1126,57 @@
mainGroup = 0A9435731E6CA2E2008845A3;
productRefGroup = 0A94357D1E6CA2E2008845A3 /* Products */;
projectDirPath = "";
projectReferences = (
{
ProductGroup = 0A9435D91E6CA3D4008845A3 /* Products */;
ProjectRef = 0A9435D81E6CA3D4008845A3 /* PLShortVideoKit.xcodeproj */;
},
);
projectRoot = "";
targets = (
0A94357B1E6CA2E2008845A3 /* PLShortVideoKitDemo */,
);
};
/* End PBXProject section */

/* Begin PBXReferenceProxy section */
0A9435DD1E6CA3D4008845A3 /* PLShortVideoKit.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = PLShortVideoKit.framework;
remoteRef = 0A9435DC1E6CA3D4008845A3 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
9C0CD1BB2341A00400692CCE /* PLShortVideoKit.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = PLShortVideoKit.framework;
remoteRef = 9C0CD1BA2341A00400692CCE /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
BC277F18223A417C004137ED /* PLShortVideoKit.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = PLShortVideoKit.framework;
remoteRef = BC277F17223A417C004137ED /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
BC277F1A223A417C004137ED /* PLShortVideoKit.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = PLShortVideoKit.framework;
remoteRef = BC277F19223A417C004137ED /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
BCA4E707223F8E9800957D24 /* PLShortVideoKit.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = PLShortVideoKit.framework;
remoteRef = BCA4E706223F8E9800957D24 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */

/* Begin PBXResourcesBuildPhase section */
0A94357A1E6CA2E2008845A3 /* Resources */ = {
isa = PBXResourcesBuildPhase;
Expand Down Expand Up @@ -1343,6 +1449,14 @@
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
0A94DFA61E6DCF09007BDD0D /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = PLShortVideoKit;
targetProxy = 0A94DFA51E6DCF09007BDD0D /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */

/* Begin PBXVariantGroup section */
0A9435881E6CA2E2008845A3 /* Main.storyboard */ = {
isa = PBXVariantGroup;
Expand Down Expand Up @@ -1481,7 +1595,7 @@
"$(PROJECT_DIR)",
"$(PROJECT_DIR)/PLShortVideoKitDemo/Librarys",
);
MARKETING_VERSION = 3.2.0;
MARKETING_VERSION = 3.2.2;
PRODUCT_BUNDLE_IDENTIFIER = com.qbox.PLShortVideoKitDemo;
PRODUCT_NAME = "$(TARGET_NAME)";
TARGETED_DEVICE_FAMILY = 1;
Expand Down Expand Up @@ -1515,7 +1629,7 @@
"$(PROJECT_DIR)",
"$(PROJECT_DIR)/PLShortVideoKitDemo/Librarys",
);
MARKETING_VERSION = 3.2.0;
MARKETING_VERSION = 3.2.2;
PRODUCT_BUNDLE_IDENTIFIER = com.qbox.PLShortVideoKitDemo;
PRODUCT_NAME = "$(TARGET_NAME)";
TARGETED_DEVICE_FAMILY = 1;
Expand Down
2 changes: 1 addition & 1 deletion ShortVideoFunctionDemo/PLShortVideoKitDemo/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>$(MARKETING_VERSION).git-2020-09-18-dd1de68</string>
<string>$(MARKETING_VERSION).git-2020-10-22-7da20f7</string>
<key>Fabric</key>
<dict>
<key>APIKey</key>
Expand Down

0 comments on commit 393c21d

Please sign in to comment.