update PLShortVideoKitDemo

pili-engineering · Jun 22, 2018 · a9b5047 · a9b5047
1 parent 7b75f67
commit a9b5047
Show file tree

Hide file tree

Showing 1,287 changed files with 22,218 additions and 69,566 deletions.
diff --git a/Example/PLShortVideoKitDemo.xcodeproj/project.pbxproj b/Example/PLShortVideoKitDemo.xcodeproj/project.pbxproj
diff --git a/Example/PLShortVideoKitDemo/ARWebViewController.h b/Example/PLShortVideoKitDemo/ARWebViewController.h
diff --git a/Example/PLShortVideoKitDemo/ARWebViewController.m b/Example/PLShortVideoKitDemo/ARWebViewController.m
diff --git a/Example/PLShortVideoKitDemo/AppDelegate.m b/Example/PLShortVideoKitDemo/AppDelegate.m
@@ -9,16 +9,8 @@
 #import "AppDelegate.h"
 #import <Fabric/Fabric.h>
 #import <Crashlytics/Crashlytics.h>
-#import <easyar3d/EasyAR3D.h>
-#import "easyar3d/EasyARScene.h"
-#import "SPARManager.h"
 #import "PLShortVideoKit/PLShortVideoKit.h"
 
-// TuSDK mark
-#import <TuSDK/TuSDK.h>
-// AR 特效的 key
-NSString *easyAR3DKey = @"zYnUPaCAWtl4WDH3qLu290KRFA7gCCU2iyI9127chA6gvLQyr9CUlawIjMdC1OXxLwsUWvNN2zI2XIElU8AP2QitdZ4WFAfoA8DdJbos2FL4FnPKiSjX52Avh524oxXLF8iOuZXg4YFSQWgKrhkLsJs8K8NxsEdoWh2UCuRsONxjHAdDX0V871RQMydPAyFzx4L0fTUe";
-
 @interface AppDelegate ()
 
 @end
@@ -36,28 +28,6 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     // crash 收集
     [Fabric with:@[[Crashlytics class]]];
 
-    // TuSDK mark - 初始化 TuSDK
-    [TuSDK setLogLevel:lsqLogLevelDEBUG]; // 可选: 设置日志输出级别 (默认不输出)
-    [TuSDK initSdkWithAppKey:@"3ad4ee3da6c0b41c-03-bshmr1"];
-
-    // AR 特效
-    [EasyAR3D initialize:easyAR3DKey];
-    NSString *path = [[NSBundle mainBundle] resourcePath];
-    [EasyARScene setUriTranslator:^ NSString * (NSString * uri) {
-        SPARManager * manager = [SPARManager sharedManager];
-        if ([uri isEqualToString:@"local://Recorder.json"]) {
-            return [NSString stringWithFormat:@"%@/Recorder.json",path];
-        }else if ([uri isEqualToString:@"local://Recorder.js"]){
-            return [NSString stringWithFormat:@"%@/Recorder.js",path];
-
-        }else if ([uri isEqualToString:@"local://PostBasic.effect"]){
-
-            return [NSString stringWithFormat:@"%@/PostBasic.effect",path];
-
-        }
-        return [manager getLocalPathForURL:uri];
-    }];
-
     return YES;
 }
 

diff --git a/Example/PLShortVideoKitDemo/ClipMovieViewController.h b/Example/PLShortVideoKitDemo/ClipMovieViewController.h
diff --git a/Example/PLShortVideoKitDemo/ClipMovieViewController.m b/Example/PLShortVideoKitDemo/ClipMovieViewController.m
diff --git a/Example/PLShortVideoKitDemo/DubViewController.m b/Example/PLShortVideoKitDemo/DubViewController.m
@@ -209,8 +209,8 @@ - (void)saveButtonClick {
 
 - (AVAsset *)mixAssetProcessing {
     AVAsset *asset = self.movieSettings[PLSAssetKey];
-    CMTime start = CMTimeMake([self.movieSettings[PLSStartTimeKey] floatValue] * 1e9, 1e9);
-    CMTime duration = CMTimeMake([self.movieSettings[PLSDurationKey] floatValue] * 1e9, 1e9);
+    CMTime start = CMTimeMake([self.movieSettings[PLSStartTimeKey] floatValue] * 1000, 1000);
+    CMTime duration = CMTimeMake([self.movieSettings[PLSDurationKey] floatValue] * 1000, 1000);
     CMTimeRange timeRange = CMTimeRangeMake(start, duration);
 
     // 先去掉 self.movieSettings[PLSAssetKey] 的音频轨，再跟录制的纯音频混合