Skip to content

Release the memory of renderTarget in GPUImageFramebuffer immediately #2654

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Release the memory of renderTarget in GPUImageFramebuffer immediately #2654

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 39 additions & 20 deletions framework/Source/GPUImageFramebuffer.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#import "GPUImageFramebuffer.h"
#import "GPUImageOutput.h"
#import <OpenGLES/EAGLIOSurface.h>

@interface GPUImageFramebuffer()
{
Expand Down Expand Up @@ -155,31 +156,45 @@ - (void)generateFramebuffer;
NSLog(@"FBO size: %f, %f", _size.width, _size.height);
NSAssert(NO, @"Error at CVPixelBufferCreate %d", err);
}

err = CVOpenGLESTextureCacheCreateTextureFromImage (kCFAllocatorDefault, coreVideoTextureCache, renderTarget,
NULL, // texture attributes
GL_TEXTURE_2D,
_textureOptions.internalFormat, // opengl format
(int)_size.width,
(int)_size.height,
_textureOptions.format, // native iOS format
_textureOptions.type,
0,
&renderTexture);
if (err)
{
NSAssert(NO, @"Error at CVOpenGLESTextureCacheCreateTextureFromImage %d", err);

if (@available(iOS 11.0, *)) {

[self generateTexture];

glBindTexture(GL_TEXTURE_2D, _texture);
IOSurfaceRef ioSurface = CVPixelBufferGetIOSurface(renderTarget);
BOOL result = [[GPUImageContext sharedImageProcessingContext].context texImageIOSurface:ioSurface target:GL_TEXTURE_2D internalFormat:_textureOptions.internalFormat width:(int)_size.width height:(int)_size.height format:_textureOptions.format type:_textureOptions.type plane:0];

NSAssert(result, @"Error at texImageIOSurface:target:internalFormat:width:height:format:type:plane:");

}else{

err = CVOpenGLESTextureCacheCreateTextureFromImage (kCFAllocatorDefault, coreVideoTextureCache, renderTarget,
NULL, // texture attributes
GL_TEXTURE_2D,
_textureOptions.internalFormat, // opengl format
(int)_size.width,
(int)_size.height,
_textureOptions.format, // native iOS format
_textureOptions.type,
0,
&renderTexture);
if (err)
{
NSAssert(NO, @"Error at CVOpenGLESTextureCacheCreateTextureFromImage %d", err);
}

CFRelease(attrs);
CFRelease(empty);

glBindTexture(CVOpenGLESTextureGetTarget(renderTexture), CVOpenGLESTextureGetName(renderTexture));
_texture = CVOpenGLESTextureGetName(renderTexture);
}

CFRelease(attrs);
CFRelease(empty);

glBindTexture(CVOpenGLESTextureGetTarget(renderTexture), CVOpenGLESTextureGetName(renderTexture));
_texture = CVOpenGLESTextureGetName(renderTexture);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, _textureOptions.wrapS);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, _textureOptions.wrapT);

glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, CVOpenGLESTextureGetName(renderTexture), 0);
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, _texture, 0);
#endif
}
else
Expand Down Expand Up @@ -227,6 +242,10 @@ - (void)destroyFramebuffer;
CFRelease(renderTexture);
renderTexture = NULL;
}

if (@available(iOS 11.0, *)) {
glDeleteTextures(1, &_texture);
}
#endif
}
else
Expand Down