Skip to content

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

put model in bundle

roryclear423f0197cec5
diff --git a/clearcam/ViewController.m b/clearcam/ViewController.m
index cf37cf8..8a64f11 100644
--- a/clearcam/ViewController.m
+++ b/clearcam/ViewController.m
@@ -804,7 +804,7 @@ NSMutableDictionary *classColorMap;
NSLog(@"Exception in ensureFreeDiskSpace: %@", exception.reason);
return YES;
}
- NSLog(@"Free space = %f MB", (double)[[[[NSFileManager defaultManager] attributesOfFileSystemForPath:NSHomeDirectory() error:nil] objectForKey:NSFileSystemFreeSize] unsignedLongLongValue] / (1024.0 * 1024.0));
+ //NSLog(@"Free space = %f MB", (double)[[[[NSFileManager defaultManager] attributesOfFileSystemForPath:NSHomeDirectory() error:nil] objectForKey:NSFileSystemFreeSize] unsignedLongLongValue] / (1024.0 * 1024.0));
return YES;
}
diff --git a/clearcam/Yolo.m b/clearcam/Yolo.m
index 7f0be91..5152ab5 100644
--- a/clearcam/Yolo.m
+++ b/clearcam/Yolo.m
@@ -79,19 +79,17 @@ UInt8 *rgbData;
uname(&systemInfo);
NSString *deviceModel = [NSString stringWithCString:systemInfo.machine encoding:NSUTF8StringEncoding];
- NSString *urlPath = @"https://raw.githubusercontent.com/roryclear/yolov8-tinygrad-ios/main/batch_req_%dx%d";
- if ([deviceModel isEqualToString:@"iPhone8,4"] || [deviceModel isEqualToString:@"iPhone12,8"]) { //IPHONE SE1 and SE2, TODO finish
- path = @"batch_req_se1_%dx%d";
- urlPath = @"https://raw.githubusercontent.com/roryclear/yolov8-tinygrad-ios/main/batch_req_se1_%dx%d";
- }
- NSString *filePath = [documentsPath stringByAppendingPathComponent:[NSString stringWithFormat:path, self.yolo_res, self.yolo_res]];
- if (![[NSFileManager defaultManager] fileExistsAtPath:filePath]) {
- NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:urlPath, self.yolo_res, self.yolo_res]];
- NSData *data = [NSData dataWithContentsOfURL:url];
- [data writeToFile:filePath atomically:YES];
+ NSString *fileName;
+ if ([deviceModel isEqualToString:@"iPhone8,4"] || [deviceModel isEqualToString:@"iPhone12,8"]) {
+ fileName = [NSString stringWithFormat:@"batch_req_se1_%dx%d", self.yolo_res, self.yolo_res];
+ } else {
+ fileName = [NSString stringWithFormat:@"batch_req_%dx%d", self.yolo_res, self.yolo_res];
}
- NSData *ns_data = [NSData dataWithContentsOfFile:filePath];
+ NSString *filePath = [[NSBundle mainBundle] pathForResource:fileName ofType:nil];
+ NSData *ns_data = nil;
+ if (filePath) ns_data = [NSData dataWithContentsOfFile:filePath];
+
self.data = CFDataCreate(NULL, [ns_data bytes], [ns_data length]);
const UInt8 *bytes = CFDataGetBytePtr(self.data);
diff --git a/clearcam/batch_req_640x640 b/clearcam/batch_req_640x640
new file mode 100644
index 0000000..df7b791
Binary files /dev/null and b/clearcam/batch_req_640x640 differ
diff --git a/clearcam/batch_req_se1_640x640 b/clearcam/batch_req_se1_640x640
new file mode 100644
index 0000000..58ef1d5
Binary files /dev/null and b/clearcam/batch_req_se1_640x640 differ