Merge pull request #34 from depthlove/master

release v1.9.0

APIDiffs/api-diffs-1.9.0.md

@@ -0,0 +1,78 @@
+# PLShortVideoKit 1.8.0 to 1.9.0 API Differences
+
+## General Headers
+
+```
+PLShortVideoRecorder.h
+```
+
+- *Deprecated* - (void)shortVideoRecorderDidFocusAtPoint:(CGPoint)point;
+
+- *Added* - (void)shortVideoRecorder:(PLShortVideoRecorder *__nonnull)recorder didFocusAtPoint:(CGPoint)point;
+
+- *Added* - (void)getScreenShotWithCompletionHandler:(void(^_Nullable)(UIImage * _Nullable image))handle;
+
+
+
+```
+PLShortVideoEditor.h
+```
+
+- *Deprecated* - (CVPixelBufferRef)shortVideoEditor:(PLShortVideoEditor *)editor didGetOriginPixelBuffer:(CVPixelBufferRef)pixelBuffer;
+
+- *Added* - (CVPixelBufferRef)shortVideoEditor:(PLShortVideoEditor *)editor didGetOriginPixelBuffer:(CVPixelBufferRef)pixelBuffer timestamp:(CMTime)timestamp;
+
+- *Added* - (void)shortVideoEditor:(PLShortVideoEditor *)editor didReadyToPlayForAsset:(AVAsset *)asset timeRange:(CMTimeRange)timeRange;
+
+- *Added* - (void)shortVideoEditor:(PLShortVideoEditor *)editor didReachEndForAsset:(AVAsset *)asset timeRange:(CMTimeRange)timeRange;
+
+- *Added* @property (assign, nonatomic, readonly) BOOL isEditing;
+
+- *Added* - (CMTime)currentTime;
+
+- *Added* - (void)seekToTime:(CMTime)time completionHandler:(void (^)(BOOL finished))completionHandler;
+
+
+
+```
+PLSEditPlayer.h
+```
+
+- *Deprecated* - (CVPixelBufferRef __nonnull)player:(PLSEditPlayer *__nonnull)player didGetOriginPixelBuffer:(CVPixelBufferRef __nonnull)pixelBuffer;
+
+- *Added* - (CVPixelBufferRef __nonnull)player:(PLSEditPlayer *__nonnull)player didGetOriginPixelBuffer:(CVPixelBufferRef __nonnull)pixelBuffer timestamp:(CMTime)timestamp;
+
+- *Added* - (void)player:(PLSEditPlayer *__nonnull)player didReadyToPlayForItem:(AVPlayerItem *__nonnull)item timeRange:(CMTimeRange)timeRange;
+
+- *Added* - (void)player:(PLSEditPlayer *__nonnull)player didReachEndForItem:(AVPlayerItem *__nonnull)item timeRange:(CMTimeRange)timeRange;
+
+
+```
+PLSAVAssetExportSession
+```
+
+- *Deprecated* - (CVPixelBufferRef __nonnull)assetExportSession:(PLSAVAssetExportSession *__nonnull)assetExportSession didOutputPixelBuffer:(CVPixelBufferRef __nonnull)pixelBuffer;
+
+- *Added* - (CVPixelBufferRef __nonnull)assetExportSession:(PLSAVAssetExportSession *__nonnull)assetExportSession didOutputPixelBuffer:(CVPixelBufferRef __nonnull)pixelBuffer timestamp:(CMTime)timestamp;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

Example/PLShortVideoKitDemo/AppDelegate.m

@@ -14,6 +14,9 @@
 #import "SPARManager.h"
 #import "PLShortVideoKit/PLShortVideoKit.h"
 
+// TuSDK mark
+#import <TuSDK/TuSDK.h>
+
 // AR 特效的 key
 NSString *easyAR3DKey = @"zYnUPaCAWtl4WDH3qLu290KRFA7gCCU2iyI9127chA6gvLQyr9CUlawIjMdC1OXxLwsUWvNN2zI2XIElU8AP2QitdZ4WFAfoA8DdJbos2FL4FnPKiSjX52Avh524oxXLF8iOuZXg4YFSQWgKrhkLsJs8K8NxsEdoWh2UCuRsONxjHAdDX0V871RQMydPAyFzx4L0fTUe";
 
@@ -35,6 +38,10 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     // crash 收集
     [Fabric with:@[[Crashlytics class]]];
 
+    // TuSDK mark - 初始化 TuSDK
+    [TuSDK setLogLevel:lsqLogLevelDEBUG]; // 可选: 设置日志输出级别 (默认不输出)
+    [TuSDK initSdkWithAppKey:@"d72964a2c6e50a7e-03-bshmr1"];
+
     // AR 特效
     [EasyAR3D initialize:easyAR3DKey];
     NSString *path = [[NSBundle mainBundle] resourcePath];

Example/PLShortVideoKitDemo/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -143,11 +143,6 @@
       "idiom" : "ipad",
       "filename" : "Icon-App-83.5x83.5@2x.png",
       "scale" : "2x"
-    },
-    {
-      "idiom" : "ios-marketing",
-      "size" : "1024x1024",
-      "scale" : "1x"
     }
   ],
   "info" : {

Example/PLShortVideoKitDemo/ClipMovieViewController.m

@@ -12,8 +12,8 @@
 #import "PLSClipMovieView.h"
 #import <Masonry/Masonry.h>
 
+#define iPhoneX ([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(1125, 2436), [[UIScreen mainScreen] currentMode].size) : NO)
 #define PLS_RGBCOLOR(r,g,b) [UIColor colorWithRed:(r)/255.0 green:(g)/255.0 blue:(b)/255.0 alpha:1]
-
 #define PLS_BaseToolboxView_HEIGHT 64
 #define PLS_SCREEN_WIDTH CGRectGetWidth([UIScreen mainScreen].bounds)
 #define PLS_SCREEN_HEIGHT CGRectGetHeight([UIScreen mainScreen].bounds)
@@ -105,7 +105,11 @@ - (void)setupBaseToolboxView {
 
     // 标题
     UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(100, 0, 100, 64)];
-    titleLabel.center = CGPointMake(PLS_SCREEN_WIDTH / 2, 32);
+    if (iPhoneX) {
+        titleLabel.center = CGPointMake(PLS_SCREEN_WIDTH / 2, 48);
+    } else {
+        titleLabel.center = CGPointMake(PLS_SCREEN_WIDTH / 2, 32);
+    }
     titleLabel.text = @"剪辑";
     titleLabel.textAlignment = NSTextAlignmentCenter;
     titleLabel.textColor = [UIColor grayColor];

Example/PLShortVideoKitDemo/DubViewController.m

@@ -10,8 +10,8 @@
 #import "PLSProgressBar.h"
 #import "PLShortVideoKit/PLShortVideoKit.h"
 
+#define iPhoneX ([UIScreen instancesRespondToSelector:@selector(currentMode)] ? CGSizeEqualToSize(CGSizeMake(1125, 2436), [[UIScreen mainScreen] currentMode].size) : NO)
 #define PLS_RGBCOLOR(r,g,b) [UIColor colorWithRed:(r)/255.0 green:(g)/255.0 blue:(b)/255.0 alpha:1]
-
 #define PLS_SCREEN_WIDTH CGRectGetWidth([UIScreen mainScreen].bounds)
 #define PLS_SCREEN_HEIGHT CGRectGetHeight([UIScreen mainScreen].bounds)
 
@@ -113,7 +113,11 @@ - (void)setupBaseToolboxView {
 
     // 标题
     UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(100, 0, 100, 64)];
-    titleLabel.center = CGPointMake(PLS_SCREEN_WIDTH / 2, 32);
+    if (iPhoneX) {
+        titleLabel.center = CGPointMake(PLS_SCREEN_WIDTH / 2, 48);
+    } else {
+        titleLabel.center = CGPointMake(PLS_SCREEN_WIDTH / 2, 32);
+    }
     titleLabel.text = @"录制音频";
     titleLabel.textAlignment = NSTextAlignmentCenter;
     titleLabel.textColor = [UIColor grayColor];