Skip to content

Add object detection, tracking, mobile notifications, and search to any security camera.

remove awful hacks

roryclearba760730fed7
diff --git a/clearcam/SettingsManager.h b/clearcam/SettingsManager.h
index fa74665..6c70d98 100644
--- a/clearcam/SettingsManager.h
+++ b/clearcam/SettingsManager.h
@@ -8,7 +8,6 @@
@property (nonatomic, strong) NSString *width;
@property (nonatomic, strong) NSString *height;
@property (nonatomic, strong) NSString *text_size;
-@property (nonatomic, strong) NSString *old_width;
@property (nonatomic, strong) NSString *preset; //todo, resolution
@@ -17,6 +16,5 @@
- (void)loadResolutionSettings;
- (void)saveResolutionSettings;
- (void)updateResolutionWithWidth:(NSString *)width height:(NSString *)height textSize:(NSString *)textSize preset:(NSString *)preset;
-- (void)revertResolution;
@end
diff --git a/clearcam/SettingsManager.m b/clearcam/SettingsManager.m
index 94b4a5c..61ce78b 100644
--- a/clearcam/SettingsManager.m
+++ b/clearcam/SettingsManager.m
@@ -70,7 +70,6 @@
// Update resolution settings
- (void)updateResolutionWithWidth:(NSString *)width height:(NSString *)height textSize:(NSString *)textSize preset:(NSString *)preset {
- self.old_width = self.width;
self.width = width;
self.height = height;
self.text_size = textSize;
@@ -78,18 +77,4 @@
[self saveResolutionSettings];
}
-- (void)revertResolution{
- self.width = self.old_width;
- if([self.width isEqualToString:@"1280"]){
- self.height = @"720";
- self.text_size = @"2";
- self.preset = @"AVCaptureSessionPreset1280x720";
- } else {
- self.height = @"1080";
- self.text_size = @"1";
- self.preset = @"AVCaptureSessionPreset1920x1080";
- }
- [self saveResolutionSettings];
-}
-
@end
diff --git a/clearcam/ViewController.m b/clearcam/ViewController.m
index 4fdeac6..d5416c7 100644
--- a/clearcam/ViewController.m
+++ b/clearcam/ViewController.m
@@ -378,6 +378,7 @@ NSMutableDictionary *classColorMap;
- (void)setupCameraWithWidth:(NSString *)width height:(NSString *)height {
self.captureSession = [[AVCaptureSession alloc] init];
NSString *presetString = [NSString stringWithFormat:@"AVCaptureSessionPreset%@x%@", width, height];
+ if(self.isStreaming) presetString = @"AVCaptureSessionPreset640x480";
if ([self.captureSession canSetSessionPreset:presetString]) {
self.captureSession.sessionPreset = presetString;
@@ -435,6 +436,10 @@ NSMutableDictionary *classColorMap;
SettingsManager *settings = [SettingsManager sharedManager];
int videoWidth = [settings.width intValue];
int videoHeight = [settings.height intValue];
+ if(self.isStreaming){
+ videoHeight = 480;
+ videoWidth = 640;
+ }
// Create a folder for the day within the documents directory
NSURL *documentsDirectory = [[[NSFileManager defaultManager] URLsForDirectory:NSDocumentDirectory inDomains:NSUserDomainMask] firstObject];
@@ -1134,23 +1139,17 @@ NSMutableDictionary *classColorMap;
NSLog(@"📤 Upload link received: %@", uploadLink);
self.isStreaming = YES;
[FileServer sharedInstance].segment_length = 2;
- if(![[SettingsManager sharedManager].width isEqualToString:@"640"]) {
- [[SettingsManager sharedManager] updateResolutionWithWidth:@"640" height:@"480" textSize:@"2" preset:@"AVCaptureSessionPreset640x480"];
- dispatch_async(dispatch_get_main_queue(), ^{
- [self refreshView];
- });
- }
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [self refreshView];
+ });
}
} else {
if(self.isStreaming){ //todo, messy
self.isStreaming = NO;
[FileServer sharedInstance].segment_length = 1;
- if([SettingsManager sharedManager].old_width && ![[SettingsManager sharedManager].width isEqualToString:[SettingsManager sharedManager].old_width]){
- [[SettingsManager sharedManager] revertResolution];
- dispatch_async(dispatch_get_main_queue(), ^{
- [self refreshView];
- });
- }
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [self refreshView];
+ });
NSLog(@"no link");
}
}