Skip to content

Commit

Permalink
Merge pull request #52 from anhaoxiong/master
Browse files Browse the repository at this point in the history
update document and demo to 1.11.0
  • Loading branch information
geeklok authored Jun 22, 2018
2 parents 5569ee2 + a9b5047 commit b0783c0
Show file tree
Hide file tree
Showing 1,311 changed files with 23,720 additions and 69,872 deletions.
89 changes: 89 additions & 0 deletions APIDiffs/api-diffs-1.11.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
# PLShortVideoKit 1.10.0 to 1.11.0 API Differences

## General Headers


```
PLShortVideoRecorder.h
```

- *Added* @property (strong, nonatomic) UIView *_Nullable catpuredView;

- *Added* - (nonnull instancetype)initWithCatpuredViewVideoConfiguration:(PLSVideoConfiguration *_Nonnull)catpuredViewVideoConfiguration audioConfiguration:(PLSAudioConfiguration *_Nullable)audioConfiguration;

- *Added* @property (assign, nonatomic) BOOL backgroundMonitorEnable;

- *Added* - (void)mixAudio:(NSURL *_Nullable)audioURL playEnable:(BOOL)playEnable;

- *Added* - (void)mixAudio:(NSURL *_Nullable)audioURL startTime:(NSTimeInterval)startTime volume:(CGFloat)volume playEnable:(BOOL)playEnable;

```
PLShortVideoEditor.h
```

- *Added* - (instancetype)initWithPlayerItem:(AVPlayerItem *)playerItem videoSize:(CGSize)videoSize;

- *Added* - (void)addMusic:(NSURL *)musicURL timeRange:(CMTimeRange)timeRange volume:(NSNumber *)volume loopEnable:(BOOL)loopEnable;

- *Added* - (void)updateMultiMusics:(NSArray <NSDictionary *>*)multiMusicsSettings;


```
PLSRangeMovieExport.h
```

- *Added* @property (assign, nonatomic) PLSFilePreset outputFilePreset;



```
PLSEditSettings.h
```

- *Added* PLS_EXPORT NSString *const PLSStickerSettingsKey;

- *Added* PLS_EXPORT NSString *const PLSLocationStartTimeKey;

- *Added* PLS_EXPORT NSString *const PLSLocationDurationKey;



```
PLShortVideoTranscoder.h
```

- *Added* @property (assign, nonatomic) float bitrate;


```
PLSAVAssetExportSession.h
```
- *Added* @property (assign, nonatomic) float bitrate;


```
Added Class PLSAudioMixConfiguration
Added Class PLSVideoMixConfiguration
Added Class PLSVideoMixRecorder
Added Class PLSMixMediaItem
Added Class PLSMultiVideoMixer
Added Class PLSImageRotateRecorder
Added Class AVAsset+PLSExtendProperty
```













2,554 changes: 400 additions & 2,154 deletions Example/PLShortVideoKitDemo.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

14 changes: 0 additions & 14 deletions Example/PLShortVideoKitDemo/ARWebViewController.h

This file was deleted.

69 changes: 0 additions & 69 deletions Example/PLShortVideoKitDemo/ARWebViewController.m

This file was deleted.

30 changes: 0 additions & 30 deletions Example/PLShortVideoKitDemo/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
}

Expand Down
15 changes: 0 additions & 15 deletions Example/PLShortVideoKitDemo/ClipMovieViewController.h

This file was deleted.

Loading

0 comments on commit b0783c0

Please sign in to comment.