mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 19:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

qmlglsrc: Unmap buffer before adding sync meta

Browse source 
Adding a sync meta to a GstBuffer requires that it
be writable. Mapping the buffer with the video frame API
holds an extra ref on the buffer, so unmap before
trying to modify it.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3612>
This commit is contained in:
Jan Schmidt 2022-12-21 02:32:41 +11:00 committed by GStreamer Marge Bot
parent 2b09f7a006
commit d3c85b4d19
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
subprojects/gst-plugins-good/ext/qt/qtwindow.cc
View file

@ -236,6 +236,9 @@ QtGLWindow::afterRendering()
gl->CopyTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA, 0, 0, width, height, 0); gl->CopyTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA, 0, 0, width, height, 0);
} }
gl->BindFramebuffer (GL_FRAMEBUFFER, 0);
gst_video_frame_unmap (&gl_frame);
if (this->priv->context) { if (this->priv->context) {
sync_meta = gst_buffer_get_gl_sync_meta (this->priv->buffer); sync_meta = gst_buffer_get_gl_sync_meta (this->priv->buffer);
if (!sync_meta) { if (!sync_meta) {
@ -246,16 +249,19 @@ QtGLWindow::afterRendering()
GST_DEBUG ("rendering finished"); GST_DEBUG ("rendering finished");
errors: done:
gl->BindFramebuffer (GL_FRAMEBUFFER, 0);
gst_video_frame_unmap (&gl_frame);
gst_gl_context_activate (context, FALSE); gst_gl_context_activate (context, FALSE);
this->priv->result = ret; this->priv->result = ret;
this->priv->updated = TRUE; this->priv->updated = TRUE;
g_cond_signal (&this->priv->update_cond); g_cond_signal (&this->priv->update_cond);
g_mutex_unlock (&this->priv->lock); g_mutex_unlock (&this->priv->lock);
return;
errors:
gl->BindFramebuffer (GL_FRAMEBUFFER, 0);
gst_video_frame_unmap (&gl_frame);
goto done;
} }
void void