GPUImageVideoCamera makes the metadata from the image capture availab…

…le during the capture completion handler
lajos · Nov 8, 2012 · 2fc4a5c · 2fc4a5c
1 parent 82872b9
commit 2fc4a5c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/examples/SimplePhotoFilter/SimplePhotoFilter/PhotoViewController.m b/examples/SimplePhotoFilter/SimplePhotoFilter/PhotoViewController.m
@@ -107,7 +107,7 @@ - (IBAction)takePhoto:(id)sender;
         ALAssetsLibrary *library = [[ALAssetsLibrary alloc] init];
 //        report_memory(@"After asset library creation");
 
-        [library writeImageDataToSavedPhotosAlbum:processedJPEG metadata:nil completionBlock:^(NSURL *assetURL, NSError *error2)
+        [library writeImageDataToSavedPhotosAlbum:processedJPEG metadata:stillCamera.currentCaptureMetadata completionBlock:^(NSURL *assetURL, NSError *error2)
          {
 //             report_memory(@"After writing to library");
              if (error2) {

diff --git a/framework/Source/GPUImageStillCamera.h b/framework/Source/GPUImageStillCamera.h
@@ -5,6 +5,9 @@ void GPUImageCreateResizedSampleBuffer(CVPixelBufferRef cameraFrame, CGSize fina
 
 @interface GPUImageStillCamera : GPUImageVideoCamera
 
+// Only reliably set inside the context of the completion handler of one of the capture methods
+@property (readonly) NSDictionary *currentCaptureMetadata;
+
 // Photography controls
 - (void)capturePhotoAsSampleBufferWithCompletionHandler:(void (^)(CMSampleBufferRef imageSampleBuffer, NSError *error))block;
 - (void)capturePhotoAsImageProcessedUpToFilter:(GPUImageOutput<GPUImageInput> *)finalFilterInChain withCompletionHandler:(void (^)(UIImage *processedImage, NSError *error))block;

diff --git a/framework/Source/GPUImageStillCamera.m b/framework/Source/GPUImageStillCamera.m
@@ -217,7 +217,12 @@ - (void)capturePhotoProcessedUpToFilter:(GPUImageOutput<GPUImageInput> *)finalFi
             }
         }
 
+        CFDictionaryRef metadata = CMCopyDictionaryOfAttachments(NULL, imageSampleBuffer, kCMAttachmentMode_ShouldPropagate);
+        _currentCaptureMetadata = (__bridge_transfer NSDictionary *)metadata;
+
         block(nil);
+
+        _currentCaptureMetadata = nil;
     }];
 }