Merge pull request wess#9 from PGMY/pgmy

wess · wess · commit 5b1ba4631f19 · 2016-03-30T10:04:11.000-04:00
fixed wess#4 and wess#7
diff --git a/Glimpse/Glimpse/Glimpse.m b/Glimpse/Glimpse/Glimpse.m
@@ -44,6 +44,7 @@ - (void)startRecordingView:(UIView *)view onCompletion:(GlimpseCompletedCallback
 {
     self.sourceView = view;
     self.callback   = block;
+    self.writer.size = view.bounds.size;
 
     self.writer.startDate = [NSDate date];
     
@@ -74,10 +75,13 @@ - (void)stop
 
 - (UIImage *)imageFromView:(UIView *)view
 {
-    UIGraphicsBeginImageContext(view.bounds.size);
-
-    [[view.layer presentationLayer] renderInContext:UIGraphicsGetCurrentContext()];
-
+    UIGraphicsBeginImageContextWithOptions(view.frame.size , YES , 0 );
+    
+    if ([view respondsToSelector:@selector(drawViewHierarchyInRect:afterScreenUpdates:)]) {
+        [view drawViewHierarchyInRect:view.bounds afterScreenUpdates:YES];
+    } else {
+        [view.layer renderInContext:UIGraphicsGetCurrentContext()];
+    }
     UIImage *rasterizedView = UIGraphicsGetImageFromCurrentImageContext();
     UIGraphicsEndImageContext();
     
diff --git a/Glimpse/Glimpse/GlimpseAssetWriter.m b/Glimpse/Glimpse/GlimpseAssetWriter.m
@@ -13,7 +13,7 @@ @interface GlimpseAssetWriter()
 {
     CFAbsoluteTime      _timeOfFirstFrame;
     CFTimeInterval      _timestamp;
-    uint64_t            _frameRate;
+    int32_t            _frameRate;
     uint64_t            _frameCount;
     dispatch_queue_t    _queue;
     
@@ -40,26 +40,26 @@ - (id)init
     if (self)
     {
         self.size               = [[UIScreen mainScreen] bounds].size;
-        self.framesPerSecond    = 1;
+        self.framesPerSecond    = 24;
         self.frameBuffer        = [[NSMutableArray alloc] init];
         
-        _frameRate  = (uint64_t)self.framesPerSecond;
+        _frameRate  = (int32_t)self.framesPerSecond;
         _queue      = dispatch_queue_create([GlimpseAssetWriterQueueName cStringUsingEncoding:NSUTF8StringEncoding], 0);
     }
     return self;
 }
 
-- (NSURL *)fileOutputURL
+- (NSURL *)createFileOutputURL
 {
     NSString *documentDirectory = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0];
     NSTimeInterval timestamp    = [[NSDate date] timeIntervalSince1970];
     NSString *filename          = [NSString stringWithFormat:@"glimpse_%08x.mov", (int)timestamp];
     NSString *path              = [NSString stringWithFormat:@"%@/%@", documentDirectory, filename];
     NSFileManager *fileManager  = [NSFileManager defaultManager];
-
+    
     if([fileManager fileExistsAtPath:path])
         [fileManager removeItemAtPath:path error:nil];
-
+    
     NSLog(@"OUTPUT: %@", path);
     return [NSURL fileURLWithPath:path];
 }
@@ -69,6 +69,8 @@ - (AVAssetWriter *)writer
     if(_writer)
         return _writer;
     
+    _fileOutputURL = [self createFileOutputURL];
+    
     NSError *error = nil;
     _writer = [[AVAssetWriter alloc] initWithURL:self.fileOutputURL fileType:AVFileTypeQuickTimeMovie error:&error];
     NSAssert(error == nil, error.debugDescription);
@@ -154,10 +156,7 @@ - (void)writeVideoFromImageFrames:(void(^)(NSURL *outputPath))callback
             if(self.input.readyForMoreMediaData)
             {
                 i++;
-                
-                CFAbsoluteTime current  = CFAbsoluteTimeGetCurrent();
-                CFTimeInterval elapse   = current - _timeOfFirstFrame;
-                CMTime present          = CMTimeMake(elapse * 600, 600);
+                CMTime present          = CMTimeMake(i , _frameRate);
                 
                 buffer = [self pixelBufferForImage:image];
                 BOOL result = [self.adapter appendPixelBuffer:buffer withPresentationTime:present];
