Skip to content

Commit

Permalink
1.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
alexyats committed Feb 25, 2019
1 parent 71202a3 commit 128817c
Show file tree
Hide file tree
Showing 32 changed files with 255 additions and 39 deletions.
3 changes: 3 additions & 0 deletions AdvancedTestApp/AdvancedTestApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@
TargetAttributes = {
FA8827DB1BB6CAA70025C71D = {
CreatedOnToolsVersion = 6.4;
DevelopmentTeam = 7BT7647345;
};
};
};
Expand Down Expand Up @@ -299,6 +300,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = 7BT7647345;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -314,6 +316,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = 7BT7647345;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand Down
4 changes: 2 additions & 2 deletions AdvancedTestApp/AdvancedTestApp/ViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
NSDictionary* item = self.videoJsonArray[indexPath.row];
cell.token = [item objectForKey:@"token"];;
cell.thumbView.image = nil;
[[self.ziggeo videos] getImageForVideoByToken:cell.token callback:^(UIImage *image, NSURLResponse *response, NSError *error) {
[[self.ziggeo videos] getImageForVideoByToken:cell.token data:nil callback:^(UIImage *image, NSURLResponse *response, NSError *error) {
dispatch_async(dispatch_get_main_queue(), ^
{
cell.thumbView.image = image;
Expand Down Expand Up @@ -177,7 +177,7 @@ - (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEd
}
if(self.videoJsonArray.count==0 && self.uploadingVideos.count == 0) [tableView deleteSections:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, 2)] withRowAnimation:UITableViewRowAnimationFade];
[tableView endUpdates];
[[self.ziggeo videos] deleteVideoByToken:videoToken callback:^(NSData *responseData, NSURLResponse *response, NSError *error) {
[[self.ziggeo videos] deleteVideoByToken:videoToken data:nil callback:^(NSData *responseData, NSURLResponse *response, NSError *error) {
[self refreshVideoJsonArray];
}];
}
Expand Down
18 changes: 18 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ Ziggeo iOS SDK 2.0

Ziggeo API (http://ziggeo.com) allows you to integrate video recording and playback with only two lines of code in your site, service or app. This is the iOS SDK repository.

## Upgrading from v 1.1.0 to v.1.1.1
The update brings new optional features such as light meter, audio level meter and face outlining. These features are also available in the updated ZiggeoRecorder delegate

## Upgrading from v.1.0.9 to v.1.1.0
The update bring hidden controls modes for recorder and player.

Expand Down Expand Up @@ -157,6 +160,21 @@ New recorder rewritten from scratch. Allows to record video and audio without in
//recorder.recordingQuality = highestQuality;
```

### Enable Face Outlining
```
recorder.showFaceOutline = YES;
```

### Enable Light Meter Indicator
```
recorder.showLightIndicator = YES;
```

### Enable Audio Level Indicator
```
recorder.showSoundIndicator = YES;
```

### Custom Create Video Parameters (like effects, profiles, etc)

```
Expand Down
10 changes: 10 additions & 0 deletions TestApp/TestApp/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#import "AppDelegate.h"
@import AVFoundation;
#import "Ziggeo/Ziggeo.h"


@interface AppDelegate ()

Expand Down Expand Up @@ -45,4 +47,12 @@ - (void)applicationWillTerminate:(UIApplication *)application {
// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
}

//finish background upload for closed or purged app
- (void)application:(UIApplication *)application handleEventsForBackgroundURLSession:(NSString *)identifier completionHandler:(void (^)(void))completionHandler {
Ziggeo* ziggeo = [[Ziggeo alloc] initWithToken:@"ZIGGEO_APP_TOKEN"];
[ziggeo.connect postWithPath:identifier Data:nil Callback:^(NSData *data, NSURLResponse *response, NSError *error) {
completionHandler();
}];
}

@end
25 changes: 21 additions & 4 deletions TestApp/TestApp/ViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#import "Ziggeo/Ziggeo.h"
@import AVKit;

@interface ViewController () {
@interface ViewController () <ZiggeoRecorder2Delegate> {
Ziggeo* m_ziggeo;
ZiggeoPlayer* embeddedPlayer;
AVPlayerLayer* embeddedPlayerLayer;
Expand All @@ -28,7 +28,6 @@ - (void)didReceiveMemoryWarning {
}

- (IBAction)playFullScreen:(id)sender {
//ZiggeoPlayer.cr
[ZiggeoPlayer createPlayerWithAdditionalParams:m_ziggeo videoToken:@"VIDEO_TOKEN" params:@{ @"client_auth" : @"CLIENT_AUTH_TOKEN" } callback:^(ZiggeoPlayer *player) {
dispatch_async(dispatch_get_main_queue(), ^
{
Expand Down Expand Up @@ -69,13 +68,18 @@ - (IBAction)playEmbedded:(id)sender {

- (IBAction)record:(id)sender {
ZiggeoRecorder2* recorder = [[ZiggeoRecorder2 alloc] initWithZiggeoApplication:m_ziggeo];
recorder.coverSelectorEnabled = NO;
recorder.coverSelectorEnabled = YES;
recorder.cameraFlipButtonVisible = YES;
recorder.cameraDevice = UIImagePickerControllerCameraDeviceFront;
recorder.useLiveStreaming = NO;
recorder.recordingQuality = HighestQuality;
recorder.maxRecordedDurationSeconds = 0; //infinite
recorder.autostartRecordingAfterSeconds = 0; //never
recorder.controlsVisible = false; //no controls, autostart enabled, max duration = 30
recorder.controlsVisible = true; //no controls, autostart enabled, max duration = 30
recorder.recorderDelegate = self;
//recorder.showSoundIndicator = false;
//recorder.showLightIndicator = false;
//recorder.showFaceOutline = false;
// recorder.extraArgsForCreateVideo = @{ @"effect_profile" : @"12345" };
// recorder level auth tokens:
// recorder.extraArgsForCreateVideo = @{ @"client_auth" : @"CLIENT_AUTH_TOKEN" };
Expand All @@ -86,4 +90,17 @@ - (IBAction)record:(id)sender {
[self presentViewController:recorder animated:true completion:nil];
}

-(void) luxMeter:(double)luminousity {
//NSLog(@"luminousity: %f", luminousity);
}

-(void) audioMeter:(double)audioLevel {
//NSLog(@"audio: %f", audioLevel);
}

-(void) faceDetected:(int)faceID rect:(CGRect)rect {
//NSLog(@"face %i detected with bounds: x = %f y = %f, size = %f x %f", faceID, rect.origin.x, rect.origin.y, rect.size.width, rect.size.height);
}


@end
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@
-(void) ziggeoRecorderDidCancel;
@optional
-(void) ziggeoRecorderCurrentRecordedDurationSeconds:(double)seconds;
@optional
-(void) luxMeter:(double)luminousity;
@optional
-(void) audioMeter:(double)audioLevel;
@optional
-(void) faceDetected:(int)faceID rect:(CGRect)rect;
@end

typedef enum : NSUInteger {
Expand All @@ -35,6 +41,9 @@ typedef enum : NSUInteger {
@property (nonatomic) bool cameraFlipButtonVisible;
@property (nonatomic) bool useLiveStreaming;
@property (nonatomic) bool controlsVisible;
@property (nonatomic) bool showFaceOutline;
@property (nonatomic) bool showLightIndicator;
@property (nonatomic) bool showSoundIndicator;
@property (nonatomic) UIImagePickerControllerCameraDevice cameraDevice;
@property (nonatomic) RecordingQuality recordingQuality;
@property (nonatomic) id<ZiggeoRecorder2Delegate> recorderDelegate;
Expand Down
Binary file modified Ziggeo/Output/Release-universal/Ziggeo.framework/Info.plist
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Ziggeo/Output/Release-universal/Ziggeo.framework/Ziggeo
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,17 @@
<dict>
<key>files</key>
<dict>
<key>AudioLevelView.nib</key>
<data>
gIYxdvQxn8MR9moXTxQg7i0EEgs=
</data>
<key>CoverSelectorController.nib</key>
<data>
jaLn0rWuPbSdSTI9WWXUKlyIS00=
EUdmb8nnWaKiIEMvz9kdtAFAwPk=
</data>
<key>CoverSelectorTableCell.nib</key>
<data>
5G01QOTkIdO/ldASWLVsNee33D0=
/YOFLu1w9H4NOgl7P669J+9TCUs=
</data>
<key>Delete-50.png</key>
<data>
Expand Down Expand Up @@ -66,15 +70,19 @@
</data>
<key>Headers/ZiggeoRecorder2.h</key>
<data>
uZWzSPrvP27UppzHXLALmAtpuCY=
Kuk49YcmfQt5xJkrOOxrqgoECM0=
</data>
<key>Headers/ZiggeoVideos.h</key>
<data>
q6O3Ii7BDd/NRKdxYiTg/lkYNZQ=
</data>
<key>Info.plist</key>
<data>
2cBttQOqgPs9758qINeANadPMNo=
yVwXfyokU47AopLmYQWCBjVuc4U=
</data>
<key>LuxMeterView.nib</key>
<data>
/ulqTpTTiPcaSny3Ds1mXuAYSao=
</data>
<key>Modules/module.modulemap</key>
<data>
Expand Down Expand Up @@ -110,7 +118,7 @@
</data>
<key>RecordedVideoPreview.nib</key>
<data>
FmuKWF7VA8vWIxSoLiioCIi5WQs=
OpYeunR2Lu80CUCVfEOJajBo3gI=
</data>
<key>Stop-100.png</key>
<data>
Expand All @@ -130,7 +138,19 @@
</data>
<key>ZiggeoRecorder2.nib</key>
<data>
pwQzIibIpB+i1/cERnr/A1hDcrs=
94a8YXZOrcz+odHJOAa2WHo9SDE=
</data>
<key>sun-50.png</key>
<data>
Nnz3mwcq0l+cIL54CIZelXbI3SI=
</data>
<key>sun-50_red.png</key>
<data>
ebZv7h55NXIKobiRfEHk/3SlkVA=
</data>
<key>sun-50_yellow.png</key>
<data>
trNlgEFEVESgpKysu/E8HDOOwKw=
</data>
<key>trash-50.png</key>
<data>
Expand Down Expand Up @@ -159,26 +179,37 @@
</dict>
<key>files2</key>
<dict>
<key>AudioLevelView.nib</key>
<dict>
<key>hash</key>
<data>
gIYxdvQxn8MR9moXTxQg7i0EEgs=
</data>
<key>hash2</key>
<data>
pBvq7fpDiDajUNpNSRk9uJ5T+nxWMCV8r7CsG0t14EU=
</data>
</dict>
<key>CoverSelectorController.nib</key>
<dict>
<key>hash</key>
<data>
jaLn0rWuPbSdSTI9WWXUKlyIS00=
EUdmb8nnWaKiIEMvz9kdtAFAwPk=
</data>
<key>hash2</key>
<data>
rKDNQOEBtVYG+Oxn4XlLOQ0DEI0kNtP1e+PiGLR/Wjc=
VDISQMSQG4hK43uiT0oYLQGQDaxhzcDE9KJkxRZcZtA=
</data>
</dict>
<key>CoverSelectorTableCell.nib</key>
<dict>
<key>hash</key>
<data>
5G01QOTkIdO/ldASWLVsNee33D0=
/YOFLu1w9H4NOgl7P669J+9TCUs=
</data>
<key>hash2</key>
<data>
gFAkIhoRjlN5mSJqGmKGYZ5GYOkEBOUy6Vs0hE9myFo=
mQ4RS/cB3ot982GFZvt2LFd0Tk7aK6+JzVpOW6X3IZ0=
</data>
</dict>
<key>Delete-50.png</key>
Expand Down Expand Up @@ -328,11 +359,11 @@
<dict>
<key>hash</key>
<data>
uZWzSPrvP27UppzHXLALmAtpuCY=
Kuk49YcmfQt5xJkrOOxrqgoECM0=
</data>
<key>hash2</key>
<data>
yV6yZqBf57Bhmt71pbPnxaKwcRIpa4AJeay7+jdnC5Q=
Fr5RY+zOhei9UXLXt78z/9aRPRNcq/QKOS7AesZFF9s=
</data>
</dict>
<key>Headers/ZiggeoVideos.h</key>
Expand All @@ -346,6 +377,17 @@
3MYTNW4pDtKMDv34fjP6zm3ERvthnb+mgf+8Pu5m9+g=
</data>
</dict>
<key>LuxMeterView.nib</key>
<dict>
<key>hash</key>
<data>
/ulqTpTTiPcaSny3Ds1mXuAYSao=
</data>
<key>hash2</key>
<data>
XrKcPwJrZXwvEAB9fSFKG0d/oaUhPSsjoe6Qw+WbApQ=
</data>
</dict>
<key>Modules/module.modulemap</key>
<dict>
<key>hash</key>
Expand Down Expand Up @@ -438,11 +480,11 @@
<dict>
<key>hash</key>
<data>
FmuKWF7VA8vWIxSoLiioCIi5WQs=
OpYeunR2Lu80CUCVfEOJajBo3gI=
</data>
<key>hash2</key>
<data>
Ah2zvE02PhU/9A+lZXsEUZg7Oc8jxEXz0Fs2x4g3Qjk=
/dNbm04TGRYTgggNcqpa2KKcmsLmRwC920QcCZsPSbU=
</data>
</dict>
<key>Stop-100.png</key>
Expand Down Expand Up @@ -493,11 +535,44 @@
<dict>
<key>hash</key>
<data>
pwQzIibIpB+i1/cERnr/A1hDcrs=
94a8YXZOrcz+odHJOAa2WHo9SDE=
</data>
<key>hash2</key>
<data>
Wl4Kg29pNqkvZH/qnGxu+JNW2qUc0uJCUWHQRPGXzQM=
</data>
</dict>
<key>sun-50.png</key>
<dict>
<key>hash</key>
<data>
Nnz3mwcq0l+cIL54CIZelXbI3SI=
</data>
<key>hash2</key>
<data>
fZ45oYbwfsV6h1ZEs2Mv7K7LFjKWxyQ3A9S162o5gUY=
</data>
</dict>
<key>sun-50_red.png</key>
<dict>
<key>hash</key>
<data>
ebZv7h55NXIKobiRfEHk/3SlkVA=
</data>
<key>hash2</key>
<data>
T1Aw54gnxKkvWJHhrabjbdZa5Ph5tji7tH1ZTMf7gsg=
</data>
</dict>
<key>sun-50_yellow.png</key>
<dict>
<key>hash</key>
<data>
trNlgEFEVESgpKysu/E8HDOOwKw=
</data>
<key>hash2</key>
<data>
NKskjntXV5XUZnVlMKpPTrvrKkzIqP89RCCRys35nIA=
x3C4ht0+IzdPawGcY8r1IEt+nZzSOetbwsh8aHeamsE=
</data>
</dict>
<key>trash-50.png</key>
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 128817c

Please sign in to comment.