Merge pull request BradLarson#492 from brettg/capture-crash

prevent crash when captureStillImageAsynchronouslyFromConnection yields an error
red1004g · Sep 30, 2012 · f51b807 · f51b807
2 parents b1a4d35 + 0d6138d
commit f51b807
Showing 1 changed file with 19 additions and 1 deletion.
diff --git a/framework/Source/GPUImageStillCamera.m b/framework/Source/GPUImageStillCamera.m
@@ -107,6 +107,12 @@ - (void)capturePhotoAsImageProcessedUpToFilter:(GPUImageOutput<GPUImageInput> *)
 
     [photoOutput captureStillImageAsynchronouslyFromConnection:[[photoOutput connections] objectAtIndex:0] completionHandler:^(CMSampleBufferRef imageSampleBuffer, NSError *error) {
 
+        if(imageSampleBuffer == NULL){
+            dispatch_semaphore_signal(frameRenderingSemaphore);
+            block(nil, error);
+            return;
+        }
+
         // For now, resize photos to fix within the max texture size of the GPU
         CVImageBufferRef cameraFrame = CMSampleBufferGetImageBuffer(imageSampleBuffer);
 
@@ -151,6 +157,12 @@ - (void)capturePhotoAsJPEGProcessedUpToFilter:(GPUImageOutput<GPUImageInput> *)f
     [photoOutput captureStillImageAsynchronouslyFromConnection:[[photoOutput connections] objectAtIndex:0] completionHandler:^(CMSampleBufferRef imageSampleBuffer, NSError *error) {
 //        reportAvailableMemoryForGPUImage(@"Before filter processing");
 
+        if(imageSampleBuffer == NULL){
+            dispatch_semaphore_signal(frameRenderingSemaphore);
+            block(nil, error);
+            return;
+        }
+
         // For now, resize photos to fix within the max texture size of the GPU
         CVImageBufferRef cameraFrame = CMSampleBufferGetImageBuffer(imageSampleBuffer);
 
@@ -205,7 +217,13 @@ - (void)capturePhotoAsPNGProcessedUpToFilter:(GPUImageOutput<GPUImageInput> *)fi
     dispatch_semaphore_wait(frameRenderingSemaphore, DISPATCH_TIME_FOREVER);
 
     [photoOutput captureStillImageAsynchronouslyFromConnection:[[photoOutput connections] objectAtIndex:0] completionHandler:^(CMSampleBufferRef imageSampleBuffer, NSError *error) {
-
+
+        if(imageSampleBuffer == NULL){
+            dispatch_semaphore_signal(frameRenderingSemaphore);
+            block(nil, error);
+            return;
+        }
+
         // For now, resize photos to fix within the max texture size of the GPU
         CVImageBufferRef cameraFrame = CMSampleBufferGetImageBuffer(imageSampleBuffer);