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-11-26 05:21:00 +00:00
Code Issues Projects Releases Wiki Activity

gtk4: Propagate the GL display to the remainder of the pipeline

Browse source 
This allows sharing it with other parts of the pipeline and avoids
creating different, incompatible displays/contexts in different parts of
the pipeline.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1037>
This commit is contained in:
Sebastian Dröge 2023-01-07 12:42:42 +02:00
parent e9bbf804ba
commit 58c21d9868
1 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
video/gtk4/src/sink/imp.rs
View file

@ -212,9 +212,14 @@ impl ElementImpl for PaintableSink {
#[cfg(any(target_os = "macos", feature = "gst_gl"))] #[cfg(any(target_os = "macos", feature = "gst_gl"))]
{ {
if self.have_gl_context.load(Ordering::Relaxed) && !self.initialize_gl_wrapper() if self.have_gl_context.load(Ordering::Relaxed) {
{ if self.initialize_gl_wrapper() {
self.have_gl_context.store(false, Ordering::Relaxed); // We must have a display at this point.
let display = self.gst_display.lock().unwrap().clone().unwrap();
gst_gl::gl_element_propagate_display_context(&*self.obj(), &display);
} else {
self.have_gl_context.store(false, Ordering::Relaxed);
}
} }
} }
} }
@ -715,15 +720,25 @@ impl PaintableSink {
"Successfully deactivated GL Context after fill_info" "Successfully deactivated GL Context after fill_info"
); );
match display.create_context(app_ctx) { let gst_context = match display.create_context(app_ctx) {
Ok(gst_context) => { Ok(gst_context) => gst_context,
Err(err) => {
gst::error!(CAT, imp: self, "Could not create GL context: {err}");
*app_ctx_guard = None;
*display_guard = None;
return false;
}
};
match display.add_context(&gst_context) {
Ok(_) => {
let mut gst_ctx_guard = self.gst_context.lock().unwrap(); let mut gst_ctx_guard = self.gst_context.lock().unwrap();
gst::info!(CAT, imp: self, "Successfully initialized GL Context"); gst::info!(CAT, imp: self, "Successfully initialized GL Context");
gst_ctx_guard.replace(gst_context); gst_ctx_guard.replace(gst_context);
true true
} }
Err(err) => { Err(_) => {
gst::error!(CAT, imp: self, "Could not create GL context: {err}"); gst::error!(CAT, imp: self, "Could not add GL context to display");
*app_ctx_guard = None; *app_ctx_guard = None;
*display_guard = None; *display_guard = None;
false false