Skip to content

Fix texture is not released issue. #9

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

Merged
merged 3 commits into from
Dec 15, 2020
Merged

Fix texture is not released issue. #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9b9b38
Fix texture is not released issue.
xiaowei-guan Dec 10, 2020
cfa376e
Reuse DestructionTbmSurface for destructing tbm_surface_
xiaowei-guan Dec 11, 2020
40ea715
Remove recursive mutex
xiaowei-guan Dec 14, 2020
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
25 changes: 13 additions & 12 deletions shell/platform/tizen/external_texture_gl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,7 @@ ExternalTextureGL::~ExternalTextureGL() {
glDeleteTextures(1, &state_->gl_texture);
}
state_.release();
if (texture_tbm_surface_) {
tbm_surface_internal_unref(texture_tbm_surface_);
texture_tbm_surface_ = NULL;
}
DestructionTbmSurface();
mutex_.unlock();
}

Expand All @@ -47,12 +44,12 @@ bool ExternalTextureGL::OnFrameAvailable(tbm_surface_h tbm_surface) {
return false;
}
if (texture_tbm_surface_) {
LoggerE("texture_tbm_surface_ does not destruction, discard");
LoggerD("texture_tbm_surface_ does not destruction, discard");
mutex_.unlock();
return false;
}
if (!tbm_surface_internal_is_valid(tbm_surface)) {
LoggerE("tbm_surface not valid, pass");
LoggerD("tbm_surface not valid, pass");
mutex_.unlock();
return false;
}
Expand All @@ -66,12 +63,13 @@ bool ExternalTextureGL::PopulateTextureWithIdentifier(
size_t width, size_t height, FlutterOpenGLTexture* opengl_texture) {
mutex_.lock();
if (!texture_tbm_surface_) {
LoggerE("texture_tbm_surface_ is NULL");
LoggerD("texture_tbm_surface_ is NULL");
mutex_.unlock();
return false;
}
if (!tbm_surface_internal_is_valid(texture_tbm_surface_)) {
LoggerE("tbm_surface not valid");
LoggerD("tbm_surface not valid");
DestructionTbmSurface();
mutex_.unlock();
return false;
}
Expand Down Expand Up @@ -122,20 +120,23 @@ bool ExternalTextureGL::PopulateTextureWithIdentifier(
return true;
}

void ExternalTextureGL::DestructionTbmSurface() {
void ExternalTextureGL::DestructionTbmSurfaceWithLock() {
mutex_.lock();
DestructionTbmSurface();
mutex_.unlock();
}

void ExternalTextureGL::DestructionTbmSurface() {
if (!texture_tbm_surface_) {
LoggerE("tbm_surface_h is NULL");
mutex_.unlock();
return;
}
tbm_surface_internal_unref(texture_tbm_surface_);
texture_tbm_surface_ = NULL;
mutex_.unlock();
}

void ExternalTextureGL::destructionCallback(void* user_data) {
ExternalTextureGL* externalTextureGL =
reinterpret_cast<ExternalTextureGL*>(user_data);
externalTextureGL->DestructionTbmSurface();
externalTextureGL->DestructionTbmSurfaceWithLock();
}
1 change: 1 addition & 0 deletions shell/platform/tizen/external_texture_gl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ class ExternalTextureGL {
FlutterOpenGLTexture* opengl_texture);
bool OnFrameAvailable(tbm_surface_h tbm_surface);
void DestructionTbmSurface();
void DestructionTbmSurfaceWithLock();

private:
std::unique_ptr<ExternalTextureGLState> state_;
Expand Down