Add object detection, tracking, mobile notifications, and search to any security camera.
store and log orientation
rorycleard95ee91bc00c
diff --git a/SegmentsModel.xcdatamodeld/SegmentsModel.xcdatamodel/contents b/SegmentsModel.xcdatamodeld/SegmentsModel.xcdatamodel/contentsindex 9718a95..9b7d44e 100644--- a/SegmentsModel.xcdatamodeld/SegmentsModel.xcdatamodel/contents+++ b/SegmentsModel.xcdatamodeld/SegmentsModel.xcdatamodel/contents@@ -1,5 +1,5 @@<?xml version="1.0" encoding="UTF-8" standalone="yes"?>-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="23605" systemVersion="24D70" minimumToolsVersion="Automatic" sourceLanguage="Swift" usedWithSwiftData="YES" userDefinedModelVersionIdentifier="">+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="23605" systemVersion="24D81" minimumToolsVersion="Automatic" sourceLanguage="Swift" usedWithSwiftData="YES" userDefinedModelVersionIdentifier=""><entity name="DayEntity" representedClassName="DayEntity" syncable="YES" codeGenerationType="class"><attribute name="date" optional="YES" attributeType="String"/><relationship name="segments" optional="YES" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="SegmentEntity" inverseName="day" inverseEntity="SegmentEntity"/>@@ -21,6 +21,7 @@</entity><entity name="SegmentEntity" representedClassName="SegmentEntity" syncable="YES" codeGenerationType="class"><attribute name="duration" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>+ <attribute name="orientation" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/><attribute name="timeStamp" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/><attribute name="url" optional="YES" attributeType="String"/><relationship name="day" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="DayEntity" inverseName="segments" inverseEntity="DayEntity"/>diff --git a/clearcam/FileServer.m b/clearcam/FileServer.mindex c876e7a..aae3556 100644--- a/clearcam/FileServer.m+++ b/clearcam/FileServer.m@@ -168,7 +168,7 @@NSFetchRequest *segmentFetchRequest = [[NSFetchRequest alloc] initWithEntityName:@"SegmentEntity"];segmentFetchRequest.predicate = [NSPredicate predicateWithFormat:@"day == %@ AND timeStamp >= %f", dayEntity, startTime];segmentFetchRequest.sortDescriptors = @[[NSSortDescriptor sortDescriptorWithKey:@"timeStamp" ascending:YES]]; // Consistent ordering- segmentFetchRequest.propertiesToFetch = @[@"url", @"timeStamp", @"duration"];+ segmentFetchRequest.propertiesToFetch = @[@"url", @"timeStamp", @"duration", @"orientation"];segmentFetchRequest.resultType = NSDictionaryResultType; // Return dictionaries directlyNSArray *fetchedSegments = [context executeFetchRequest:segmentFetchRequest error:&error];@@ -964,6 +964,9 @@dispatch_semaphore_t trimSema = dispatch_semaphore_create(0);__block NSInteger trimCount = 0;++ NSInteger orientation = [segments[0][@"orientation"] intValue];+ NSLog(@"rory orientation = %ld",(long)orientation);for (NSInteger i = 0; i < segments.count; i++) {NSTimeInterval segmentStart = [segments[i][@"timeStamp"] doubleValue];@@ -973,7 +976,7 @@if (segmentEnd <= relativeStart || segmentStart >= relativeEnd) {continue;}-+NSString *originalFilePath = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES).firstObject stringByAppendingPathComponent:segments[i][@"url"]];if (![[NSFileManager defaultManager] fileExistsAtPath:originalFilePath]) continue;diff --git a/clearcam/ViewController.m b/clearcam/ViewController.mindex 5bf1413..cc43b47 100644--- a/clearcam/ViewController.m+++ b/clearcam/ViewController.m@@ -646,9 +646,12 @@ NSMutableDictionary *classColorMap;[newSegment setValuesForKeysWithDictionary:@{@"url": segmentURL,@"timeStamp": @(timeStamp),- @"duration": @(CMTimeGetSeconds(time))+ @"duration": @(CMTimeGetSeconds(time)),+ @"orientation": @((int16_t)self.previewLayer.connection.videoOrientation)}];+ NSLog(@"rory %ld",(long)self.previewLayer.connection.videoOrientation);+// Pre-allocate frames arrayNSMutableArray<NSManagedObject *> *segmentFrames = [NSMutableArray arrayWithCapacity:segmentSquaresCopy.count];