Skip to content

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

fix yolo preset regression

roryclear70adf512f662
diff --git a/clearcam/Yolo.h b/clearcam/Yolo.h
index 96ac226..3c9b234 100644
--- a/clearcam/Yolo.h
+++ b/clearcam/Yolo.h
@@ -19,6 +19,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, strong) NSString *input_buffer;
@property (nonatomic, strong) NSString *output_buffer;
@property (nonatomic, assign) UInt8 *rgbData;
+@property (nonatomic, strong) NSSet<NSNumber *> *yoloIndexSet;
- (NSArray *)yolo_infer:(CGImageRef)cgImage withOrientation:(AVCaptureVideoOrientation)orientation;
// Initializer
diff --git a/clearcam/Yolo.m b/clearcam/Yolo.m
index f94315b..6307273 100644
--- a/clearcam/Yolo.m
+++ b/clearcam/Yolo.m
@@ -254,6 +254,19 @@ UInt8 *rgbData;
}
- (NSArray *)yolo_infer:(CGImageRef)cgImage withOrientation:(AVCaptureVideoOrientation)orientation {
+
+ NSDictionary<NSString *, NSArray<NSNumber *> *> *presets = [[NSUserDefaults standardUserDefaults] objectForKey:@"yolo_presets"];
+ NSString *presetKey = [[NSUserDefaults standardUserDefaults] objectForKey:@"yolo_preset_idx"];
+
+ NSArray<NSNumber *> *presetIndexes = presets[presetKey];
+ if ([presetIndexes isKindOfClass:[NSArray class]]) {
+ self.yoloIndexSet = [NSSet setWithArray:presetIndexes]; //todo, make into a set!
+ } else {
+ NSLog(@"Invalid preset key or data format");
+ self.yoloIndexSet = [NSSet set];
+ }
+
+
CFDataRef rawData = CGDataProviderCopyData(CGImageGetDataProvider(cgImage));
if (!rawData) return nil;
@@ -327,11 +340,10 @@ UInt8 *rgbData;
const void *bufferPointer = buffer.contents;
float *floatArray = malloc(buffer.length);
if (!floatArray) return nil;
-
memcpy(floatArray, bufferPointer, buffer.length);
NSMutableArray *output = [[NSMutableArray alloc] init];
for(int i = 0; i < buffer.length/4; i+=6){ //4 sides + class + conf = 6
- if(floatArray[i+5] > 0.25){ //todo unhardcode 0.25!
+ if([self.yoloIndexSet containsObject:@(floatArray[i + 4])] && floatArray[i+5] > 0.25){ //todo unhardcode 0.25!
NSArray *shape = @[
@(floatArray[i]),
@(floatArray[i+1]),