mirrors/gst-plugins-rs
mirrors/gst-plugins-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git synced 2024-12-23 10:30:40 +00:00
Code Issues Projects Releases Wiki Activity

gtk4: Set sync point on the video frame after mapping it

Browse source 
Otherwise it is not always ready for use yet in GTK even after waiting
on the sync point, and a fully transparent texture is rendered instead.

Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/320

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1103>
This commit is contained in:
Sebastian Dröge 2023-02-24 11:52:28 +02:00
parent 6bc72e513c
commit bca4af0c79
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
video/gtk4/src/sink/frame.rs
View file

@ -251,21 +251,27 @@ impl Frame {
}); });
if let Some(memory_ctx) = memory_ctx { if let Some(memory_ctx) = memory_ctx {
let mapped_frame = if let Some(meta) = buffer.meta::<gst_gl::GLSyncMeta>() { // If there is no GLSyncMeta yet then we need to add one here now, which requires
meta.set_sync_point(memory_ctx); // obtaining a writable buffer.
let mapped_frame = if buffer.meta::<gst_gl::GLSyncMeta>().is_some() {
gst_video::VideoFrame::from_buffer_readable_gl(buffer.clone(), info) gst_video::VideoFrame::from_buffer_readable_gl(buffer.clone(), info)
.map_err(|_| gst::FlowError::Error)? .map_err(|_| gst::FlowError::Error)?
} else { } else {
let mut buffer = buffer.clone(); let mut buffer = buffer.clone();
{ {
let buffer = buffer.make_mut(); let buffer = buffer.make_mut();
let meta = gst_gl::GLSyncMeta::add(buffer, memory_ctx); gst_gl::GLSyncMeta::add(buffer, memory_ctx);
meta.set_sync_point(memory_ctx);
} }
gst_video::VideoFrame::from_buffer_readable_gl(buffer, info) gst_video::VideoFrame::from_buffer_readable_gl(buffer, info)
.map_err(|_| gst::FlowError::Error)? .map_err(|_| gst::FlowError::Error)?
}; };
// Now that it's guaranteed that there is a sync meta and the frame is mapped, set
// a sync point so we can ensure that the texture is ready later when making use of
// it as gdk::GLTexture.
let meta = mapped_frame.buffer().meta::<gst_gl::GLSyncMeta>().unwrap();
meta.set_sync_point(memory_ctx);
frame = Self { frame = Self {
frame: mapped_frame, frame: mapped_frame,
overlays: vec![], overlays: vec![],