Merge pull request BradLarson#964 from jvaldera/master

Fixed issue BradLarson#765
Vokl · May 15, 2013 · 480a226 · 480a226
2 parents 4b87694 + 121b85c
commit 480a226
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/framework/Source/GPUImageMovie.h b/framework/Source/GPUImageMovie.h
@@ -40,6 +40,7 @@
 - (void)readNextAudioSampleFromOutput:(AVAssetReaderTrackOutput *)readerAudioTrackOutput;
 - (void)startProcessing;
 - (void)endProcessing;
+- (void)cancelProcessing;
 - (void)processMovieFrame:(CMSampleBufferRef)movieSampleBuffer; 
 
 @end
diff --git a/framework/Source/GPUImageMovie.m b/framework/Source/GPUImageMovie.m
@@ -361,4 +361,12 @@ - (void)endProcessing;
     }
 }
 
+- (void)cancelProcessing
+{
+    if (reader) {
+        [reader cancelReading];
+    }
+    [self endProcessing];
+}
+
 @end
diff --git a/framework/Source/iOS/GPUImageMovieWriter.m b/framework/Source/iOS/GPUImageMovieWriter.m
@@ -267,7 +267,7 @@ - (void)finishRecording;
 
 - (void)finishRecordingWithCompletionHandler:(void (^)(void))handler;
 {
-    if (assetWriter.status == AVAssetWriterStatusCompleted)
+    if (assetWriter.status == AVAssetWriterStatusCompleted || assetWriter.status == AVAssetWriterStatusCancelled)
     {
         return;
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -267,7 +267,7 @@ - (void)finishRecording; @@
     - (void)finishRecordingWithCompletionHandler:(void (^)(void))handler;
     {
-        if (assetWriter.status == AVAssetWriterStatusCompleted)
+        if (assetWriter.status == AVAssetWriterStatusCompleted || assetWriter.status == AVAssetWriterStatusCancelled)
         {
             return;
         }
@@ Expand Down @@