Attempting to protect against improper deallocation of resources outs…

…ide of the image processing OpenGL ES context.
jacksonpan · May 24, 2013 · 4db09e5 · 4db09e5
1 parent 26e3988
commit 4db09e5
Show file tree

Hide file tree

Showing 9 changed files with 146 additions and 108 deletions.
diff --git a/framework/Source/GPUImageBuffer.m b/framework/Source/GPUImageBuffer.m
@@ -119,26 +119,36 @@ - (GLuint)textureForOutput;
 
 - (GLuint)generateTexture;
 {
-    GLuint newTextureName = 0;
-    glActiveTexture(GL_TEXTURE0);
-    glGenTextures(1, &newTextureName);
-	glBindTexture(GL_TEXTURE_2D, newTextureName);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-	// This is necessary for non-power-of-two textures
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-
-    CGSize currentFBOSize = [self sizeOfFBO];
-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, (int)currentFBOSize.width, (int)currentFBOSize.height, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
-    glBindTexture(GL_TEXTURE_2D, 0);
+    __block GLuint newTextureName = 0;
+
+    runSynchronouslyOnVideoProcessingQueue(^{
+        [GPUImageContext useImageProcessingContext];
+
+        glActiveTexture(GL_TEXTURE0);
+        glGenTextures(1, &newTextureName);
+        glBindTexture(GL_TEXTURE_2D, newTextureName);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+        // This is necessary for non-power-of-two textures
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+
+        CGSize currentFBOSize = [self sizeOfFBO];
+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, (int)currentFBOSize.width, (int)currentFBOSize.height, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
+        glBindTexture(GL_TEXTURE_2D, 0);
+
+    });
 
     return newTextureName;
 }
 
 - (void)removeTexture:(GLuint)textureToRemove;
 {
-    glDeleteTextures(1, &textureToRemove);
+    runSynchronouslyOnVideoProcessingQueue(^{
+        [GPUImageContext useImageProcessingContext];
+
+        glDeleteTextures(1, &textureToRemove);
+    });
 }
 
 #pragma mark -

diff --git a/framework/Source/GPUImageFilter.m b/framework/Source/GPUImageFilter.m
@@ -941,14 +941,18 @@ - (void)cleanupOutputImage;
 
 - (void)deleteOutputTexture;
 {
-    if (!([GPUImageContext supportsFastTextureUpload] && preparedToCaptureImage))
-    {
-        if (outputTexture)
+    runSynchronouslyOnVideoProcessingQueue(^{
+        [GPUImageContext useImageProcessingContext];
+
+        if (!([GPUImageContext supportsFastTextureUpload] && preparedToCaptureImage))
         {
-            glDeleteTextures(1, &outputTexture);
-            outputTexture = 0;
+            if (outputTexture)
+            {
+                glDeleteTextures(1, &outputTexture);
+                outputTexture = 0;
+            }
         }
-    }
+    });
 }
 
 - (CGSize)maximumOutputSize;

diff --git a/framework/Source/GPUImageOutput.m b/framework/Source/GPUImageOutput.m
@@ -230,11 +230,15 @@ - (void)initializeOutputTextureIfNeeded;
 
 - (void)deleteOutputTexture;
 {
-    if (outputTexture)
-    {
-        glDeleteTextures(1, &outputTexture);
-        outputTexture = 0;
-    }
+    runSynchronouslyOnVideoProcessingQueue(^{
+        [GPUImageContext useImageProcessingContext];
+
+        if (outputTexture)
+        {
+            glDeleteTextures(1, &outputTexture);
+            outputTexture = 0;
+        }
+    });
 }
 
 - (void)forceProcessingAtSize:(CGSize)frameSize;

diff --git a/framework/Source/GPUImagePoissonBlendFilter.m b/framework/Source/GPUImagePoissonBlendFilter.m
@@ -146,20 +146,24 @@ - (void)initializeSecondOutputTextureIfNeeded;
 
 - (void)deleteOutputTexture;
 {
-    if (outputTexture)
-    {
-        glDeleteTextures(1, &outputTexture);
-        outputTexture = 0;
-    }
-
-    if (!([GPUImageContext supportsFastTextureUpload] && preparedToCaptureImage))
-    {
-        if (secondFilterOutputTexture)
+    runSynchronouslyOnVideoProcessingQueue(^{
+        [GPUImageContext useImageProcessingContext];
+
+        if (outputTexture)
         {
-            glDeleteTextures(1, &secondFilterOutputTexture);
-            secondFilterOutputTexture = 0;
+            glDeleteTextures(1, &outputTexture);
+            outputTexture = 0;
         }
-    }
+
+        if (!([GPUImageContext supportsFastTextureUpload] && preparedToCaptureImage))
+        {
+            if (secondFilterOutputTexture)
+            {
+                glDeleteTextures(1, &secondFilterOutputTexture);
+                secondFilterOutputTexture = 0;
+            }
+        }
+    });
 }
 
 - (void)createFilterFBOofSize:(CGSize)currentFBOSize

diff --git a/framework/Source/GPUImageRawDataOutput.m b/framework/Source/GPUImageRawDataOutput.m
@@ -189,25 +189,27 @@ - (void)createDataFBO;
 
 - (void)destroyDataFBO;
 {
-    [GPUImageContext useImageProcessingContext];
-
-    if (renderTexture)
-    {
-        CFRelease(renderTexture);
-        renderTexture = NULL;
-    }
-
-    if (dataFramebuffer)
-	{
-		glDeleteFramebuffers(1, &dataFramebuffer);
-		dataFramebuffer = 0;
-	}	
-
-    if (dataRenderbuffer)
-	{
-		glDeleteRenderbuffers(1, &dataRenderbuffer);
-		dataRenderbuffer = 0;
-	}	
+    runSynchronouslyOnVideoProcessingQueue(^{
+        [GPUImageContext useImageProcessingContext];
+
+        if (renderTexture)
+        {
+            CFRelease(renderTexture);
+            renderTexture = NULL;
+        }
+
+        if (dataFramebuffer)
+        {
+            glDeleteFramebuffers(1, &dataFramebuffer);
+            dataFramebuffer = 0;
+        }
+
+        if (dataRenderbuffer)
+        {
+            glDeleteRenderbuffers(1, &dataRenderbuffer);
+            dataRenderbuffer = 0;
+        }
+    });
 }
 
 - (void)setFilterFBO;

diff --git a/framework/Source/GPUImageToneCurveFilter.m b/framework/Source/GPUImageToneCurveFilter.m
@@ -229,12 +229,16 @@ - (void)setPointsWithACVURL:(NSURL*)curveFileURL
 
 - (void)dealloc
 {
-    if (toneCurveTexture)
-    {
-        glDeleteTextures(1, &toneCurveTexture);
-        toneCurveTexture = 0;
-        free(toneCurveByteArray);
-    }
+    runSynchronouslyOnVideoProcessingQueue(^{
+        [GPUImageContext useImageProcessingContext];
+
+        if (toneCurveTexture)
+        {
+            glDeleteTextures(1, &toneCurveTexture);
+            toneCurveTexture = 0;
+            free(toneCurveByteArray);
+        }
+    });
 }
 
 #pragma mark -

diff --git a/framework/Source/GPUImageTwoPassFilter.m b/framework/Source/GPUImageTwoPassFilter.m
@@ -102,20 +102,24 @@ - (void)initializeSecondOutputTextureIfNeeded;
 
 - (void)deleteOutputTexture;
 {
-    if (outputTexture)
-    {
-        glDeleteTextures(1, &outputTexture);
-        outputTexture = 0;
-    }
+    runSynchronouslyOnVideoProcessingQueue(^{
+        [GPUImageContext useImageProcessingContext];
 
-    if (!([GPUImageContext supportsFastTextureUpload] && preparedToCaptureImage))
-    {
-        if (secondFilterOutputTexture)
+        if (outputTexture)
         {
-            glDeleteTextures(1, &secondFilterOutputTexture);
-            secondFilterOutputTexture = 0;
+            glDeleteTextures(1, &outputTexture);
+            outputTexture = 0;
         }
-    }
+
+        if (!([GPUImageContext supportsFastTextureUpload] && preparedToCaptureImage))
+        {
+            if (secondFilterOutputTexture)
+            {
+                glDeleteTextures(1, &secondFilterOutputTexture);
+                secondFilterOutputTexture = 0;
+            }
+        }
+    });
 }
 
 #pragma mark -

diff --git a/framework/Source/GPUImageVideoCamera.m b/framework/Source/GPUImageVideoCamera.m
@@ -784,17 +784,21 @@ - (void)createYUVConversionFBO;
 
 - (void)destroyYUVConversionFBO;
 {
-    if (yuvConversionFramebuffer)
-	{
-		glDeleteFramebuffers(1, &yuvConversionFramebuffer);
-		yuvConversionFramebuffer = 0;
-	}
-
-    if (outputTexture)
-    {
-        glDeleteTextures(1, &outputTexture);
-        outputTexture = 0;
-    }
+    runSynchronouslyOnVideoProcessingQueue(^{
+        [GPUImageContext useImageProcessingContext];
+
+        if (yuvConversionFramebuffer)
+        {
+            glDeleteFramebuffers(1, &yuvConversionFramebuffer);
+            yuvConversionFramebuffer = 0;
+        }
+
+        if (outputTexture)
+        {
+            glDeleteTextures(1, &outputTexture);
+            outputTexture = 0;
+        }
+    });
 }
 
 

diff --git a/framework/Source/iOS/GPUImageMovieWriter.m b/framework/Source/iOS/GPUImageMovieWriter.m
@@ -402,37 +402,39 @@ - (void)createDataFBO;
 
 - (void)destroyDataFBO;
 {
-    [GPUImageContext useImageProcessingContext];
+    runSynchronouslyOnVideoProcessingQueue(^{
+        [GPUImageContext useImageProcessingContext];
 
-    if (movieFramebuffer)
-	{
-		glDeleteFramebuffers(1, &movieFramebuffer);
-		movieFramebuffer = 0;
-	}	
-
-    if (movieRenderbuffer)
-	{
-		glDeleteRenderbuffers(1, &movieRenderbuffer);
-		movieRenderbuffer = 0;
-	}	
-
-    if ([GPUImageContext supportsFastTextureUpload])
-    {
-        if (coreVideoTextureCache)
+        if (movieFramebuffer)
         {
-            CFRelease(coreVideoTextureCache);
+            glDeleteFramebuffers(1, &movieFramebuffer);
+            movieFramebuffer = 0;
         }
-
-        if (renderTexture)
+        
+        if (movieRenderbuffer)
         {
-            CFRelease(renderTexture);
+            glDeleteRenderbuffers(1, &movieRenderbuffer);
+            movieRenderbuffer = 0;
         }
-        if (renderTarget)
+
+        if ([GPUImageContext supportsFastTextureUpload])
         {
-            CVPixelBufferRelease(renderTarget);
+            if (coreVideoTextureCache)
+            {
+                CFRelease(coreVideoTextureCache);
+            }
+
+            if (renderTexture)
+            {
+                CFRelease(renderTexture);
+            }
+            if (renderTarget)
+            {
+                CVPixelBufferRelease(renderTarget);
+            }
+
         }
-
-    }
+    });
 }
 
 - (void)setFilterFBO;