FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

wpe: Run frameComplete outside of images mutex scope

Browse Source 
If the mutex is locked while running frameComplete there is a potential deadlock
bound to happen when we get a new exported images from the backend.

Fixes #1101
This commit is contained in:
Philippe Normand 2019-10-19 12:48:55 +01:00
parent 5a9541caff
commit 0f03e33b03
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ext/wpe/WPEThreadedView.cpp
View File

@ -270,6 +270,8 @@ bool WPEThreadedView::initialize(GstWpeSrc* src, GstGLContext* context, GstGLDis
GstEGLImage* WPEThreadedView::image() GstEGLImage* WPEThreadedView::image()
{ {
GstEGLImage* ret = nullptr; GstEGLImage* ret = nullptr;
{
GMutexHolder lock(images.mutex); GMutexHolder lock(images.mutex);
GST_TRACE("pending %" GST_PTR_FORMAT " (%d) committed %" GST_PTR_FORMAT " (%d)", images.pending, GST_TRACE("pending %" GST_PTR_FORMAT " (%d) committed %" GST_PTR_FORMAT " (%d)", images.pending,
@ -286,11 +288,13 @@ GstEGLImage* WPEThreadedView::image()
gst_egl_image_unref(previousImage); gst_egl_image_unref(previousImage);
} }
if (images.committed) { if (images.committed)
ret = images.committed; ret = images.committed;
frameComplete();
} }
if (ret)
frameComplete();
return ret; return ret;
} }